Skip to content

Minor fixes to airrohr-firmware #1057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: beta
Choose a base branch
from
Open

Minor fixes to airrohr-firmware #1057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e06ed2
chore(airrohr-firmware.ino): Remove trailing whitespace
mstv May 30, 2025
69d0f3e
fix(DBG_TXT_PRESSURE): Fixup measurement unit
mstv May 24, 2025
0366d65
fix(loop): Update display after fetching sensors
mstv May 30, 2025
fbbbdc7
fix(sntp_time_set): Avoid overflow to 0
mstv May 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 48 additions & 45 deletions airrohr-firmware/airrohr-firmware.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@
* latest build using lib 2.6.2
* DATA: [==== ] 41.7% (used 34128 bytes from 81920 bytes)
* PROGRAM: [====== ] 67.2% (used 701371 bytes from 1044464 bytes)
*
*
************************************************************************/

#include <WString.h>
#include <pgmspace.h>

Expand Down Expand Up @@ -133,7 +133,7 @@ String SOFTWARE_VERSION(SOFTWARE_VERSION_STR);
namespace cfg
{
unsigned debug = DEBUG;

unsigned time_for_wifi_config = 600000;
unsigned sending_intervall_ms = 145000;
bool powersave;
Expand Down Expand Up @@ -977,7 +977,7 @@ static void NPM_fan_speed()
}
}

static String NPM_temp_humi()
static String NPM_temp_humi()
{
uint16_t NPM_temp;
uint16_t NPM_humi;
Expand Down Expand Up @@ -1574,9 +1574,9 @@ static bool webserver_request_auth()
static void sendHttpRedirect()
{
const IPAddress defaultIP(
default_ip_first_octet,
default_ip_second_octet,
default_ip_third_octet,
default_ip_first_octet,
default_ip_second_octet,
default_ip_third_octet,
default_ip_fourth_octet);

//String defaultAddress = F("http://") + defaultIP.toString() + F("/config");
Expand Down Expand Up @@ -2165,7 +2165,7 @@ static void webserver_values()
add_table_pm_value(FPSTR(SENSORS_IPS), FPSTR(WEB_PM10), last_value_IPS_P1);
add_table_nc_value(FPSTR(SENSORS_IPS), FPSTR(WEB_NC0k1), last_value_IPS_N01);
add_table_nc_value(FPSTR(SENSORS_IPS), FPSTR(WEB_NC0k3), last_value_IPS_N03);
add_table_nc_value(FPSTR(SENSORS_IPS), FPSTR(WEB_NC0k5), last_value_IPS_N05);
add_table_nc_value(FPSTR(SENSORS_IPS), FPSTR(WEB_NC0k5), last_value_IPS_N05);
add_table_nc_value(FPSTR(SENSORS_IPS), FPSTR(WEB_NC1k0), last_value_IPS_N1);
add_table_nc_value(FPSTR(SENSORS_IPS), FPSTR(WEB_NC2k5), last_value_IPS_N25);
add_table_nc_value(FPSTR(SENSORS_IPS), FPSTR(WEB_NC5k0), last_value_IPS_N5);
Expand Down Expand Up @@ -2730,7 +2730,7 @@ static void setup_webserver()
server.on(F("/favicon.ico"), webserver_favicon);
server.on(F(STATIC_PREFIX), webserver_static);
server.onNotFound(webserver_not_found);


debug_outln_info(F("Starting Webserver... "), WiFi.localIP().toString());
server.begin();
Expand Down Expand Up @@ -2820,11 +2820,11 @@ static void wifiConfig()

WiFi.mode(WIFI_AP);
const IPAddress apIP(
default_ip_first_octet,
default_ip_second_octet,
default_ip_third_octet,
default_ip_first_octet,
default_ip_second_octet,
default_ip_third_octet,
default_ip_fourth_octet);

WiFi.softAPConfig(apIP, apIP, IPAddress(255, 255, 255, 0));
WiFi.softAP(cfg::fs_ssid, cfg::fs_pwd, selectChannelForAp());
// In case we create a unique password at first start
Expand Down Expand Up @@ -3917,7 +3917,7 @@ static void fetchSensorNPM(String &s)
NPM_waiting_for_16 = NPM_REPLY_HEADER_16;
}


if (msSince(starttime) > (cfg::sending_intervall_ms - READINGTIME_NPM_MS))
{ //DIMINUER LE READING TIME

Expand Down Expand Up @@ -4109,7 +4109,7 @@ static void fetchSensorIPS(String &s)

while (serialIPS.available() > 0)
{
serialIPS.read();
serialIPS.read();
}


Expand All @@ -4132,7 +4132,7 @@ static void fetchSensorIPS(String &s)
}

//VIDER LE BUFFER DU START?

if (msSince(starttime) > (cfg::sending_intervall_ms - READINGTIME_IPS_MS))
{ //DIMINUER LE READING TIME

Expand All @@ -4148,13 +4148,13 @@ static void fetchSensorIPS(String &s)

if (serialIPS.available() > 0)
{
serial_data = serialIPS.readString();
serial_data = serialIPS.readString();
}


// while (serialIPS.available() > 0)
// {
// serialIPS.read();
// serialIPS.read();
// }

Debug.println(serial_data);
Expand All @@ -4176,7 +4176,7 @@ static void fetchSensorIPS(String &s)
int index12 = serial_data.indexOf(",PM2.5,");
int index13 = serial_data.indexOf(",PM5.0,");
int index14 = serial_data.indexOf(",PM10,");
int index15 = serial_data.indexOf(",IPS");
int index15 = serial_data.indexOf(",IPS");

String N01_serial = serial_data.substring(index1+6,index2);
String N03_serial = serial_data.substring(index2+7,index3);
Expand Down Expand Up @@ -4237,7 +4237,7 @@ static void fetchSensorIPS(String &s)
UPDATE_MIN_MAX(ips_pm25_min, ips_pm25_max, pm25_serial.toFloat());
UPDATE_MIN_MAX(ips_pm5_min, ips_pm5_max, pm5_serial.toFloat());
UPDATE_MIN_MAX(ips_pm10_min, ips_pm10_max, pm10_serial.toFloat());

UPDATE_MIN_MAX(ips_pm01_min_pcs, ips_pm01_max_pcs, strtoul(N01_serial.c_str(),NULL,10));
UPDATE_MIN_MAX(ips_pm03_min_pcs, ips_pm03_max_pcs, strtoul(N03_serial.c_str(),NULL,10));
UPDATE_MIN_MAX(ips_pm05_min_pcs, ips_pm05_max_pcs, strtoul(N05_serial.c_str(),NULL,10));
Expand Down Expand Up @@ -5053,7 +5053,7 @@ static void display_values()
if (cfg::npm_read)
{
screens[screen_count++] = 9;
screens[screen_count++] = 10;
screens[screen_count++] = 10;
}
if (cfg::ips_read)
{
Expand Down Expand Up @@ -5356,13 +5356,13 @@ static void init_display()
}
if (cfg::has_lcd1602) {
lcd_1602 = new LiquidCrystal_I2C(
lcd_1602_default_i2c_address,
lcd_1602_columns,
lcd_1602_default_i2c_address,
lcd_1602_columns,
lcd_1602_rows);
} else if (cfg::has_lcd1602_27) {
lcd_1602 = new LiquidCrystal_I2C(
lcd_1602_alternate_i2c_address,
lcd_1602_columns,
lcd_1602_alternate_i2c_address,
lcd_1602_columns,
lcd_1602_rows);
}
if (lcd_1602)
Expand All @@ -5372,13 +5372,13 @@ static void init_display()
}
if (cfg::has_lcd2004) {
lcd_2004 = new LiquidCrystal_I2C(
lcd_2004_default_i2c_address,
lcd_2004_columns,
lcd_2004_default_i2c_address,
lcd_2004_columns,
lcd_2004_rows);
} else if (cfg::has_lcd2004_27) {
lcd_2004 = new LiquidCrystal_I2C(
lcd_2004_alternate_i2c_address,
lcd_2004_columns,
lcd_2004_alternate_i2c_address,
lcd_2004_columns,
lcd_2004_rows);
}
if (lcd_2004)
Expand Down Expand Up @@ -5591,7 +5591,7 @@ static void powerOnTestSensors()
NPM_version_date();
delay(3000); //prevent any buffer overload on ESP82666
NPM_temp_humi();
delay(2000);
delay(2000);

if(!cfg::npm_fulltime) {
is_NPM_running = NPM_start_stop();
Expand All @@ -5611,7 +5611,7 @@ static void powerOnTestSensors()
delay(1000);
IPS_cmd(PmSensorCmd3::Interval); //Set interval to 0 = manual mode
delay(1000);
IPS_cmd(PmSensorCmd3::Stop);
IPS_cmd(PmSensorCmd3::Stop);
delay(1000);
is_IPS_running = false;
}
Expand Down Expand Up @@ -5772,7 +5772,10 @@ static void setupNetworkTime()
twoStageOTAUpdate();
last_update_attempt = millis();
}
sntp_time_set++;
if (sntp_time_set < 255)
{
sntp_time_set++;
}
});
#endif
strcpy_P(ntpServer1, NTP_SERVER_1);
Expand Down Expand Up @@ -5882,7 +5885,7 @@ void setup(void)
}
#endif

init_config();
init_config();

Wire.begin(I2C_PIN_SDA, I2C_PIN_SCL);

Expand Down Expand Up @@ -5989,8 +5992,8 @@ void loop(void)

unsigned int pastTime = act_milli - last_page_load;
bool keepAlive = pastTime < KEEP_ALIVE_TIME_MS;
unsigned long sleep = send_now || keepAlive
? 0
unsigned long sleep = send_now || keepAlive
? 0
: SLEEPTIME_MS;

// Wait at least 30s for each NTP server to sync
Expand Down Expand Up @@ -6059,15 +6062,15 @@ void loop(void)
{
starttime_NPM = act_milli;
fetchSensorNPM(result_NPM);
}
}
}
if(cfg::ips_read)
{
if ((msSince(starttime_IPS) > SAMPLETIME_IPS_MS) || send_now)
{
starttime_IPS = act_milli;
fetchSensorIPS(result_IPS);
}
}
}
if ((msSince(starttime_SDS) > SAMPLETIME_SDS_MS) || send_now)
{
Expand Down Expand Up @@ -6108,13 +6111,6 @@ void loop(void)
last_scd30_millis = act_milli;
}

if ((msSince(last_display_millis) > DISPLAY_UPDATE_INTERVAL_MS) &&
(cfg::has_display || cfg::has_sh1106 || lcd_1602 || lcd_2004))
{
display_values();
last_display_millis = act_milli;
}

server.handleClient();
yield();

Expand Down Expand Up @@ -6297,6 +6293,13 @@ void loop(void)
count_sends++;
}

if ((msSince(last_display_millis) > DISPLAY_UPDATE_INTERVAL_MS) &&
(cfg::has_display || cfg::has_sh1106 || lcd_1602 || lcd_2004))
{
display_values();
last_display_millis = act_milli;
}

#if defined(ESP8266)
MDNS.update();
if (cfg::npm_read)
Expand Down
2 changes: 1 addition & 1 deletion airrohr-firmware/html-content.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const char TXT_CONTENT_TYPE_IMAGE_PNG[] PROGMEM = "image/png";

const char DBG_TXT_TEMPERATURE[] PROGMEM = "Temperature (°C): ";
const char DBG_TXT_HUMIDITY[] PROGMEM = "Humidity (%): ";
const char DBG_TXT_PRESSURE[] PROGMEM = "Pressure (hPa): ";
const char DBG_TXT_PRESSURE[] PROGMEM = "Pressure (Pa): ";
const char DBG_TXT_CO2PPM[] PROGMEM = "CO₂ (ppm): ";
const char DBG_TXT_START_READING[] PROGMEM = "R/ ";
const char DBG_TXT_END_READING[] PROGMEM = "/R ";
Expand Down