yetangitu/Battery-Emulator
1
0
Fork 0
mirror of https://github.com/dalathegreat/Battery-Emulator.git synced 2025-10-03 17:59:27 +02:00
Code Issues Projects Releases Packages Wiki Activity

Revert MQTT naming

Browse source
This commit is contained in:
Daniel 2024-02-20 21:45:49 +02:00
parent 4cf741a32b
commit 3fb362af09
2 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Software/src/battery/BATTERIES.h
View file

@ -48,15 +48,12 @@
#endif
#ifdef SERIAL_LINK_RECEIVER // The serial thing does its thing
void update_values_battery();
void receive_can_battery();
void send_can_battery();
void setup_battery(void);
#else
void update_values_battery();
void receive_can_battery(CAN_frame_t rx_frame);
#endif
void update_values_battery();
void send_can_battery();
void setup_battery(void);
#endif
#endif

18
Software/src/devboard/mqtt/mqtt.cpp
View file

@ -170,15 +170,15 @@ static void publish_common_info(void) {
} else {
snprintf(mqtt_msg, sizeof(mqtt_msg),
"{\n"
" \"system_scaled_SOC_pptt\": %.3f,\n"
" \"system_SOH_pptt\": %.3f,\n"
" \"system_temperature_min_dC\": %.3f,\n"
" \"system_temperature_max_dC\": %.3f,\n"
" \"system_active_power_W\": %.3f,\n"
" \"system_battery_current_dA\": %.3f,\n"
" \"system_cell_max_voltage_mV\": %.3f,\n"
" \"system_cell_min_voltage_mV\": %.3f,\n"
" \"system_battery_voltage_dV\": %d\n"
" \"SOC\": %.3f,\n"
" \"state_of_health\": %.3f,\n"
" \"temperature_min\": %.3f,\n"
" \"temperature_max\": %.3f,\n"
" \"stat_batt_power\": %.3f,\n"
" \"battery_current\": %.3f,\n"
" \"cell_max_voltage\": %.3f,\n"
" \"cell_min_voltage\": %.3f,\n"
" \"battery_voltage\": %d\n"
"}\n",
((float)system_scaled_SOC_pptt) / 100.0, ((float)system_SOH_pptt) / 100.0,
((float)((int16_t)system_temperature_min_dC)) / 10.0, ((float)((int16_t)system_temperature_max_dC)) / 10.0,