Merge pull request #1025 from opendata-stuttgart/beta

Beta to master
opendata-stuttgart · Apr 9, 2024 · 21951e0 · 21951e0
2 parents 55110d2 + 35f6539
commit 21951e0
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 15 deletions.
diff --git a/airrohr-firmware/airrohr-firmware.ino b/airrohr-firmware/airrohr-firmware.ino
@@ -48,17 +48,17 @@
  *                                                                      *
  ************************************************************************
  *
- * latest build using lib 2.7.4 with -O3
- * DATA:    [====      ]  41.6% (used 34104 bytes from 81920 bytes)
- * PROGRAM: [=======   ]  66.5% (used 694547 bytes from 1044464 bytes)
+ * latest build
+ * RAM:   [====      ]  41.8% (used 34220 bytes from 81920 bytes)
+ * Flash: [=======   ]  67.1% (used 701191 bytes from 1044464 bytes)
  *
  ************************************************************************/
 
 #include <WString.h>
 #include <pgmspace.h>
 
 // increment on change
-#define SOFTWARE_VERSION_STR "NRZ-2024-135"
+#define SOFTWARE_VERSION_STR "NRZ-2024-136-B1"
 String SOFTWARE_VERSION(SOFTWARE_VERSION_STR);
 
 /*****************************************************************

diff --git a/airrohr-firmware/ext_def.h b/airrohr-firmware/ext_def.h
@@ -15,9 +15,9 @@ const char WWW_PASSWORD[] PROGMEM = "";
 #define FS_PWD "airrohrcfg"
 
 // Where to send the data?
-#define SEND2SENSORCOMMUNITY 0
+#define SEND2SENSORCOMMUNITY 1
 #define SSL_SENSORCOMMUNITY 0
-#define SEND2MADAVI 0
+#define SEND2MADAVI 1
 #define SSL_MADAVI 0
 #define SEND2SENSEMAP 0
 #define SEND2FSAPP 0

diff --git a/airrohr-firmware/intl_cz.h b/airrohr-firmware/intl_cz.h
@@ -125,7 +125,7 @@ const char INTL_TIME_UTC[] PROGMEM = "Čas (UTC)";
 const char INTL_SIGNAL_STRENGTH[] PROGMEM = "Síla signálu";
 const char INTL_SIGNAL_QUALITY[] PROGMEM = "Kvalita signálu";
 #define INTL_NUMBER_OF_MEASUREMENTS "Počet měření"
-#define INTL_TIME_SENDING_MS "Počet měření"
+#define INTL_TIME_SENDING_MS "Doba nahrávání"
 #define INTL_SENSOR "Senzor"
 #define INTL_PARAMETER "Parametr"
 #define INTL_VALUE "Hodnota"

diff --git a/airrohr-firmware/intl_it.h b/airrohr-firmware/intl_it.h
@@ -38,8 +38,8 @@ const char INTL_DS18B20[] PROGMEM = "DS18B20 ({t})";
 const char INTL_DNMS[] PROGMEM = "DNMS ({l_a})";
 const char INTL_DNMS_CORRECTION[] PROGMEM = "Correzione in dB(A)";
 const char INTL_TEMP_CORRECTION[] PROGMEM = "Correzione in °C";
-const char INTL_HEIGHT_ABOVE_SEALEVEL[] PROGMEM = "[[height_above_sealevel]]";
-const char INTL_PRESSURE_AT_SEALEVEL[] PROGMEM = "[[pressure_at_sealevel]]";
+const char INTL_HEIGHT_ABOVE_SEALEVEL[] PROGMEM = "[[Altitudine]]";
+const char INTL_PRESSURE_AT_SEALEVEL[] PROGMEM = "[[Pressione al livello del mare]]";
 const char INTL_NEO6M[] PROGMEM = "GPS (NEO 6M)";
 const char INTL_BASICAUTH[] PROGMEM = "Autorizzazione";
 #define INTL_REPORT_ISSUE "Segnala un problema"
@@ -59,16 +59,16 @@ const char INTL_LCD2004_3F[] PROGMEM = "LCD 2004 (I2C: 0x3F)";
 const char INTL_DISPLAY_WIFI_INFO[] PROGMEM = "Visualizza informazioni del wi-fi";
 const char INTL_DISPLAY_DEVICE_INFO[] PROGMEM = "Visualizza informazioni del dispositivo";
 
-#define INTL_STATIC_IP_TEXT "[[static_ip_text]]"
-const char INTL_STATIC_IP[] PROGMEM = "[[static_ip]]";
-const char INTL_STATIC_SUBNET[] PROGMEM = "[[static_subnet]]";
-const char INTL_STATIC_GATEWAY[] PROGMEM = "[[static_gateway]]";
-const char INTL_STATIC_DNS[] PROGMEM = "[[static_dns]]";
+#define INTL_STATIC_IP_TEXT "Testo IP statico"
+const char INTL_STATIC_IP[] PROGMEM = "IP statico";
+const char INTL_STATIC_SUBNET[] PROGMEM = "Subnet statico";
+const char INTL_STATIC_GATEWAY[] PROGMEM = "Gateway statico";
+const char INTL_STATIC_DNS[] PROGMEM = "DNS statico";
 
 const char INTL_DEBUG_LEVEL[] PROGMEM = "Debug&nbsp;Level";
 const char INTL_MEASUREMENT_INTERVAL[] PROGMEM = "intervallo di misura";
 const char INTL_DURATION_ROUTER_MODE[] PROGMEM = "Durata della modalità router";
-const char INTL_POWERSAVE[] PROGMEM = "[[powersave]]";
+const char INTL_POWERSAVE[] PROGMEM = "Modalità risparmio energetico";
 const char INTL_MORE_APIS[] PROGMEM = "Altre API";
 const char INTL_SEND_TO_OWN_API[] PROGMEM = "Invia i dati alla propria API";
 const char INTL_SERVER[] PROGMEM = "Server";

diff --git a/airrohr-firmware/platformio.ini b/airrohr-firmware/platformio.ini
@@ -23,6 +23,7 @@ src_dir = .
 build_flags =
   -DVTABLES_IN_FLASH
   -D PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH
+;  -D PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
   -D HTTPCLIENT_1_1_COMPATIBLE=0 -D NO_GLOBAL_SERIAL=0
   -DNDEBUG -DFP_IN_IROM -frandom-seed=b61f78373
   -O3