Skip to content

Commit c5315eb

Browse files
tschabantschaban
authored
Merge pull request #724 from tschaban/T6-3.0.1
T6-3.0.1
2 parents 0099cbe + 7a74c23 commit c5315eb

File tree

4 files changed

+122
-85
lines changed

4 files changed

+122
-85
lines changed

‎core/include/config/AFE-Configuration.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@
482482

483483
/* ---- Wheater Station ---- */
484484
#elif defined(T6_CONFIG)
485-
#define AFE_FIRMWARE_VERSION "2.5.3"
485+
#define AFE_FIRMWARE_VERSION "3.0.1"
486486
#define AFE_FIRMWARE_TYPE 6
487487

488488
/* Functionalities */

‎core/lib/AFE-Web-Server/AFE-Sites-Generator.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2052,7 +2052,7 @@ void AFESitesGenerator::siteBMEX80Sensor(String &page, uint8_t id) {
20522052
addDeviceI2CAddressSelectionItem(page, configuration.i2cAddress);
20532053

20542054
/* Item: type of the sensor */
2055-
addSelectFormItemOpen(page, "b", L_BMEX80_SENSOR_TYPE);
2055+
addSelectFormItemOpen(page, F("b"), F(L_BMEX80_SENSOR_TYPE));
20562056
addSelectOptionFormItem(page, L_NONE, "255",
20572057
configuration.type == AFE_BMX_UNKNOWN_SENSOR);
20582058
addSelectOptionFormItem(page, "BMx085/BMx180", "1",
@@ -2083,7 +2083,7 @@ void AFESitesGenerator::siteBMEX80Sensor(String &page, uint8_t id) {
20832083

20842084
/* Item: Unit */
20852085
openSection(page, F(L_UNITS), F(""));
2086-
addSelectFormItemOpen(page, "tu", L_TEMPERATURE);
2086+
addSelectFormItemOpen(page, F("tu"), F(L_TEMPERATURE));
20872087
addSelectOptionFormItem(page, "C", "1", configuration.temperature.unit ==
20882088
AFE_TEMPERATURE_UNIT_CELSIUS);
20892089
addSelectOptionFormItem(page, "F", "2",
@@ -2422,7 +2422,7 @@ void AFESitesGenerator::siteAnemometerSensor(String &page) {
24222422
configuration.name, "16");
24232423

24242424
/* Item: GPIO */
2425-
addListOfGPIOs(page, "g", configuration.gpio);
2425+
addListOfGPIOs(page, F("g"), configuration.gpio);
24262426

24272427
/* Item: interval */
24282428
char _number[7];
@@ -2443,7 +2443,7 @@ void AFESitesGenerator::siteAnemometerSensor(String &page) {
24432443

24442444
/* Item: Distance unit */
24452445

2446-
addSelectFormItemOpen(page, "u", L_DISTANCE_UNIT);
2446+
addSelectFormItemOpen(page, F("u"), F(L_DISTANCE_UNIT));
24472447
addSelectOptionFormItem(page, L_CM, "0", configuration.impulseDistanceUnit ==
24482448
AFE_DISTANCE_CENTIMETER);
24492449
addSelectOptionFormItem(page, L_M, "1", configuration.impulseDistanceUnit ==
@@ -2494,7 +2494,7 @@ void AFESitesGenerator::siteRainmeterSensor(String &page) {
24942494
addInputFormItem(page, AFE_FORM_ITEM_TYPE_TEXT, "n", L_NAME,
24952495
configuration.name, "16");
24962496

2497-
addListOfGPIOs(page, "g", configuration.gpio);
2497+
addListOfGPIOs(page, F("g"), configuration.gpio);
24982498

24992499
char _number[8];
25002500
sprintf(_number, "%d", configuration.interval);
@@ -2648,8 +2648,8 @@ void AFESitesGenerator::siteUARTBUS(String &page) {
26482648
SERIALPORT configuration;
26492649
Data->getConfiguration(&configuration);
26502650
openSection(page, F("UART"), F(""));
2651-
addListOfGPIOs(page, "r", configuration.RXD, "GPIO RXD");
2652-
addListOfGPIOs(page, "t", configuration.TXD, "GPIO TXD");
2651+
addListOfGPIOs(page, F("r"), configuration.RXD, "GPIO RXD");
2652+
addListOfGPIOs(page, F("t"), configuration.TXD, "GPIO TXD");
26532653
closeSection(page);
26542654
}
26552655
#endif // AFE_CONFIG_HARDWARE_UART

‎platformio.ini‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
;default_envs = AFE_T4_8266_4m-generic
4949
;default_envs = AFE_T4_8285_1m-generic
5050
;default_envs = AFE_T4_8266_1m-development, AFE_T4_8266_1m-development-domoticz
51-
default_envs = AFE_T4_8266_1m-generic, AFE_T4_8285_1m-generic, AFE_T4_8266_1m-domoticz, AFE_T4_8285_1m-domoticz, AFE_T4_8266_4m-generic-development, AFE_T4_8266_4m-generic, AFE_T4_8266_4m-domoticz, AFE_T4_8266_4m-domoticz-development
51+
;default_envs = AFE_T4_8266_1m-generic, AFE_T4_8285_1m-generic, AFE_T4_8266_1m-domoticz, AFE_T4_8285_1m-domoticz, AFE_T4_8266_4m-generic-development, AFE_T4_8266_4m-generic, AFE_T4_8266_4m-domoticz, AFE_T4_8266_4m-domoticz-development
5252
; VERSION T5
5353
;default_envs = AFE_T5_8266_4m-development
5454
;default_envs = AFE_T5_8266_4m-development-domoticz
@@ -63,15 +63,15 @@ default_envs = AFE_T4_8266_1m-generic, AFE_T4_8285_1m-generic, AFE_T4_8266_1m-do
6363
;default_envs = AFE_T6_8266_4m-development-domoticz
6464
;default_envs = AFE_T6_8266_4m-generic
6565
;default_envs = AFE_T6_8266_4m-iECSv20
66-
;default_envs = AFE_T6_8266_4m-development, AFE_T6_8266_4m-generic, AFE_T6_8266_4m-iECSv20, AFE_T6_8266_4m-development-domoticz, AFE_T6_8266_4m-domoticz, AFE_T6_8266_4m-iECSv20-domoticz, AFE_T6_8266_4m-iECSv21, AFE_T6_8266_4m-iECSv21-domoticz, AFE_T6_8266_1m-domoticz, AFE_T6_8266_1m-generic
66+
default_envs = AFE_T6_8266_4m-development, AFE_T6_8266_4m-generic, AFE_T6_8266_4m-iECSv20, AFE_T6_8266_4m-development-domoticz, AFE_T6_8266_4m-domoticz, AFE_T6_8266_4m-iECSv20-domoticz, AFE_T6_8266_4m-iECSv21, AFE_T6_8266_4m-iECSv21-domoticz, AFE_T6_8266_1m-domoticz, AFE_T6_8266_1m-generic
6767

6868
[env]
6969
lib_extra_dirs = lib, lib-external, include, core/lib, core/include
7070
monitor_speed = 115200
7171

7272
[common]
7373
framework = arduino
74-
build_flags = -DAFE_LANGUAGE=0
74+
build_flags = -DAFE_LANGUAGE=1
7575
lib_deps = rBase64
7676
Streaming
7777
https://github.com/tschaban/ArduinoJson.git#5.x
@@ -1488,7 +1488,8 @@ board = ${env:AFE_T6_8266_4m-generic.board}
14881488
board_build.flash_mode = ${env:AFE_T6_8266_4m-generic.board_build.flash_mode}
14891489
board_upload.maximum_size = ${env:AFE_T6_8266_4m-generic.board_upload.maximum_size}
14901490
board_build.f_cpu = ${env:AFE_T6_8266_4m-generic.board_build.f_cpu}
1491-
build_flags = ${env:AFE_T6_8266_4m-generic.build_flags} -D AFE_CONFIG_API_DOMOTICZ_ENABLED
1491+
build_flags = ${env:AFE_T6_8266_4m-generic.build_flags}
1492+
-DAFE_CONFIG_API_DOMOTICZ_ENABLED
14921493
build_unflags = ${env:AFE_T6_8266_4m-generic.build_unflags}
14931494

14941495

@@ -1502,7 +1503,8 @@ board = ${env:AFE_T6_8266_4m-generic.board}
15021503
board_build.flash_mode = ${env:AFE_T6_8266_4m-generic.board_build.flash_mode}
15031504
board_upload.maximum_size = ${env:AFE_T6_8266_4m-generic.board_upload.maximum_size}
15041505
board_build.f_cpu = ${env:AFE_T6_8266_4m-generic.board_build.f_cpu}
1505-
build_flags = ${env:AFE_T6_8266_4m-generic.build_flags} -D AFE_DEVICE_iECS_WHEATER_STATION_20
1506+
build_flags = ${env:AFE_T6_8266_4m-generic.build_flags}
1507+
-DAFE_DEVICE_iECS_WHEATER_STATION_20
15061508
build_unflags = ${env:AFE_T6_8266_4m-generic.build_unflags}
15071509

15081510
[env:AFE_T6_8266_4m-iECSv20-domoticz]
@@ -1515,7 +1517,8 @@ board = ${env:AFE_T6_8266_4m-iECSv20.board}
15151517
board_build.flash_mode = ${env:AFE_T6_8266_4m-iECSv20.board_build.flash_mode}
15161518
board_upload.maximum_size = ${env:AFE_T6_8266_4m-iECSv20.board_upload.maximum_size}
15171519
board_build.f_cpu = ${env:AFE_T6_8266_4m-iECSv20.board_build.f_cpu}
1518-
build_flags = ${env:AFE_T6_8266_4m-iECSv20.build_flags} -D AFE_CONFIG_API_DOMOTICZ_ENABLED
1520+
build_flags = ${env:AFE_T6_8266_4m-iECSv20.build_flags}
1521+
-DAFE_CONFIG_API_DOMOTICZ_ENABLED
15191522
build_unflags = ${env:AFE_T6_8266_4m-iECSv20.build_unflags}
15201523

15211524
[env:AFE_T6_8266_4m-iECSv21]
@@ -1528,7 +1531,8 @@ board = ${env:AFE_T6_8266_4m-generic.board}
15281531
board_build.flash_mode = ${env:AFE_T6_8266_4m-generic.board_build.flash_mode}
15291532
board_upload.maximum_size = ${env:AFE_T6_8266_4m-generic.board_upload.maximum_size}
15301533
board_build.f_cpu = ${env:AFE_T6_8266_4m-generic.board_build.f_cpu}
1531-
build_flags = ${env:AFE_T6_8266_4m-generic.build_flags} -D AFE_DEVICE_iECS_WHEATER_STATION_21
1534+
build_flags = ${env:AFE_T6_8266_4m-generic.build_flags}
1535+
-DAFE_DEVICE_iECS_WHEATER_STATION_21
15321536
build_unflags = ${env:AFE_T6_8266_4m-generic.build_unflags}
15331537

15341538
[env:AFE_T6_8266_4m-iECSv21-domoticz]
@@ -1541,7 +1545,8 @@ board = ${env:AFE_T6_8266_4m-iECSv21.board}
15411545
board_build.flash_mode = ${env:AFE_T6_8266_4m-iECSv21.board_build.flash_mode}
15421546
board_upload.maximum_size = ${env:AFE_T6_8266_4m-iECSv21.board_upload.maximum_size}
15431547
board_build.f_cpu = ${env:AFE_T6_8266_4m-iECSv21.board_build.f_cpu}
1544-
build_flags = ${env:AFE_T6_8266_4m-iECSv21.build_flags} -D AFE_CONFIG_API_DOMOTICZ_ENABLED
1548+
build_flags = ${env:AFE_T6_8266_4m-iECSv21.build_flags}
1549+
-DAFE_CONFIG_API_DOMOTICZ_ENABLED
15451550
build_unflags = ${env:AFE_T6_8266_4m-iECSv21.build_unflags}
15461551

15471552

@@ -1569,7 +1574,8 @@ board = ${env:AFE_T6_8266_4m-development.board}
15691574
board_build.flash_mode = ${env:AFE_T6_8266_4m-development.board_build.flash_mode}
15701575
board_upload.maximum_size = ${env:AFE_T6_8266_4m-development.board_upload.maximum_size}
15711576
board_build.f_cpu = ${env:AFE_T6_8266_4m-development.board_build.f_cpu}
1572-
build_flags = ${env:AFE_T6_8266_4m-development.build_flags} -D AFE_CONFIG_API_DOMOTICZ_ENABLED
1577+
build_flags = ${env:AFE_T6_8266_4m-development.build_flags}
1578+
-DAFE_CONFIG_API_DOMOTICZ_ENABLED
15731579
build_unflags = ${env:AFE_T6_8266_4m-development.build_unflags}
15741580

15751581
[env:AFE_T6_8266_1m-generic]
@@ -1598,7 +1604,8 @@ board = ${env:AFE_T6_8266_1m-generic.board}
15981604
board_build.flash_mode = ${env:AFE_T6_8266_1m-generic.board_build.flash_mode}
15991605
board_upload.maximum_size = ${env:AFE_T6_8266_1m-generic.board_upload.maximum_size}
16001606
board_build.f_cpu = ${env:AFE_T6_8266_1m-generic.board_build.f_cpu}
1601-
build_flags = ${env:AFE_T6_8266_1m-generic.build_flags} -D AFE_CONFIG_API_DOMOTICZ_ENABLED
1607+
build_flags = ${env:AFE_T6_8266_1m-generic.build_flags}
1608+
-DAFE_CONFIG_API_DOMOTICZ_ENABLED
16021609
build_unflags = ${env:AFE_T6_8266_1m-generic.build_unflags}
16031610

16041611

0 commit comments

Comments
 (0)