Skip to content

Commit

Permalink
drivers/nhs_ser.c: upsdrv_updateinfo(): rename "nhs.*" datapoints int…
Browse files Browse the repository at this point in the history 
…o "experimental.nhs.*" namespace [#2692]

Signed-off-by: Jim Klimov <[email protected]>
  • Loading branch information
@jimklimov
jimklimov committed Nov 29, 2024
1 parent 740b900 commit cb5b4a0
Showing 1 changed file with 98 additions and 98 deletions.
196 changes: 98 additions & 98 deletions drivers/nhs_ser.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2003,118 +2003,118 @@ void upsdrv_updateinfo(void) {
dstate_setinfo("battery.charger.status", "%s", "RESTING");
}
/* Now, creating a structure called NHS, */
dstate_setinfo("nhs.hw.header", "%u", lastpkthwinfo.header);
dstate_setinfo("nhs.hw.size", "%u", lastpkthwinfo.size);
dstate_setinfo("nhs.hw.type", "%c", lastpkthwinfo.type);
dstate_setinfo("nhs.hw.model", "%u", lastpkthwinfo.model);
dstate_setinfo("nhs.hw.hardwareversion", "%u", lastpkthwinfo.hardwareversion);
dstate_setinfo("nhs.hw.softwareversion", "%u", lastpkthwinfo.softwareversion);
dstate_setinfo("nhs.hw.configuration", "%u", lastpkthwinfo.configuration);
dstate_setinfo("experimental.nhs.hw.header", "%u", lastpkthwinfo.header);
dstate_setinfo("experimental.nhs.hw.size", "%u", lastpkthwinfo.size);
dstate_setinfo("experimental.nhs.hw.type", "%c", lastpkthwinfo.type);
dstate_setinfo("experimental.nhs.hw.model", "%u", lastpkthwinfo.model);
dstate_setinfo("experimental.nhs.hw.hardwareversion", "%u", lastpkthwinfo.hardwareversion);
dstate_setinfo("experimental.nhs.hw.softwareversion", "%u", lastpkthwinfo.softwareversion);
dstate_setinfo("experimental.nhs.hw.configuration", "%u", lastpkthwinfo.configuration);
for (i = 0; i < 5; i++) {
/* Reusing variable */
snprintf(alarm, sizeof(alarm), "nhs.hw.configuration_array_p%d", i);
snprintf(alarm, sizeof(alarm), "experimental.nhs.hw.configuration_array_p%d", i);
dstate_setinfo(alarm, "%u", lastpkthwinfo.configuration_array[i]);
}
dstate_setinfo("nhs.hw.c_oem_mode", "%s", lastpkthwinfo.c_oem_mode ? "true" : "false");
dstate_setinfo("nhs.hw.c_buzzer_disable", "%s", lastpkthwinfo.c_buzzer_disable ? "true" : "false");
dstate_setinfo("nhs.hw.c_potmin_disable", "%s", lastpkthwinfo.c_potmin_disable ? "true" : "false");
dstate_setinfo("nhs.hw.c_rearm_enable", "%s", lastpkthwinfo.c_rearm_enable ? "true" : "false");
dstate_setinfo("nhs.hw.c_bootloader_enable", "%s", lastpkthwinfo.c_bootloader_enable ? "true" : "false");
dstate_setinfo("nhs.hw.numbatteries", "%u", lastpkthwinfo.numbatteries);
dstate_setinfo("nhs.hw.undervoltagein120V", "%u", lastpkthwinfo.undervoltagein120V);
dstate_setinfo("nhs.hw.overvoltagein120V", "%u", lastpkthwinfo.overvoltagein120V);
dstate_setinfo("nhs.hw.undervoltagein220V", "%u", lastpkthwinfo.undervoltagein220V);
dstate_setinfo("nhs.hw.overvoltagein220V", "%u", lastpkthwinfo.overvoltagein220V);
dstate_setinfo("nhs.hw.tensionout120V", "%u", lastpkthwinfo.tensionout120V);
dstate_setinfo("nhs.hw.tensionout220V", "%u", lastpkthwinfo.tensionout220V);
dstate_setinfo("nhs.hw.statusval", "%u", lastpkthwinfo.statusval);
dstate_setinfo("experimental.nhs.hw.c_oem_mode", "%s", lastpkthwinfo.c_oem_mode ? "true" : "false");
dstate_setinfo("experimental.nhs.hw.c_buzzer_disable", "%s", lastpkthwinfo.c_buzzer_disable ? "true" : "false");
dstate_setinfo("experimental.nhs.hw.c_potmin_disable", "%s", lastpkthwinfo.c_potmin_disable ? "true" : "false");
dstate_setinfo("experimental.nhs.hw.c_rearm_enable", "%s", lastpkthwinfo.c_rearm_enable ? "true" : "false");
dstate_setinfo("experimental.nhs.hw.c_bootloader_enable", "%s", lastpkthwinfo.c_bootloader_enable ? "true" : "false");
dstate_setinfo("experimental.nhs.hw.numbatteries", "%u", lastpkthwinfo.numbatteries);
dstate_setinfo("experimental.nhs.hw.undervoltagein120V", "%u", lastpkthwinfo.undervoltagein120V);
dstate_setinfo("experimental.nhs.hw.overvoltagein120V", "%u", lastpkthwinfo.overvoltagein120V);
dstate_setinfo("experimental.nhs.hw.undervoltagein220V", "%u", lastpkthwinfo.undervoltagein220V);
dstate_setinfo("experimental.nhs.hw.overvoltagein220V", "%u", lastpkthwinfo.overvoltagein220V);
dstate_setinfo("experimental.nhs.hw.tensionout120V", "%u", lastpkthwinfo.tensionout120V);
dstate_setinfo("experimental.nhs.hw.tensionout220V", "%u", lastpkthwinfo.tensionout220V);
dstate_setinfo("experimental.nhs.hw.statusval", "%u", lastpkthwinfo.statusval);
for (i = 0; i < 6; i++) {
/* Reusing variable */
snprintf(alarm, sizeof(alarm), "nhs.hw.status_p%d", i);
snprintf(alarm, sizeof(alarm), "experimental.nhs.hw.status_p%d", i);
dstate_setinfo(alarm, "%u", lastpkthwinfo.status[i]);
}
dstate_setinfo("nhs.hw.s_220V_in", "%s", lastpkthwinfo.s_220V_in ? "true" : "false");
dstate_setinfo("nhs.hw.s_220V_out", "%s", lastpkthwinfo.s_220V_out ? "true" : "false");
dstate_setinfo("nhs.hw.s_sealed_battery", "%s", lastpkthwinfo.s_sealed_battery ? "true" : "false");
dstate_setinfo("nhs.hw.s_show_out_tension", "%s", lastpkthwinfo.s_show_out_tension ? "true" : "false");
dstate_setinfo("nhs.hw.s_show_temperature", "%s", lastpkthwinfo.s_show_temperature ? "true" : "false");
dstate_setinfo("nhs.hw.s_show_charger_current", "%s", lastpkthwinfo.s_show_charger_current ? "true" : "false");
dstate_setinfo("nhs.hw.chargercurrent", "%u", lastpkthwinfo.chargercurrent);
dstate_setinfo("nhs.hw.checksum", "%u", lastpkthwinfo.checksum);
dstate_setinfo("nhs.hw.checksum_calc", "%u", lastpkthwinfo.checksum_calc);
dstate_setinfo("nhs.hw.checksum_ok", "%s", lastpkthwinfo.checksum_ok ? "true" : "false");
dstate_setinfo("nhs.hw.serial", "%s", lastpkthwinfo.serial);
dstate_setinfo("nhs.hw.year", "%u", lastpkthwinfo.year);
dstate_setinfo("nhs.hw.month", "%u", lastpkthwinfo.month);
dstate_setinfo("nhs.hw.wday", "%u", lastpkthwinfo.wday);
dstate_setinfo("nhs.hw.hour", "%u", lastpkthwinfo.hour);
dstate_setinfo("nhs.hw.minute", "%u", lastpkthwinfo.minute);
dstate_setinfo("nhs.hw.second", "%u", lastpkthwinfo.second);
dstate_setinfo("nhs.hw.alarmyear", "%u", lastpkthwinfo.alarmyear);
dstate_setinfo("nhs.hw.alarmmonth", "%u", lastpkthwinfo.alarmmonth);
dstate_setinfo("nhs.hw.alarmwday", "%u", lastpkthwinfo.alarmwday);
dstate_setinfo("nhs.hw.alarmday", "%u", lastpkthwinfo.alarmday);
dstate_setinfo("nhs.hw.alarmhour", "%u", lastpkthwinfo.alarmhour);
dstate_setinfo("nhs.hw.alarmminute", "%u", lastpkthwinfo.alarmminute);
dstate_setinfo("nhs.hw.alarmsecond", "%u", lastpkthwinfo.alarmsecond);
dstate_setinfo("nhs.hw.end_marker", "%u", lastpkthwinfo.end_marker);
dstate_setinfo("experimental.nhs.hw.s_220V_in", "%s", lastpkthwinfo.s_220V_in ? "true" : "false");
dstate_setinfo("experimental.nhs.hw.s_220V_out", "%s", lastpkthwinfo.s_220V_out ? "true" : "false");
dstate_setinfo("experimental.nhs.hw.s_sealed_battery", "%s", lastpkthwinfo.s_sealed_battery ? "true" : "false");
dstate_setinfo("experimental.nhs.hw.s_show_out_tension", "%s", lastpkthwinfo.s_show_out_tension ? "true" : "false");
dstate_setinfo("experimental.nhs.hw.s_show_temperature", "%s", lastpkthwinfo.s_show_temperature ? "true" : "false");
dstate_setinfo("experimental.nhs.hw.s_show_charger_current", "%s", lastpkthwinfo.s_show_charger_current ? "true" : "false");
dstate_setinfo("experimental.nhs.hw.chargercurrent", "%u", lastpkthwinfo.chargercurrent);
dstate_setinfo("experimental.nhs.hw.checksum", "%u", lastpkthwinfo.checksum);
dstate_setinfo("experimental.nhs.hw.checksum_calc", "%u", lastpkthwinfo.checksum_calc);
dstate_setinfo("experimental.nhs.hw.checksum_ok", "%s", lastpkthwinfo.checksum_ok ? "true" : "false");
dstate_setinfo("experimental.nhs.hw.serial", "%s", lastpkthwinfo.serial);
dstate_setinfo("experimental.nhs.hw.year", "%u", lastpkthwinfo.year);
dstate_setinfo("experimental.nhs.hw.month", "%u", lastpkthwinfo.month);
dstate_setinfo("experimental.nhs.hw.wday", "%u", lastpkthwinfo.wday);
dstate_setinfo("experimental.nhs.hw.hour", "%u", lastpkthwinfo.hour);
dstate_setinfo("experimental.nhs.hw.minute", "%u", lastpkthwinfo.minute);
dstate_setinfo("experimental.nhs.hw.second", "%u", lastpkthwinfo.second);
dstate_setinfo("experimental.nhs.hw.alarmyear", "%u", lastpkthwinfo.alarmyear);
dstate_setinfo("experimental.nhs.hw.alarmmonth", "%u", lastpkthwinfo.alarmmonth);
dstate_setinfo("experimental.nhs.hw.alarmwday", "%u", lastpkthwinfo.alarmwday);
dstate_setinfo("experimental.nhs.hw.alarmday", "%u", lastpkthwinfo.alarmday);
dstate_setinfo("experimental.nhs.hw.alarmhour", "%u", lastpkthwinfo.alarmhour);
dstate_setinfo("experimental.nhs.hw.alarmminute", "%u", lastpkthwinfo.alarmminute);
dstate_setinfo("experimental.nhs.hw.alarmsecond", "%u", lastpkthwinfo.alarmsecond);
dstate_setinfo("experimental.nhs.hw.end_marker", "%u", lastpkthwinfo.end_marker);

/* Data packet */
dstate_setinfo("nhs.data.header", "%u", lastpktdata.header);
dstate_setinfo("nhs.data.length", "%u", lastpktdata.length);
dstate_setinfo("nhs.data.packet_type", "%c", lastpktdata.packet_type);
dstate_setinfo("nhs.data.vacinrms_high", "%u", lastpktdata.vacinrms_high);
dstate_setinfo("nhs.data.vacinrms_low", "%u", lastpktdata.vacinrms_low);
dstate_setinfo("nhs.data.vacinrms", "%0.2f", lastpktdata.vacinrms);
dstate_setinfo("nhs.data.vdcmed_high", "%u", lastpktdata.vdcmed_high);
dstate_setinfo("nhs.data.vdcmed_low", "%u", lastpktdata.vdcmed_low);
dstate_setinfo("nhs.data.vdcmed", "%0.2f", lastpktdata.vdcmed);
dstate_setinfo("nhs.data.vdcmed_real", "%0.2f", lastpktdata.vdcmed_real);
dstate_setinfo("nhs.data.potrms", "%u", lastpktdata.potrms);
dstate_setinfo("nhs.data.vacinrmsmin_high", "%u", lastpktdata.vacinrmsmin_high);
dstate_setinfo("nhs.data.vacinrmsmin_low", "%u", lastpktdata.vacinrmsmin_low);
dstate_setinfo("nhs.data.vacinrmsmin", "%0.2f", lastpktdata.vacinrmsmin);
dstate_setinfo("nhs.data.vacinrmsmax_high", "%u", lastpktdata.vacinrmsmax_high);
dstate_setinfo("nhs.data.vacinrmsmax_low", "%u", lastpktdata.vacinrmsmax_low);
dstate_setinfo("nhs.data.vacinrmsmax", "%0.2f", lastpktdata.vacinrmsmax);
dstate_setinfo("nhs.data.vacoutrms_high", "%u", lastpktdata.vacoutrms_high);
dstate_setinfo("nhs.data.vacoutrms_low", "%u", lastpktdata.vacoutrms_low);
dstate_setinfo("nhs.data.vacoutrms", "%0.2f", lastpktdata.vacoutrms);
dstate_setinfo("nhs.data.tempmed_high", "%u", lastpktdata.tempmed_high);
dstate_setinfo("nhs.data.tempmed_low", "%u", lastpktdata.tempmed_low);
dstate_setinfo("nhs.data.tempmed", "%0.2f", lastpktdata.tempmed);
dstate_setinfo("nhs.data.tempmed_real", "%0.2f", lastpktdata.tempmed_real);
dstate_setinfo("nhs.data.icarregrms", "%u", lastpktdata.icarregrms);
dstate_setinfo("nhs.data.icarregrms_real", "%u", lastpktdata.icarregrms_real);
dstate_setinfo("nhs.data.battery_tension", "%0.2f", lastpktdata.battery_tension);
dstate_setinfo("nhs.data.perc_output", "%u", lastpktdata.perc_output);
dstate_setinfo("nhs.data.statusval", "%u", lastpktdata.statusval);
dstate_setinfo("experimental.nhs.data.header", "%u", lastpktdata.header);
dstate_setinfo("experimental.nhs.data.length", "%u", lastpktdata.length);
dstate_setinfo("experimental.nhs.data.packet_type", "%c", lastpktdata.packet_type);
dstate_setinfo("experimental.nhs.data.vacinrms_high", "%u", lastpktdata.vacinrms_high);
dstate_setinfo("experimental.nhs.data.vacinrms_low", "%u", lastpktdata.vacinrms_low);
dstate_setinfo("experimental.nhs.data.vacinrms", "%0.2f", lastpktdata.vacinrms);
dstate_setinfo("experimental.nhs.data.vdcmed_high", "%u", lastpktdata.vdcmed_high);
dstate_setinfo("experimental.nhs.data.vdcmed_low", "%u", lastpktdata.vdcmed_low);
dstate_setinfo("experimental.nhs.data.vdcmed", "%0.2f", lastpktdata.vdcmed);
dstate_setinfo("experimental.nhs.data.vdcmed_real", "%0.2f", lastpktdata.vdcmed_real);
dstate_setinfo("experimental.nhs.data.potrms", "%u", lastpktdata.potrms);
dstate_setinfo("experimental.nhs.data.vacinrmsmin_high", "%u", lastpktdata.vacinrmsmin_high);
dstate_setinfo("experimental.nhs.data.vacinrmsmin_low", "%u", lastpktdata.vacinrmsmin_low);
dstate_setinfo("experimental.nhs.data.vacinrmsmin", "%0.2f", lastpktdata.vacinrmsmin);
dstate_setinfo("experimental.nhs.data.vacinrmsmax_high", "%u", lastpktdata.vacinrmsmax_high);
dstate_setinfo("experimental.nhs.data.vacinrmsmax_low", "%u", lastpktdata.vacinrmsmax_low);
dstate_setinfo("experimental.nhs.data.vacinrmsmax", "%0.2f", lastpktdata.vacinrmsmax);
dstate_setinfo("experimental.nhs.data.vacoutrms_high", "%u", lastpktdata.vacoutrms_high);
dstate_setinfo("experimental.nhs.data.vacoutrms_low", "%u", lastpktdata.vacoutrms_low);
dstate_setinfo("experimental.nhs.data.vacoutrms", "%0.2f", lastpktdata.vacoutrms);
dstate_setinfo("experimental.nhs.data.tempmed_high", "%u", lastpktdata.tempmed_high);
dstate_setinfo("experimental.nhs.data.tempmed_low", "%u", lastpktdata.tempmed_low);
dstate_setinfo("experimental.nhs.data.tempmed", "%0.2f", lastpktdata.tempmed);
dstate_setinfo("experimental.nhs.data.tempmed_real", "%0.2f", lastpktdata.tempmed_real);
dstate_setinfo("experimental.nhs.data.icarregrms", "%u", lastpktdata.icarregrms);
dstate_setinfo("experimental.nhs.data.icarregrms_real", "%u", lastpktdata.icarregrms_real);
dstate_setinfo("experimental.nhs.data.battery_tension", "%0.2f", lastpktdata.battery_tension);
dstate_setinfo("experimental.nhs.data.perc_output", "%u", lastpktdata.perc_output);
dstate_setinfo("experimental.nhs.data.statusval", "%u", lastpktdata.statusval);
for (i = 0; i < 8; i++) {
/* Reusing variable */
snprintf(alarm, sizeof(alarm), "nhs.data.status_p%d", i);
snprintf(alarm, sizeof(alarm), "experimental.nhs.data.status_p%d", i);
dstate_setinfo(alarm, "%u", lastpktdata.status[i]);
}
dstate_setinfo("nhs.data.nominaltension", "%u", lastpktdata.nominaltension);
dstate_setinfo("nhs.data.timeremain", "%0.2f", lastpktdata.timeremain);
dstate_setinfo("nhs.data.s_battery_mode", "%s", lastpktdata.s_battery_mode ? "true" : "false");
dstate_setinfo("nhs.data.s_battery_low", "%s", lastpktdata.s_battery_low ? "true" : "false");
dstate_setinfo("nhs.data.s_network_failure", "%s", lastpktdata.s_network_failure ? "true" : "false");
dstate_setinfo("nhs.data.s_fast_network_failure", "%s", lastpktdata.s_fast_network_failure ? "true" : "false");
dstate_setinfo("nhs.data.s_220_in", "%s", lastpktdata.s_220_in ? "true" : "false");
dstate_setinfo("nhs.data.s_220_out", "%s", lastpktdata.s_220_out ? "true" : "false");
dstate_setinfo("nhs.data.s_bypass_on", "%s", lastpktdata.s_bypass_on ? "true" : "false");
dstate_setinfo("nhs.data.s_charger_on", "%s", lastpktdata.s_charger_on ? "true" : "false");
dstate_setinfo("nhs.data.checksum", "%u", lastpktdata.checksum);
dstate_setinfo("nhs.data.checksum_ok", "%s", lastpktdata.checksum_ok ? "true" : "false");
dstate_setinfo("nhs.data.checksum_calc", "%u", lastpktdata.checksum_calc);
dstate_setinfo("nhs.data.end_marker", "%u", lastpktdata.end_marker);
dstate_setinfo("nhs.param.va", "%u", va);
dstate_setinfo("nhs.param.pf", "%0.2f", pf);
dstate_setinfo("nhs.param.ah", "%u", ah);
dstate_setinfo("nhs.param.vin_low_warn_perc", "%0.2f", get_vin_perc("vin_low_warn_perc"));
dstate_setinfo("nhs.param.vin_low_crit_perc", "%0.2f", get_vin_perc("vin_low_crit_perc"));
dstate_setinfo("nhs.param.vin_high_warn_perc", "%0.2f", get_vin_perc("vin_high_warn_perc"));
dstate_setinfo("nhs.param.vin_high_crit_perc", "%0.2f", get_vin_perc("vin_high_crit_perc"));
dstate_setinfo("experimental.nhs.data.nominaltension", "%u", lastpktdata.nominaltension);
dstate_setinfo("experimental.nhs.data.timeremain", "%0.2f", lastpktdata.timeremain);
dstate_setinfo("experimental.nhs.data.s_battery_mode", "%s", lastpktdata.s_battery_mode ? "true" : "false");
dstate_setinfo("experimental.nhs.data.s_battery_low", "%s", lastpktdata.s_battery_low ? "true" : "false");
dstate_setinfo("experimental.nhs.data.s_network_failure", "%s", lastpktdata.s_network_failure ? "true" : "false");
dstate_setinfo("experimental.nhs.data.s_fast_network_failure", "%s", lastpktdata.s_fast_network_failure ? "true" : "false");
dstate_setinfo("experimental.nhs.data.s_220_in", "%s", lastpktdata.s_220_in ? "true" : "false");
dstate_setinfo("experimental.nhs.data.s_220_out", "%s", lastpktdata.s_220_out ? "true" : "false");
dstate_setinfo("experimental.nhs.data.s_bypass_on", "%s", lastpktdata.s_bypass_on ? "true" : "false");
dstate_setinfo("experimental.nhs.data.s_charger_on", "%s", lastpktdata.s_charger_on ? "true" : "false");
dstate_setinfo("experimental.nhs.data.checksum", "%u", lastpktdata.checksum);
dstate_setinfo("experimental.nhs.data.checksum_ok", "%s", lastpktdata.checksum_ok ? "true" : "false");
dstate_setinfo("experimental.nhs.data.checksum_calc", "%u", lastpktdata.checksum_calc);
dstate_setinfo("experimental.nhs.data.end_marker", "%u", lastpktdata.end_marker);
dstate_setinfo("experimental.nhs.param.va", "%u", va);
dstate_setinfo("experimental.nhs.param.pf", "%0.2f", pf);
dstate_setinfo("experimental.nhs.param.ah", "%u", ah);
dstate_setinfo("experimental.nhs.param.vin_low_warn_perc", "%0.2f", get_vin_perc("vin_low_warn_perc"));
dstate_setinfo("experimental.nhs.param.vin_low_crit_perc", "%0.2f", get_vin_perc("vin_low_crit_perc"));
dstate_setinfo("experimental.nhs.param.vin_high_warn_perc", "%0.2f", get_vin_perc("vin_high_warn_perc"));
dstate_setinfo("experimental.nhs.param.vin_high_crit_perc", "%0.2f", get_vin_perc("vin_high_crit_perc"));

dstate_dataok();
} /* end if */
Expand Down

0 comments on commit cb5b4a0

Please sign in to comment.