Skip to content
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

Send noise every 5 seconds #6

Merged
merged 4 commits into from
Sep 18, 2024
Merged

Send noise every 5 seconds #6

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
592e5d6
send_noise once 15 seconds
LoSk-p Jul 8, 2024
85297c7
.
LoSk-p Jul 26, 2024
a03f20b
remove dont send current noise level (just max and mean)
LoSk-p Sep 18, 2024
a684cfb
update version to R_2024-09
LoSk-p Sep 18, 2024
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
120 changes: 80 additions & 40 deletions airrohr-firmware/airrohr-firmware.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
#include <pgmspace.h>

// increment on change
#define SOFTWARE_VERSION_STR "R_2024-06"
#define SOFTWARE_VERSION_STR "R_2024-09"
String SOFTWARE_VERSION(SOFTWARE_VERSION_STR);

/*****************************************************************
Expand Down Expand Up @@ -376,7 +376,9 @@ unsigned long lowpulseoccupancyP1 = 0;
unsigned long lowpulseoccupancyP2 = 0;

bool send_now = false;
bool send_noise_now = false;
unsigned long starttime;
unsigned long starttime_noise;
unsigned long time_point_device_start_ms;
unsigned long starttime_SDS;
unsigned long starttime_DB;
Expand Down Expand Up @@ -2764,6 +2766,7 @@ static void fetchSensorDBMeter(String& s) {
last_value_DBMETER_count = 0;
last_value_DBMETER_sum = 0;
debug_outln_error(F("DB Meter read failed"));
// debug_outln_info(F("Noise: "), last_value_DBMETER);
} else {
last_value_DBMETER = db;
if (last_value_DBMETER > last_value_DBMETER_max) {
Expand All @@ -2775,7 +2778,7 @@ static void fetchSensorDBMeter(String& s) {
}
Wire.setClock(100000);
}
if (send_now) {
if ((send_now) || (send_noise_now && !is_SDS_running)) {
debug_outln_info(F("Noise sum: "), last_value_DBMETER_sum);
debug_outln_info(F("Noise count: "), last_value_DBMETER_count);
debug_outln_info(F("Noise max: "), last_value_DBMETER_max);
Expand Down Expand Up @@ -3814,7 +3817,7 @@ static __noinline void fetchSensorGPS(String& s) {
last_value_GPS_lat = atof(cfg::lat_gps);
last_value_GPS_lon = atof(cfg::lon_gps);
}
if (send_now) {
if (send_now || send_noise_now) {

debug_outln_info(F("Lat: "), String(last_value_GPS_lat, 6));
debug_outln_info(F("Lng: "), String(last_value_GPS_lon, 6));
Expand Down Expand Up @@ -4766,6 +4769,30 @@ static unsigned long sendDataToOptionalApis(const String &data) {
return sum_send_time;
}

static unsigned long sendDataToRobonomics(const String &data) {
unsigned long sum_send_time = 0;
if (cfg::send2robonomics) {
int num_of_host;
String data_to_send = data;
data_to_send.remove(0, 1);
String data_4_robonomics(F("{\"esp8266id\": \""));
data_4_robonomics += esp_chipid;
data_4_robonomics += "\", \"donated_by\": \"";
data_4_robonomics += cfg::donated_by;
data_4_robonomics += "\", ";
data_4_robonomics += data_to_send;
debug_outln_info(FPSTR(DBG_TXT_SENDING_TO), F("robonomics: "));
debug_outln_info(F("robonomics: "), data_4_robonomics);
num_of_host = chooseRobonomicsServer(LoggerRobonomics, false);
if (num_of_host == 255) {
num_of_host = chooseRobonomicsServer(LoggerRobonomics, true);
}
num_of_host = 2;
sum_send_time += sendData(LoggerRobonomics, data_4_robonomics, 0, HOST_ROBONOMICS[num_of_host][0], URL_ROBONOMICS);
}

}

/*****************************************************************
* The Setup *
*****************************************************************/
Expand Down Expand Up @@ -4855,6 +4882,7 @@ void setup(void) {
delay(50);

starttime = millis(); // store the start time
starttime_noise = millis();
last_update_attempt = time_point_device_start_ms = starttime;
last_display_millis = starttime_SDS = starttime_DB = starttime;
if (cfg::file_write) {
Expand All @@ -4877,13 +4905,20 @@ void loop(void) {
act_micro = micros();
act_milli = millis();
send_now = msSince(starttime) > cfg::sending_intervall_ms;
if (cfg::dbmeter_read) {
send_noise_now = msSince(starttime_noise) > 5000;
} else {
send_noise_now = false;
}
// Wait at least 30s for each NTP server to sync

if (!sntp_time_set && send_now &&
if (!sntp_time_set && send_now && send_noise_now &&
msSince(time_point_device_start_ms) < 1000 * 2 * 30 + 5000) {
debug_outln_info(F("NTP sync not finished yet, skipping send"));
send_now = false;
send_noise_now = false;
starttime = act_milli;
starttime_noise = act_milli;
}

sample_count++;
Expand Down Expand Up @@ -4929,7 +4964,7 @@ void loop(void) {
fetchSensorPPD(result_PPD);
}

if ((msSince(starttime_DB) > SAMPLETIME_DBMETER_MS) || send_now) {
if ((msSince(starttime_DB) > SAMPLETIME_DBMETER_MS) || send_now || send_noise_now) {
starttime_DB = act_milli;
if (cfg::dbmeter_read && (! dbmeter_init_failed)) {
fetchSensorDBMeter(result_DB);
Expand Down Expand Up @@ -4963,7 +4998,7 @@ void loop(void) {
}
}

if ((msSince(starttime_GPS) > SAMPLETIME_GPS_MS) || send_now) {
if ((msSince(starttime_GPS) > SAMPLETIME_GPS_MS) || send_now || send_noise_now) {
// getting GPS coordinates
fetchSensorGPS(result_GPS);
starttime_GPS = act_milli;
Expand All @@ -4979,7 +5014,7 @@ void loop(void) {
server.handleClient();
yield();

if (send_now) {
if (send_now || send_noise_now) {
last_signal_strength = WiFi.RSSI();
RESERVE_STRING(data, LARGE_STR);
data = FPSTR(data_first_part);
Expand Down Expand Up @@ -5103,44 +5138,49 @@ void loop(void) {

yield();

sum_send_time += sendDataToOptionalApis(data);
if (send_now) {
sum_send_time += sendDataToOptionalApis(data);
sending_time = (3 * sending_time + sum_send_time) / 4;
if (sum_send_time > 0) {
debug_outln_info(F("Time for Sending (ms): "), String(sending_time));
}

// https://en.wikipedia.org/wiki/Moving_average#Cumulative_moving_average
sending_time = (3 * sending_time + sum_send_time) / 4;
if (sum_send_time > 0) {
debug_outln_info(F("Time for Sending (ms): "), String(sending_time));
}
// reconnect to WiFi if disconnected
if (WiFi.status() != WL_CONNECTED) {
debug_outln_info(F("Connection lost, reconnecting "));
WiFi_error_count++;
WiFi.reconnect();
waitForWifiToConnect(20);
}

// reconnect to WiFi if disconnected
if (WiFi.status() != WL_CONNECTED) {
debug_outln_info(F("Connection lost, reconnecting "));
WiFi_error_count++;
WiFi.reconnect();
waitForWifiToConnect(20);
}
// only do a restart after finishing sending
if (msSince(time_point_device_start_ms) > DURATION_BEFORE_FORCED_RESTART_MS) {
sensor_restart();
}

// only do a restart after finishing sending
if (msSince(time_point_device_start_ms) > DURATION_BEFORE_FORCED_RESTART_MS) {
sensor_restart();
// time for a OTA attempt?
if (msSince(last_update_attempt) > PAUSE_BETWEEN_UPDATE_ATTEMPTS_MS) {
twoStageOTAUpdate();
last_update_attempt = act_milli;
}

// Resetting for next sampling
last_data_string = std::move(data);
lowpulseoccupancyP1 = 0;
lowpulseoccupancyP2 = 0;
sample_count = 0;
last_micro = 0;
min_micro = 1000000000;
max_micro = 0;
sum_send_time = 0;
starttime = millis(); // store the start time
count_sends++;
} else {
sendDataToRobonomics(data);
starttime_noise = millis();
}

// time for a OTA attempt?
if (msSince(last_update_attempt) > PAUSE_BETWEEN_UPDATE_ATTEMPTS_MS) {
twoStageOTAUpdate();
last_update_attempt = act_milli;
}

// Resetting for next sampling
last_data_string = std::move(data);
lowpulseoccupancyP1 = 0;
lowpulseoccupancyP2 = 0;
sample_count = 0;
last_micro = 0;
min_micro = 1000000000;
max_micro = 0;
sum_send_time = 0;
starttime = millis(); // store the start time
count_sends++;
// https://en.wikipedia.org/wiki/Moving_average#Cumulative_moving_average
}
#if defined(ESP8266)
MDNS.update();
Expand Down
2 changes: 1 addition & 1 deletion airrohr-firmware/defines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ constexpr const unsigned long SAMPLETIME_NPM_MS = 1000;
constexpr const unsigned long WARMUPTIME_NPM_MS = 15000;
constexpr const unsigned long READINGTIME_NPM_MS = 15000; // how long we read data from the PM sensors
constexpr const unsigned long SAMPLETIME_GPS_MS = 50;
constexpr const unsigned long SAMPLETIME_DBMETER_MS = 1000;
constexpr const unsigned long SAMPLETIME_DBMETER_MS = 100;
constexpr const unsigned long DISPLAY_UPDATE_INTERVAL_MS = 5000; // time between switching display to next "screen"
constexpr const unsigned long ONE_DAY_IN_MS = 24 * 60 * 60 * 1000;
constexpr const unsigned long PAUSE_BETWEEN_UPDATE_ATTEMPTS_MS = ONE_DAY_IN_MS; // check for firmware updates once a day
Expand Down
1 change: 1 addition & 0 deletions airrohr-firmware/platformio.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
; http://docs.platformio.org/page/projectconf.html

[platformio]
default_envs = nodemcuv2_en
src_dir = .

; -DDEBUG_ESP_PORT=Serial
Expand Down
Loading