Skip to content

Commit

Permalink
Remove /api/devices/vitals queries as FW 23.44.0 removes this; for de…
Browse files Browse the repository at this point in the history 
…tails see jasonacox/pypowerwall/issues/57
  • Loading branch information
@iwvelando
iwvelando committed Jan 5, 2024
1 parent 40ea8f0 commit 1facae0
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 460 deletions.
13 changes: 0 additions & 13 deletions connect/connect.go
View file
Expand Up @@ -342,19 +342,6 @@ func GetAll(conf *config.Configuration, client *http.Client) (model.Teg, error)
teg.SystemStateOfEnergy.Timestamp = time.Now()
}(&wg)

wg.Add(1)
go func(waitgroup *sync.WaitGroup) {
defer waitgroup.Done()
endpoint := "/api/devices/vitals"
err := GetEndpoint(conf, client, endpoint, &teg.DevicesVitals.DevicesVitalsProto)
if err != nil {
errChan <- fmt.Errorf("error when querying %s, %s", endpoint, err)
return
}
teg.DevicesVitals.Timestamp = time.Now()
teg.DevicesVitals.Transform()
}(&wg)

go func() {
wg.Wait()
close(errChan)
Expand Down
228 changes: 0 additions & 228 deletions influxdb/influxdb.go
View file
Expand Up @@ -439,234 +439,6 @@ func WriteAll(conf *config.Configuration, writeAPI influxAPI.WriteAPI, metrics m
writeAPI.WritePoint(p)
}

// Solar device information
for _, inverter := range metrics.DevicesVitals.DevicesVitals.Inverters {
p = influx.NewPoint(
conf.InfluxDB.MeasurementPrefix+"energy_inverters",
map[string]string{
"gateway_id": metrics.Status.GatewayID,
"firmware_version": metrics.Status.FirmwareVersion,
"firmware_git_hash": metrics.Status.FirmwareGitHash,
"sync_type": metrics.Status.SyncType,
"site_name": metrics.SiteInfo.SiteName,
"site_grid_code": metrics.SiteInfo.GridCode.GridCode,
"site_country": metrics.SiteInfo.GridCode.Country,
"site_state": metrics.SiteInfo.GridCode.State,
"site_utility": metrics.SiteInfo.GridCode.Utility,
"din": inverter.Din,
"part_number": inverter.PartNumber,
"serial_number": inverter.SerialNumber,
"manufacturer": inverter.Manufacturer,
"parent_din": inverter.ComponentParentDin,
"inverter_firmware_version": inverter.FirmwareVersion,
"ecu_type": inverter.EcuType,
},
map[string]interface{}{
"pvac_vl1_ground": inverter.PvacVL1Ground,
"pvac_vl2_ground": inverter.PvacVL2Ground,
"pvac_v_hv_minus_chassis_dc": inverter.PvacVHvMinusChassisDC,
"pvac_lifetime_energy_pv_total": inverter.PvacLifetimeEnergyPvTotal,
"pvac_i_out": inverter.PvacIOut,
"pvac_v_out": inverter.PvacVOut,
"pvac_f_out": inverter.PvacFOut,
"pvac_p_out": inverter.PvacPOut,
"pvac_q_out": inverter.PvacQOut,
"pvac_state": inverter.PvacState,
"pvac_grid_state": inverter.PvacGridState,
"pvac_inv_state": inverter.PvacInvState,
"pvi_power_status_setpoint": inverter.PviPowerStatusSetpoint,
},
metrics.DevicesVitals.Timestamp)

writeAPI.WritePoint(p)

p = influx.NewPoint(
conf.InfluxDB.MeasurementPrefix+"energy_inverters",
map[string]string{
"gateway_id": metrics.Status.GatewayID,
"firmware_version": metrics.Status.FirmwareVersion,
"firmware_git_hash": metrics.Status.FirmwareGitHash,
"sync_type": metrics.Status.SyncType,
"site_name": metrics.SiteInfo.SiteName,
"site_grid_code": metrics.SiteInfo.GridCode.GridCode,
"site_country": metrics.SiteInfo.GridCode.Country,
"site_state": metrics.SiteInfo.GridCode.State,
"site_utility": metrics.SiteInfo.GridCode.Utility,
"din": inverter.Din,
"part_number": inverter.PartNumber,
"serial_number": inverter.SerialNumber,
"manufacturer": inverter.Manufacturer,
"parent_din": inverter.ComponentParentDin,
"inverter_firmware_version": inverter.FirmwareVersion,
"ecu_type": inverter.EcuType,
"string_id": "A",
},
map[string]interface{}{
"pvac_pv_state": inverter.PvacPvStateA,
"pvac_pv_current": inverter.PvacPvCurrentA,
"pvac_pv_measured_voltage": inverter.PvacPvMeasuredVoltageA,
"pvac_pv_measured_power": inverter.PvacPvMeasuredPowerA,
},
metrics.DevicesVitals.Timestamp)

writeAPI.WritePoint(p)

p = influx.NewPoint(
conf.InfluxDB.MeasurementPrefix+"energy_inverters",
map[string]string{
"gateway_id": metrics.Status.GatewayID,
"firmware_version": metrics.Status.FirmwareVersion,
"firmware_git_hash": metrics.Status.FirmwareGitHash,
"sync_type": metrics.Status.SyncType,
"site_name": metrics.SiteInfo.SiteName,
"site_grid_code": metrics.SiteInfo.GridCode.GridCode,
"site_country": metrics.SiteInfo.GridCode.Country,
"site_state": metrics.SiteInfo.GridCode.State,
"site_utility": metrics.SiteInfo.GridCode.Utility,
"din": inverter.Din,
"part_number": inverter.PartNumber,
"serial_number": inverter.SerialNumber,
"manufacturer": inverter.Manufacturer,
"parent_din": inverter.ComponentParentDin,
"inverter_firmware_version": inverter.FirmwareVersion,
"ecu_type": inverter.EcuType,
"string_id": "B",
},
map[string]interface{}{
"pvac_pv_state": inverter.PvacPvStateB,
"pvac_pv_current": inverter.PvacPvCurrentB,
"pvac_pv_measured_voltage": inverter.PvacPvMeasuredVoltageB,
"pvac_pv_measured_power": inverter.PvacPvMeasuredPowerB,
},
metrics.DevicesVitals.Timestamp)

writeAPI.WritePoint(p)

p = influx.NewPoint(
conf.InfluxDB.MeasurementPrefix+"energy_inverters",
map[string]string{
"gateway_id": metrics.Status.GatewayID,
"firmware_version": metrics.Status.FirmwareVersion,
"firmware_git_hash": metrics.Status.FirmwareGitHash,
"sync_type": metrics.Status.SyncType,
"site_name": metrics.SiteInfo.SiteName,
"site_grid_code": metrics.SiteInfo.GridCode.GridCode,
"site_country": metrics.SiteInfo.GridCode.Country,
"site_state": metrics.SiteInfo.GridCode.State,
"site_utility": metrics.SiteInfo.GridCode.Utility,
"din": inverter.Din,
"part_number": inverter.PartNumber,
"serial_number": inverter.SerialNumber,
"manufacturer": inverter.Manufacturer,
"parent_din": inverter.ComponentParentDin,
"inverter_firmware_version": inverter.FirmwareVersion,
"ecu_type": inverter.EcuType,
"string_id": "C",
},
map[string]interface{}{
"pvac_pv_state": inverter.PvacPvStateC,
"pvac_pv_current": inverter.PvacPvCurrentC,
"pvac_pv_measured_voltage": inverter.PvacPvMeasuredVoltageC,
"pvac_pv_measured_power": inverter.PvacPvMeasuredPowerC,
},
metrics.DevicesVitals.Timestamp)

writeAPI.WritePoint(p)

p = influx.NewPoint(
conf.InfluxDB.MeasurementPrefix+"energy_inverters",
map[string]string{
"gateway_id": metrics.Status.GatewayID,
"firmware_version": metrics.Status.FirmwareVersion,
"firmware_git_hash": metrics.Status.FirmwareGitHash,
"sync_type": metrics.Status.SyncType,
"site_name": metrics.SiteInfo.SiteName,
"site_grid_code": metrics.SiteInfo.GridCode.GridCode,
"site_country": metrics.SiteInfo.GridCode.Country,
"site_state": metrics.SiteInfo.GridCode.State,
"site_utility": metrics.SiteInfo.GridCode.Utility,
"din": inverter.Din,
"part_number": inverter.PartNumber,
"serial_number": inverter.SerialNumber,
"manufacturer": inverter.Manufacturer,
"parent_din": inverter.ComponentParentDin,
"inverter_firmware_version": inverter.FirmwareVersion,
"ecu_type": inverter.EcuType,
"string_id": "D",
},
map[string]interface{}{
"pvac_pv_state": inverter.PvacPvStateD,
"pvac_pv_current": inverter.PvacPvCurrentD,
"pvac_pv_measured_voltage": inverter.PvacPvMeasuredVoltageD,
"pvac_pv_measured_power": inverter.PvacPvMeasuredPowerD,
},
metrics.DevicesVitals.Timestamp)

writeAPI.WritePoint(p)
}

for _, temperature := range metrics.DevicesVitals.DevicesVitals.Temperatures {
// Device temperature information
p = influx.NewPoint(
conf.InfluxDB.MeasurementPrefix+"energy_devices",
map[string]string{
"gateway_id": metrics.Status.GatewayID,
"firmware_version": metrics.Status.FirmwareVersion,
"firmware_git_hash": metrics.Status.FirmwareGitHash,
"sync_type": metrics.Status.SyncType,
"site_name": metrics.SiteInfo.SiteName,
"site_grid_code": metrics.SiteInfo.GridCode.GridCode,
"site_country": metrics.SiteInfo.GridCode.Country,
"site_state": metrics.SiteInfo.GridCode.State,
"site_utility": metrics.SiteInfo.GridCode.Utility,
"din": temperature.Din,
"part_number": temperature.PartNumber,
"serial_number": temperature.SerialNumber,
"manufacturer": temperature.Manufacturer,
"parent_din": temperature.ComponentParentDin,
"device_firmware_version": temperature.FirmwareVersion,
"ecu_type": temperature.EcuType,
},
map[string]interface{}{
"thc_state": temperature.ThcState,
"thc_ambient_temp": temperature.ThcAmbientTemp,
},
metrics.DevicesVitals.Timestamp)

writeAPI.WritePoint(p)
}

// Device alerts information
for _, alertingDevice := range metrics.DevicesVitals.DevicesVitals.Alerts {
alerts := make(map[string]interface{})
for _, alert := range alertingDevice.Alerts {
alerts["alert_"+alert] = true
}
p = influx.NewPoint(
conf.InfluxDB.MeasurementPrefix+"energy_devices",
map[string]string{
"gateway_id": metrics.Status.GatewayID,
"firmware_version": metrics.Status.FirmwareVersion,
"firmware_git_hash": metrics.Status.FirmwareGitHash,
"sync_type": metrics.Status.SyncType,
"site_name": metrics.SiteInfo.SiteName,
"site_grid_code": metrics.SiteInfo.GridCode.GridCode,
"site_country": metrics.SiteInfo.GridCode.Country,
"site_state": metrics.SiteInfo.GridCode.State,
"site_utility": metrics.SiteInfo.GridCode.Utility,
"din": alertingDevice.Din,
"part_number": alertingDevice.PartNumber,
"serial_number": alertingDevice.SerialNumber,
"manufacturer": alertingDevice.Manufacturer,
"parent_din": alertingDevice.ComponentParentDin,
"device_firmware_version": alertingDevice.FirmwareVersion,
},
alerts,
metrics.DevicesVitals.Timestamp)

writeAPI.WritePoint(p)
}

// System status grid fault readings
var valueString string
for _, fault := range metrics.SystemStatus.GridFaults {
Expand Down

0 comments on commit 1facae0

Please sign in to comment.