Unify naming

akares · Nov 14, 2024 · 5853e50 · 5853e50
1 parent d8ce506
commit 5853e50
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/cmd/skread/main.go b/cmd/skread/main.go
@@ -26,7 +26,7 @@ type JSONResponse struct {
 	Remote       string                     `json:"Remote"`
 	Button       string                     `json:"Button"`
 	Ring         string                     `json:"Ring"`
-	Measurements []skreader.MeasurementJSON `json:"measurements"`
+	Measurements []skreader.MeasurementJSON `json:"Measurements"`
 }
 
 func skConnect() (*skreader.Device, error) {

diff --git a/measurement_json.go b/measurement_json.go
@@ -9,15 +9,15 @@ import "time"
 type MeasurementJSON struct {
 	Name             string                `json:"Name"`
 	Note             string                `json:"Note"`
-	UnixTime         int64                 `json:"unixtime"`
+	Timestamp        int64                 `json:"Timestamp"`
 	Illuminance      IlluminanceJSON       `json:"Illuminance"`
 	ColorTemperature ColorTemperatureJSON  `json:"ColorTemperature"`
 	Tristimulus      TristimulusJSON       `json:"Tristimulus"`
 	CIE1931          CIE1931JSON           `json:"CIE1931"`
 	CIE1976          CIE1976JSON           `json:"CIE1976"`
 	DWL              DWLJSON               `json:"DWL"`
 	CRI              CRIJSON               `json:"CRI"`
-	Wavelengths      []WavelengthGroupJSON `json:"wavelengths"`
+	WaveLengths      []WaveLengthGroupJSON `json:"WaveLengths"`
 }
 
 type IlluminanceJSON struct {
@@ -61,7 +61,7 @@ type CRIRiJSON struct {
 	Value float64 `json:"value"`
 }
 
-type WavelengthGroupJSON struct {
+type WaveLengthGroupJSON struct {
 	Type  string     `json:"type"`
 	Waves []WaveJSON `json:"waves"`
 }
@@ -73,9 +73,9 @@ type WaveJSON struct {
 
 func NewFromMeasurement(meas *Measurement, measName, measNote string, measTime time.Time) MeasurementJSON {
 	res := MeasurementJSON{
-		Name:     measName,
-		Note:     measNote,
-		UnixTime: measTime.Unix(),
+		Name:      measName,
+		Note:      measNote,
+		Timestamp: measTime.Unix(),
 		Illuminance: IlluminanceJSON{
 			LUX: meas.Illuminance.Lux.Val,
 			Fc:  meas.Illuminance.FootCandle.Val,
@@ -105,7 +105,7 @@ func NewFromMeasurement(meas *Measurement, measName, measNote string, measTime t
 			RA: meas.ColorRenditionIndexes.Ra.Val,
 			Ri: []CRIRiJSON{},
 		},
-		Wavelengths: []WavelengthGroupJSON{
+		WaveLengths: []WaveLengthGroupJSON{
 			{Type: "1nm", Waves: []WaveJSON{}},
 			{Type: "5nm", Waves: []WaveJSON{}},
 		},
@@ -121,15 +121,15 @@ func NewFromMeasurement(meas *Measurement, measName, measNote string, measTime t
 
 	// Populate 1nm
 	for i, val := range &meas.SpectralData1nm {
-		res.Wavelengths[0].Waves = append(res.Wavelengths[0].Waves, WaveJSON{
+		res.WaveLengths[0].Waves = append(res.WaveLengths[0].Waves, WaveJSON{
 			Nm:    380 + i,
 			Value: val.Val,
 		})
 	}
 
 	// Populate 5nm
 	for i, val := range &meas.SpectralData5nm {
-		res.Wavelengths[1].Waves = append(res.Wavelengths[1].Waves, WaveJSON{
+		res.WaveLengths[1].Waves = append(res.WaveLengths[1].Waves, WaveJSON{
 			Nm:    380 + (i * 5),
 			Value: val.Val,
 		})