airgradienthq/arduino
1
0
Fork 1
mirror of https://github.com/airgradienthq/arduino.git synced 2025-07-29 08:27:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make sure transmit cycle not too long to wait divisible by 3

Browse Source
This commit is contained in:
samuelbles07
2025-04-10 02:06:11 +07:00
parent 040cb79a4d
commit 18a710ffc2
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
examples/OneOpenAir/OneOpenAir.ino
View File

@ -66,7 +66,7 @@ CC BY-SA 4.0 Attribution-ShareAlike 4.0 International License
#define WIFI_TRANSMISSION_INTERVAL 1 * 60000 /** ms */ #define WIFI_TRANSMISSION_INTERVAL 1 * 60000 /** ms */
#define CELLULAR_SERVER_CONFIG_SYNC_INTERVAL 30 * 60000 /** ms */ #define CELLULAR_SERVER_CONFIG_SYNC_INTERVAL 30 * 60000 /** ms */
#define CELLULAR_MEASUREMENT_INTERVAL 3 * 60000 /** ms */ #define CELLULAR_MEASUREMENT_INTERVAL 3 * 60000 /** ms */
#define CELLULAR_TRANSMISSION_INTERVAL 9 * 60000 /** ms */ #define CELLULAR_TRANSMISSION_INTERVAL 3 * 60000 /** ms */
#define MQTT_SYNC_INTERVAL 60000 /** ms */ #define MQTT_SYNC_INTERVAL 60000 /** ms */
#define SENSOR_CO2_CALIB_COUNTDOWN_MAX 5 /** sec */ #define SENSOR_CO2_CALIB_COUNTDOWN_MAX 5 /** sec */
#define SENSOR_TVOC_UPDATE_INTERVAL 1000 /** ms */ #define SENSOR_TVOC_UPDATE_INTERVAL 1000 /** ms */
@ -1353,7 +1353,10 @@ void postUsingWifi() {
Serial.printf("Free heap: %u\n", ESP.getFreeHeap()); Serial.printf("Free heap: %u\n", ESP.getFreeHeap());
} }
void postUsingCellular() { /**
* forcePost to force post without checking transmit cycle
*/
void postUsingCellular(bool forcePost) {
// Aquire queue mutex to get queue size // Aquire queue mutex to get queue size
xSemaphoreTake(mutexMeasurementCycleQueue, portMAX_DELAY); xSemaphoreTake(mutexMeasurementCycleQueue, portMAX_DELAY);
@ -1366,9 +1369,10 @@ void postUsingCellular() {
} }
// Check queue size if its ready to transmit // Check queue size if its ready to transmit
// It is ready if size is 1 or divisible by 3 // It is ready if size is divisible by 3
if (queueSize != 1 && (queueSize % MEASUREMENT_TRANSMIT_CYCLE) > 0) { if (!forcePost && (queueSize % MEASUREMENT_TRANSMIT_CYCLE) > 0) {
Serial.printf("Not ready to transmit, queue size are %d\n", queueSize); Serial.printf("Not ready to transmit, queue size are %d\n", queueSize);
xSemaphoreGive(mutexMeasurementCycleQueue);
return; return;
} }
@ -1413,7 +1417,7 @@ void sendDataToServer(void) {
if (networkOption == UseWifi) { if (networkOption == UseWifi) {
postUsingWifi(); postUsingWifi();
} else if (networkOption == UseCellular) { } else if (networkOption == UseCellular) {
postUsingCellular(); postUsingCellular(false);
} }
} }
@ -1553,7 +1557,7 @@ void networkingTask(void *args) {
delay(20000); delay(20000);
networkSignalCheck(); networkSignalCheck();
newMeasurementCycle(); newMeasurementCycle();
sendDataToServer(); postUsingCellular(true);
measurementSchedule.update(); measurementSchedule.update();
} }