okoyono/weatherstation
7
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Code indention fixes

Browse source
This commit is contained in:
Kai Lauterbach 2023-12-23 08:02:44 +01:00
parent a50fe16819
commit 9256e7611f
2 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
firmware/constants.h
View file

@ -11,7 +11,6 @@
#define SENSOR_ESAVEMODE 6 #define SENSOR_ESAVEMODE 6
#define SENSOR_BATCHARGESTATE 7 #define SENSOR_BATCHARGESTATE 7
#define BAT_CHARGE_STATE_CHARGED 2.0 #define BAT_CHARGE_STATE_CHARGED 2.0
#define BAT_CHARGE_STATE_CHARGING 1.0 #define BAT_CHARGE_STATE_CHARGING 1.0
#define BAT_CHARGE_STATE_NOTCHARGING 0.0 #define BAT_CHARGE_STATE_NOTCHARGING 0.0

53
firmware/firmware.ino
View file

@ -26,7 +26,7 @@
#ifdef HTTP_CALL_SEND_JSON_DATA #ifdef HTTP_CALL_SEND_JSON_DATA
#include <ESP8266HTTPClient.h> #include <ESP8266HTTPClient.h>
#include <UrlEncode.h> // from bib manager UrlEncode by Masayuki #include <UrlEncode.h> // from bib manager UrlEncode 1.0.0 by Masayuki
#endif #endif
//*************************************************************************// //*************************************************************************//
@ -44,7 +44,8 @@
const uint8_t VALUES = 8; // see constants.h file - count of number of SENSOR_ defines const uint8_t VALUES = 8; // see constants.h file - count of number of SENSOR_ defines
float currentSensorData[VALUES] = { nanf("no value"), nanf("no value"), nanf("no value"), float currentSensorData[VALUES] = { nanf("no value"), nanf("no value"), nanf("no value"),
nanf("no value"), nanf("no value"), nanf("no value"), nanf("no value"), nanf("no value"), nanf("no value"),
nanf("no value"), nanf("no value") }; nanf("no value"), nanf("no value")
};
uint32_t update_sensor_cnt = 0; uint32_t update_sensor_cnt = 0;
uint32_t update_webserver_cnt = 0; uint32_t update_webserver_cnt = 0;
@ -756,30 +757,30 @@ String getJsonData()
{ {
debug(String(SENSOR_TEMPERATURE) + "=" + String(currentSensorData[SENSOR_TEMPERATURE])); debug(String(SENSOR_TEMPERATURE) + "=" + String(currentSensorData[SENSOR_TEMPERATURE]));
String msg = hb_ws_msg_start + String msg = hb_ws_msg_start +
hb_ws_msg_temp + hb_ws_msg_temp +
String(currentSensorData[SENSOR_TEMPERATURE], 2) + String(currentSensorData[SENSOR_TEMPERATURE], 2) +
", " + ", " +
hb_ws_msg_humi + hb_ws_msg_humi +
String((isnan(currentSensorData[SENSOR_HUMIDITY]) ? 0.0 : currentSensorData[SENSOR_HUMIDITY]), 2) + String((isnan(currentSensorData[SENSOR_HUMIDITY]) ? 0.0 : currentSensorData[SENSOR_HUMIDITY]), 2) +
", " + ", " +
hb_ws_msg_light + hb_ws_msg_light +
String(currentSensorData[SENSOR_LIGHT], 0) + // The light level for the homebridge-http-lux2 plugin is only able to parse integer values String(currentSensorData[SENSOR_LIGHT], 0) + // The light level for the homebridge-http-lux2 plugin is only able to parse integer values
", " + ", " +
hb_ws_msg_windspeed + hb_ws_msg_windspeed +
String(currentSensorData[SENSOR_WINDSPEED], 2) + String(currentSensorData[SENSOR_WINDSPEED], 2) +
", " + ", " +
hb_ws_msg_pressure + hb_ws_msg_pressure +
String(currentSensorData[SENSOR_PRESSURE], 2) + String(currentSensorData[SENSOR_PRESSURE], 2) +
", " + ", " +
hb_ws_msg_voltage + hb_ws_msg_voltage +
String(currentSensorData[SENSOR_VOLTAGE], 2) + String(currentSensorData[SENSOR_VOLTAGE], 2) +
", " + ", " +
hb_ws_msg_timestamp + hb_ws_msg_timestamp +
String(millis()) + String(millis()) +
", " + ", " +
hb_ws_msg_valid + hb_ws_msg_valid +
String(validData) + String(validData) +
hb_ws_msg_end; hb_ws_msg_end;
return msg; return msg;
} }