Merge pull request #574 from dirkmueller/beta

Switch to Arduino Core 2.6.2

Author: ricki-z

airrohr-firmware/Versions.md

@@ -1,6 +1,10 @@
+NRZ-2019-126-B9
+* Update to Arduino Core 2.6.2 to fix WiFi stability issues
+
 NRZ-2019-126-B8
 * Updated translations
 * Collect error counters
+* Serbian localization added
 
 NRZ-2019-126-B7
 * Updated italian translations - thanks stewecar

airrohr-firmware/airrohr-firmware.ino

@@ -97,7 +97,7 @@
 #include <pgmspace.h>
 
 // increment on change
-#define SOFTWARE_VERSION_STR "NRZ-2019-126-B8"
+#define SOFTWARE_VERSION_STR "NRZ-2019-126-B9"
 const String SOFTWARE_VERSION(SOFTWARE_VERSION_STR);
 
 /*****************************************************************
@@ -2709,7 +2709,10 @@ static void fetchSensorSDS(String& s) {
 		sds_pm25_max = 0;
 		sds_pm25_min = 20000;
 		if ((cfg::sending_intervall_ms > (WARMUPTIME_SDS_MS + READINGTIME_SDS_MS))) {
-			is_SDS_running = SDS_cmd(PmSensorCmd::Stop);
+
+			if (is_SDS_running) {
+				is_SDS_running = SDS_cmd(PmSensorCmd::Stop);
+			}
 		}
 	}
 
@@ -4080,8 +4083,8 @@ void setup(void) {
 #if defined(ESP32)
 	serialSDS.begin(9600, SERIAL_8N1, PM_SERIAL_RX, PM_SERIAL_TX);
 #endif
-	serialSDS.enableIntTx(false);
-	serialSDS.setTimeout(300);
+	serialSDS.enableIntTx(true);
+	serialSDS.setTimeout((12 * 9 * 1000) / 9600);
 
 #if defined(WIFI_LoRa_32_V2)
 	// reset the OLED display, e.g. of the heltec_wifi_lora_32 board
@@ -4266,7 +4269,6 @@ void loop(void) {
 	yield();
 
 	if (send_now) {
-		debug_outln_info(F("Creating data string:"));
 		last_signal_strength = WiFi.RSSI();
 		RESERVE_STRING(data, LARGE_STR);
 		data = FPSTR(data_first_part);
@@ -4362,11 +4364,15 @@ void loop(void) {
 		}
 		data += "]}";
 
+		yield();
+
 		sum_send_time += sendDataToOptionalApis(data);
 
 		// https://en.wikipedia.org/wiki/Moving_average#Cumulative_moving_average
 		sending_time = (3 * sending_time + sum_send_time) / 4;
-		debug_outln_info(F("Time for sending data (ms): "), String(sending_time));
+		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) {

airrohr-firmware/platformio.ini

@@ -14,7 +14,7 @@ src_dir = .
 [common]
 build_flags =
   -DVTABLES_IN_FLASH -D BEARSSL_SSL_BASIC
-  -D PIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY
+  -D PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH
   -DNDEBUG
   -Wl,-Teagle.flash.4m3m.ld
 
@@ -70,12 +70,12 @@ lib_deps_esp8266 = ${common.lib_deps_esp8266_platform} ${common.lib_deps_generic
 lib_deps_esp32 = ${common.lib_deps_esp32_platform} ${common.lib_deps_generic_external}
 
 extra_scripts = platformio_script.py
-# This release is reflecting the Arduino Core 2.6.1 release
+# This release is reflecting the Arduino Core 2.6.2 release
 # When the requirement for Arduino Core is raised, this
 # needs to be adjusted to the matching version from
 # https://github.com/platformio/platform-espressif8266/releases
 # platform_version = [email protected]
-platform_version = [email protected].0
+platform_version = [email protected].1
 platform_version_esp32 = [email protected] ; using Arduino core 1.0.4
 
 [env]

airrohr-update-loader/platformio.ini

@@ -22,11 +22,11 @@ board_build.f_cpu = 160000000L
 ; Keep Library names in alphabetical order
 lib_deps_external =
 extra_scripts = platformio_script.py
-# This release is reflecting the Arduino Core 2.6.1 release
+# This release is reflecting the Arduino Core 2.6.2 release
 # When the requirement for Arduino Core is raised, this
 # needs to be adjusted to the matching version from
 # https://github.com/platformio/platform-espressif8266/releases
-platform_version = [email protected].0
+platform_version = [email protected].1
 
 [env:nodemcuv2]
 lang = loader