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

feature/http_call_send_json #3

Merged
f merged 56 commits from feature/http_call_send_json into master 2022-11-27 11:02:22 +01:00
Conversation 0 Commits 56 Files changed 398 +9 -6
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit a210c94721 - Show all commits

15
firmware/firmware.ino
View file

@ -376,10 +376,12 @@ void loop() {
//*************************************************************************// //*************************************************************************//
#ifndef BATTERY_POWERED #ifndef BATTERY_POWERED
void _fsm_loop() { void _fsm_loop()
{
#ifdef WEBUPDATER_FEATURE #ifdef WEBUPDATER_FEATURE
if ((update_webserver_cnt + (UPDATE_WEBSERVER_INTVERVAL_MS)) <= millis()) { if ((update_webserver_cnt + (UPDATE_WEBSERVER_INTVERVAL_MS)) <= millis())
{
//debug("web updater call"); //debug("web updater call");
update_webserver_cnt = millis(); update_webserver_cnt = millis();
doWebUpdater(); doWebUpdater();
@ -391,12 +393,15 @@ void _fsm_loop() {
{ {
// send the data to the server // send the data to the server
debug("Sending weather json data to http webserver"); debug("Sending weather json data to http webserver");
//debug(String(0) + "=" + String(currentSensorData[0]));
//debug(String(SENSOR_TEMPERATURE) + "=" + String(currentSensorData[SENSOR_TEMPERATURE]));
http_call_send_json_data_cnt = millis(); http_call_send_json_data_cnt = millis();
http_call_send_json_data(); http_call_send_json_data();
} }
#endif #endif
switch (fsm_state) { switch (fsm_state)
{
/* -------------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------------- */
case FSM_STATE_1: case FSM_STATE_1:
@ -688,7 +693,7 @@ String getJsonData()
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
@ -711,8 +716,6 @@ String getJsonData()
void http_call_send_json_data() void http_call_send_json_data()
{ {
currentSensorData[sensor_cnt] = measure_wind_result();
//debug("http call to " + String(HTTP_CALL_SEND_JSON_DATA_URL)); //debug("http call to " + String(HTTP_CALL_SEND_JSON_DATA_URL));
// windspeed exceeded send http call // windspeed exceeded send http call