Compare commits

..

7 Commits

Author SHA1 Message Date
7049d21a41 Prepare release 3.3.8 2025-05-14 13:09:12 +07:00
d5cdeaa9f3 Fix print average function schedule
if pms value invalid show the channel
2025-05-14 13:01:23 +07:00
09207c6923 Merge pull request #319 from airgradienthq/fix/resizing-queue
Fix resizing measurement queue after post by cellular post
2025-05-14 12:53:07 +07:00
0a64424196 add show content delay for display brightness 2025-05-14 12:39:42 +07:00
5b38ca222b Prepare release 3.3.7 2025-05-12 10:54:38 +07:00
9ee35341a5 Merge pull request #318 from airgradienthq/feat/improve-measure-logs
Improve measurements logging
2025-05-11 14:22:08 +07:00
626a2240fa Fix resizing queue after success post
This fix should be make it more consistent
2025-05-09 15:45:53 +07:00
4 changed files with 22 additions and 17 deletions

View File

@ -270,6 +270,7 @@ void setup() {
Serial.println("Display brightness: " + String(configuration.getDisplayBrightness())); Serial.println("Display brightness: " + String(configuration.getDisplayBrightness()));
oledDisplay.setBrightness(configuration.getDisplayBrightness()); oledDisplay.setBrightness(configuration.getDisplayBrightness());
delay(DISPLAY_DELAY_SHOW_CONTENT_MS);
} }
@ -1428,13 +1429,17 @@ void postUsingCellular(bool forcePost) {
// Post success, remove the data that previously sent from queue // Post success, remove the data that previously sent from queue
xSemaphoreTake(mutexMeasurementCycleQueue, portMAX_DELAY); xSemaphoreTake(mutexMeasurementCycleQueue, portMAX_DELAY);
measurementCycleQueue.erase(measurementCycleQueue.begin(),
measurementCycleQueue.begin() + queueSize);
if (measurementCycleQueue.capacity() > RESERVED_MEASUREMENT_CYCLE_CAPACITY) { if (measurementCycleQueue.capacity() > RESERVED_MEASUREMENT_CYCLE_CAPACITY) {
Serial.println("measurementCycleQueue capacity more than reserved space, resizing.."); Serial.println("measurementCycleQueue capacity more than reserved space, resizing..");
measurementCycleQueue.resize(RESERVED_MEASUREMENT_CYCLE_CAPACITY); std::vector<Measurements::Measures> tmp;
tmp.reserve(RESERVED_MEASUREMENT_CYCLE_CAPACITY);
measurementCycleQueue.swap(tmp);
} else {
// If not more than the capacity, then just clear all the values
measurementCycleQueue.clear();
} }
xSemaphoreGive(mutexMeasurementCycleQueue); xSemaphoreGive(mutexMeasurementCycleQueue);
} }

View File

@ -1,5 +1,5 @@
name=AirGradient Air Quality Sensor name=AirGradient Air Quality Sensor
version=3.3.6 version=3.3.8
author=AirGradient <support@airgradient.com> author=AirGradient <support@airgradient.com>
maintainer=AirGradient <support@airgradient.com> maintainer=AirGradient <support@airgradient.com>
sentence=ESP32-C3 / ESP8266 library for air quality monitor measuring PM, CO2, Temperature, TVOC and Humidity with OLED display. sentence=ESP32-C3 / ESP8266 library for air quality monitor measuring PM, CO2, Temperature, TVOC and Humidity with OLED display.

View File

@ -656,59 +656,59 @@ void Measurements::printCurrentPMAverage(int ch) {
if (utils::isValidPm(_pm_01[idx].update.avg)) { if (utils::isValidPm(_pm_01[idx].update.avg)) {
Serial.printf("[%d] Atmospheric PM 1.0 = %.2f ug/m3\n", ch, _pm_01[idx].update.avg); Serial.printf("[%d] Atmospheric PM 1.0 = %.2f ug/m3\n", ch, _pm_01[idx].update.avg);
} else { } else {
Serial.printf("[%d] Atmospheric PM 1.0 = -\n"); Serial.printf("[%d] Atmospheric PM 1.0 = -\n", ch);
} }
if (utils::isValidPm(_pm_25[idx].update.avg)) { if (utils::isValidPm(_pm_25[idx].update.avg)) {
Serial.printf("[%d] Atmospheric PM 2.5 = %.2f ug/m3\n", ch, _pm_25[idx].update.avg); Serial.printf("[%d] Atmospheric PM 2.5 = %.2f ug/m3\n", ch, _pm_25[idx].update.avg);
} else { } else {
Serial.printf("[%d] Atmospheric PM 2.5 = -\n"); Serial.printf("[%d] Atmospheric PM 2.5 = -\n", ch);
} }
if (utils::isValidPm(_pm_10[idx].update.avg)) { if (utils::isValidPm(_pm_10[idx].update.avg)) {
Serial.printf("[%d] Atmospheric PM 10 = %.2f ug/m3\n", ch, _pm_10[idx].update.avg); Serial.printf("[%d] Atmospheric PM 10 = %.2f ug/m3\n", ch, _pm_10[idx].update.avg);
} else { } else {
Serial.printf("[%d] Atmospheric PM 10 = -\n"); Serial.printf("[%d] Atmospheric PM 10 = -\n", ch);
} }
if (utils::isValidPm(_pm_01_sp[idx].update.avg)) { if (utils::isValidPm(_pm_01_sp[idx].update.avg)) {
Serial.printf("[%d] Standard Particle PM 1.0 = %.2f ug/m3\n", ch, _pm_01_sp[idx].update.avg); Serial.printf("[%d] Standard Particle PM 1.0 = %.2f ug/m3\n", ch, _pm_01_sp[idx].update.avg);
} else { } else {
Serial.printf("[%d] Standard Particle PM 1.0 = -\n"); Serial.printf("[%d] Standard Particle PM 1.0 = -\n", ch);
} }
if (utils::isValidPm(_pm_25_sp[idx].update.avg)) { if (utils::isValidPm(_pm_25_sp[idx].update.avg)) {
Serial.printf("[%d] Standard Particle PM 2.5 = %.2f ug/m3\n", ch, _pm_25_sp[idx].update.avg); Serial.printf("[%d] Standard Particle PM 2.5 = %.2f ug/m3\n", ch, _pm_25_sp[idx].update.avg);
} else { } else {
Serial.printf("[%d] Standard Particle PM 2.5 = -\n"); Serial.printf("[%d] Standard Particle PM 2.5 = -\n", ch);
} }
if (utils::isValidPm(_pm_10_sp[idx].update.avg)) { if (utils::isValidPm(_pm_10_sp[idx].update.avg)) {
Serial.printf("[%d] Standard Particle PM 10 = %.2f ug/m3\n", ch, _pm_10_sp[idx].update.avg); Serial.printf("[%d] Standard Particle PM 10 = %.2f ug/m3\n", ch, _pm_10_sp[idx].update.avg);
} else { } else {
Serial.printf("[%d] Standard Particle PM 10 = -\n"); Serial.printf("[%d] Standard Particle PM 10 = -\n", ch);
} }
if (utils::isValidPm03Count(_pm_03_pc[idx].update.avg)) { if (utils::isValidPm03Count(_pm_03_pc[idx].update.avg)) {
Serial.printf("[%d] Particle Count 0.3 = %.1f\n", ch, _pm_03_pc[idx].update.avg); Serial.printf("[%d] Particle Count 0.3 = %.1f\n", ch, _pm_03_pc[idx].update.avg);
} else { } else {
Serial.printf("[%d] Particle Count 0.3 = -\n"); Serial.printf("[%d] Particle Count 0.3 = -\n", ch);
} }
if (utils::isValidPm03Count(_pm_05_pc[idx].update.avg)) { if (utils::isValidPm03Count(_pm_05_pc[idx].update.avg)) {
Serial.printf("[%d] Particle Count 0.5 = %.1f\n", ch, _pm_05_pc[idx].update.avg); Serial.printf("[%d] Particle Count 0.5 = %.1f\n", ch, _pm_05_pc[idx].update.avg);
} else { } else {
Serial.printf("[%d] Particle Count 0.5 = -\n"); Serial.printf("[%d] Particle Count 0.5 = -\n", ch);
} }
if (utils::isValidPm03Count(_pm_01_pc[idx].update.avg)) { if (utils::isValidPm03Count(_pm_01_pc[idx].update.avg)) {
Serial.printf("[%d] Particle Count 1.0 = %.1f\n", ch, _pm_01_pc[idx].update.avg); Serial.printf("[%d] Particle Count 1.0 = %.1f\n", ch, _pm_01_pc[idx].update.avg);
} else { } else {
Serial.printf("[%d] Particle Count 1.0 = -\n"); Serial.printf("[%d] Particle Count 1.0 = -\n", ch);
} }
if (utils::isValidPm03Count(_pm_25_pc[idx].update.avg)) { if (utils::isValidPm03Count(_pm_25_pc[idx].update.avg)) {
Serial.printf("[%d] Particle Count 2.5 = %.1f\n", ch, _pm_25_pc[idx].update.avg); Serial.printf("[%d] Particle Count 2.5 = %.1f\n", ch, _pm_25_pc[idx].update.avg);
} else { } else {
Serial.printf("[%d] Particle Count 2.5 = -\n"); Serial.printf("[%d] Particle Count 2.5 = -\n", ch);
} }
if (_pm_5_pc[idx].listValues.empty() == false) { if (_pm_5_pc[idx].listValues.empty() == false) {
if (utils::isValidPm03Count(_pm_5_pc[idx].update.avg)) { if (utils::isValidPm03Count(_pm_5_pc[idx].update.avg)) {
Serial.printf("[%d] Particle Count 5.0 = %.1f\n", ch, _pm_5_pc[idx].update.avg); Serial.printf("[%d] Particle Count 5.0 = %.1f\n", ch, _pm_5_pc[idx].update.avg);
} else { } else {
Serial.printf("[%d] Particle Count 5.0 = -\n"); Serial.printf("[%d] Particle Count 5.0 = -\n", ch);
} }
} }
@ -716,7 +716,7 @@ void Measurements::printCurrentPMAverage(int ch) {
if (utils::isValidPm03Count(_pm_10_pc[idx].update.avg)) { if (utils::isValidPm03Count(_pm_10_pc[idx].update.avg)) {
Serial.printf("[%d] Particle Count 10 = %.1f\n", ch, _pm_10_pc[idx].update.avg); Serial.printf("[%d] Particle Count 10 = %.1f\n", ch, _pm_10_pc[idx].update.avg);
} else { } else {
Serial.printf("[%d] Particle Count 10 = -\n"); Serial.printf("[%d] Particle Count 10 = -\n", ch);
} }
} }
} }

View File

@ -15,7 +15,7 @@
#include "Main/utils.h" #include "Main/utils.h"
#ifndef GIT_VERSION #ifndef GIT_VERSION
#define GIT_VERSION "3.3.6-snap" #define GIT_VERSION "3.3.8-snap"
#endif #endif