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

Beta to master #1025

Merged
merged 8 commits into from
Apr 9, 2024
Merged

Beta to master #1025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
51e4d1c
minor change in czech translation
ricki-z Apr 7, 2024
793de35
mem info for latest build
ricki-z Apr 7, 2024
944c7f8
setting better defaults
ricki-z Apr 7, 2024
a6b7222
new number for beta branch
ricki-z Apr 7, 2024
e03e599
Update intl_it.h
stewecar Apr 9, 2024
fd95b3f
Update intl_it.h
stewecar Apr 9, 2024
7636086
Merge pull request #1027 from stewecar/patch-5
ricki-z Apr 9, 2024
35f6539
Merge pull request #1028 from stewecar/patch-6
ricki-z Apr 9, 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
8 changes: 4 additions & 4 deletions airrohr-firmware/airrohr-firmware.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

/*****************************************************************
Expand Down
6 changes: 3 additions & 3 deletions airrohr-firmware/ext_def.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -300,7 +300,7 @@ static const char MEASUREMENT_NAME_INFLUX[] PROGMEM = "feinstaub";
#define MHZ19_READ 0

// automatic firmware updates
#define AUTO_UPDATE 0
#define AUTO_UPDATE 1

// use beta firmware
#define USE_BETA 0
Expand Down
2 changes: 1 addition & 1 deletion airrohr-firmware/intl_cz.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
16 changes: 8 additions & 8 deletions airrohr-firmware/intl_it.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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";
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 @@ -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
Expand Down