Skip to content

Commit

Permalink
6.4.1.16 Online template change
Browse files Browse the repository at this point in the history 
6.4.1.16 20190211
 * Initial support for online template change using command Template (#5177)
  • Loading branch information
@arendst
arendst committed Feb 11, 2019
1 parent de5023f commit 98ae3ea
Show file tree
Hide file tree
Showing 41 changed files with 494 additions and 190 deletions.
5 changes: 4 additions & 1 deletion sonoff/_changelog.ino
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
/* 6.4.1.15 20190208
/* 6.4.1.16 20190211
* Initial support for online template change using command Template (#5177)
*
* 6.4.1.15 20190208
* Change image name BE_MINIMAL to FIRMWARE_MINIMAL (#5106)
* Change image names USE_xyz to FIRMWARE_xyz (#5106)
* Add command SerialDelimiter 128 to filter reception of only characters between ASCII 32 and 127 (#5131)
Expand Down
8 changes: 7 additions & 1 deletion sonoff/i18n.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,8 @@
#define D_RSLT_UPTIME "UPTIME"
#define D_RSLT_WARNING "WARNING"

#define D_LOG_SOME_SETTINGS_RESET "Some settings have been reset"

// Commands sonoff.ino
#define D_CMND_BACKLOG "Backlog"
#define D_CMND_DELAY "Delay"
Expand Down Expand Up @@ -261,7 +263,11 @@
#define D_CMND_SERIALSEND "SerialSend"
#define D_CMND_SERIALDELIMITER "SerialDelimiter"
#define D_CMND_BAUDRATE "Baudrate"
#define D_LOG_SOME_SETTINGS_RESET "Some settings have been reset"
#define D_CMND_TEMPLATE "Template"
#define D_JSON_NAME "NAME"
#define D_JSON_GPIO "GPIO"
#define D_JSON_FLAG "FLAG"
#define D_JSON_BASE "BASE"

// Commands xdrv_01_mqtt.ino
#define D_CMND_MQTTHOST "MqttHost"
Expand Down
6 changes: 6 additions & 0 deletions sonoff/language/bg-BG.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,12 @@
#define D_SENSOR_SM16716_CLK "SM16716 CLK"
#define D_SENSOR_SM16716_DAT "SM16716 DAT"
#define D_SENSOR_SM16716_POWER "SM16716 PWR"
#define D_SENSOR_MY92X1_DI "MY92x1 DI"
#define D_SENSOR_MY92X1_DCKI "MY92x1 DCKI"
#define D_SENSOR_ARIRFRCV "ALux IrRcv"
#define D_SENSOR_TXD "Serial Tx"
#define D_SENSOR_RXD "Serial Rx"
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"

// Units
#define D_UNIT_AMPERE "A"
Expand Down
6 changes: 6 additions & 0 deletions sonoff/language/cs-CZ.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,12 @@
#define D_SENSOR_SM16716_CLK "SM16716 CLK"
#define D_SENSOR_SM16716_DAT "SM16716 DAT"
#define D_SENSOR_SM16716_POWER "SM16716 PWR"
#define D_SENSOR_MY92X1_DI "MY92x1 DI"
#define D_SENSOR_MY92X1_DCKI "MY92x1 DCKI"
#define D_SENSOR_ARIRFRCV "ALux IrRcv"
#define D_SENSOR_TXD "Serial Tx"
#define D_SENSOR_RXD "Serial Rx"
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"

// Units
#define D_UNIT_AMPERE "A"
Expand Down
6 changes: 6 additions & 0 deletions sonoff/language/de-DE.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,12 @@
#define D_SENSOR_SM16716_CLK "SM16716 CLK"
#define D_SENSOR_SM16716_DAT "SM16716 DAT"
#define D_SENSOR_SM16716_POWER "SM16716 PWR"
#define D_SENSOR_MY92X1_DI "MY92x1 DI"
#define D_SENSOR_MY92X1_DCKI "MY92x1 DCKI"
#define D_SENSOR_ARIRFRCV "ALux IrRcv"
#define D_SENSOR_TXD "Serial Tx"
#define D_SENSOR_RXD "Serial Rx"
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"

// Units
#define D_UNIT_AMPERE "A"
Expand Down
6 changes: 6 additions & 0 deletions sonoff/language/el-GR.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,12 @@
#define D_SENSOR_SM16716_CLK "SM16716 CLK"
#define D_SENSOR_SM16716_DAT "SM16716 DAT"
#define D_SENSOR_SM16716_POWER "SM16716 PWR"
#define D_SENSOR_MY92X1_DI "MY92x1 DI"
#define D_SENSOR_MY92X1_DCKI "MY92x1 DCKI"
#define D_SENSOR_ARIRFRCV "ALux IrRcv"
#define D_SENSOR_TXD "Serial Tx"
#define D_SENSOR_RXD "Serial Rx"
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"

// Units
#define D_UNIT_AMPERE "A"
Expand Down
6 changes: 6 additions & 0 deletions sonoff/language/en-GB.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,12 @@
#define D_SENSOR_SM16716_CLK "SM16716 CLK"
#define D_SENSOR_SM16716_DAT "SM16716 DAT"
#define D_SENSOR_SM16716_POWER "SM16716 PWR"
#define D_SENSOR_MY92X1_DI "MY92x1 DI"
#define D_SENSOR_MY92X1_DCKI "MY92x1 DCKI"
#define D_SENSOR_ARIRFRCV "ALux IrRcv"
#define D_SENSOR_TXD "Serial Tx"
#define D_SENSOR_RXD "Serial Rx"
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"

// Units
#define D_UNIT_AMPERE "A"
Expand Down
6 changes: 6 additions & 0 deletions sonoff/language/es-AR.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,12 @@
#define D_SENSOR_SM16716_CLK "SM16716 CLK"
#define D_SENSOR_SM16716_DAT "SM16716 DAT"
#define D_SENSOR_SM16716_POWER "SM16716 PWR"
#define D_SENSOR_MY92X1_DI "MY92x1 DI"
#define D_SENSOR_MY92X1_DCKI "MY92x1 DCKI"
#define D_SENSOR_ARIRFRCV "ALux IrRcv"
#define D_SENSOR_TXD "Serial Tx"
#define D_SENSOR_RXD "Serial Rx"
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"

// Units
#define D_UNIT_AMPERE "A"
Expand Down
6 changes: 6 additions & 0 deletions sonoff/language/fr-FR.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,12 @@
#define D_SENSOR_SM16716_CLK "SM16716 CLK"
#define D_SENSOR_SM16716_DAT "SM16716 DAT"
#define D_SENSOR_SM16716_POWER "SM16716 PWR"
#define D_SENSOR_MY92X1_DI "MY92x1 DI"
#define D_SENSOR_MY92X1_DCKI "MY92x1 DCKI"
#define D_SENSOR_ARIRFRCV "ALux IrRcv"
#define D_SENSOR_TXD "Serial Tx"
#define D_SENSOR_RXD "Serial Rx"
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"

// Units
#define D_UNIT_AMPERE "A"
Expand Down
6 changes: 6 additions & 0 deletions sonoff/language/he-HE.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,12 @@
#define D_SENSOR_SM16716_CLK "SM16716 CLK"
#define D_SENSOR_SM16716_DAT "SM16716 DAT"
#define D_SENSOR_SM16716_POWER "SM16716 PWR"
#define D_SENSOR_MY92X1_DI "MY92x1 DI"
#define D_SENSOR_MY92X1_DCKI "MY92x1 DCKI"
#define D_SENSOR_ARIRFRCV "ALux IrRcv"
#define D_SENSOR_TXD "Serial Tx"
#define D_SENSOR_RXD "Serial Rx"
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"

// Units
#define D_UNIT_AMPERE "A"
Expand Down
6 changes: 6 additions & 0 deletions sonoff/language/hu-HU.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,12 @@
#define D_SENSOR_SM16716_CLK "SM16716 CLK"
#define D_SENSOR_SM16716_DAT "SM16716 DAT"
#define D_SENSOR_SM16716_POWER "SM16716 PWR"
#define D_SENSOR_MY92X1_DI "MY92x1 DI"
#define D_SENSOR_MY92X1_DCKI "MY92x1 DCKI"
#define D_SENSOR_ARIRFRCV "ALux IrRcv"
#define D_SENSOR_TXD "Serial Tx"
#define D_SENSOR_RXD "Serial Rx"
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"

// Units
#define D_UNIT_AMPERE "A"
Expand Down
6 changes: 6 additions & 0 deletions sonoff/language/it-IT.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,12 @@
#define D_SENSOR_SM16716_CLK "SM16716 CLK"
#define D_SENSOR_SM16716_DAT "SM16716 DAT"
#define D_SENSOR_SM16716_POWER "SM16716 PWR"
#define D_SENSOR_MY92X1_DI "MY92x1 DI"
#define D_SENSOR_MY92X1_DCKI "MY92x1 DCKI"
#define D_SENSOR_ARIRFRCV "ALux IrRcv"
#define D_SENSOR_TXD "Serial Tx"
#define D_SENSOR_RXD "Serial Rx"
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"

// Units
#define D_UNIT_AMPERE "A"
Expand Down
7 changes: 6 additions & 1 deletion sonoff/language/nl-NL.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,6 @@
#define D_TX20_SOUTH "S"
#define D_TX20_WEST "W"


// sonoff_template.h - keep them as short as possible to be able to fit them in GUI drop down box
#define D_SENSOR_NONE "Geen"
#define D_SENSOR_DHT11 "DHT11"
Expand Down Expand Up @@ -559,6 +558,12 @@
#define D_SENSOR_SM16716_CLK "SM16716 CLK"
#define D_SENSOR_SM16716_DAT "SM16716 DAT"
#define D_SENSOR_SM16716_POWER "SM16716 PWR"
#define D_SENSOR_MY92X1_DI "MY92x1 DI"
#define D_SENSOR_MY92X1_DCKI "MY92x1 DCKI"
#define D_SENSOR_ARIRFRCV "ALux IrRcv"
#define D_SENSOR_TXD "Serial Tx"
#define D_SENSOR_RXD "Serial Rx"
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"

// Units
#define D_UNIT_AMPERE "A"
Expand Down
7 changes: 6 additions & 1 deletion sonoff/language/pl-PL.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,6 @@
#define D_TX20_SOUTH "S"
#define D_TX20_WEST "W"


// sonoff_template.h - keep them as short as possible to be able to fit them in GUI drop down box
#define D_SENSOR_NONE "Brak"
#define D_SENSOR_DHT11 "DHT11"
Expand Down Expand Up @@ -559,6 +558,12 @@
#define D_SENSOR_SM16716_CLK "SM16716 CLK"
#define D_SENSOR_SM16716_DAT "SM16716 DAT"
#define D_SENSOR_SM16716_POWER "SM16716 PWR"
#define D_SENSOR_MY92X1_DI "MY92x1 DI"
#define D_SENSOR_MY92X1_DCKI "MY92x1 DCKI"
#define D_SENSOR_ARIRFRCV "ALux IrRcv"
#define D_SENSOR_TXD "Serial Tx"
#define D_SENSOR_RXD "Serial Rx"
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"

// Units
#define D_UNIT_AMPERE "A"
Expand Down
6 changes: 6 additions & 0 deletions sonoff/language/pt-BR.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,12 @@
#define D_SENSOR_SM16716_CLK "SM16716 CLK"
#define D_SENSOR_SM16716_DAT "SM16716 DAT"
#define D_SENSOR_SM16716_POWER "SM16716 PWR"
#define D_SENSOR_MY92X1_DI "MY92x1 DI"
#define D_SENSOR_MY92X1_DCKI "MY92x1 DCKI"
#define D_SENSOR_ARIRFRCV "ALux IrRcv"
#define D_SENSOR_TXD "Serial Tx"
#define D_SENSOR_RXD "Serial Rx"
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"

// Units
#define D_UNIT_AMPERE "A"
Expand Down
6 changes: 6 additions & 0 deletions sonoff/language/pt-PT.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,12 @@
#define D_SENSOR_SM16716_CLK "SM16716 CLK"
#define D_SENSOR_SM16716_DAT "SM16716 DAT"
#define D_SENSOR_SM16716_POWER "SM16716 PWR"
#define D_SENSOR_MY92X1_DI "MY92x1 DI"
#define D_SENSOR_MY92X1_DCKI "MY92x1 DCKI"
#define D_SENSOR_ARIRFRCV "ALux IrRcv"
#define D_SENSOR_TXD "Serial Tx"
#define D_SENSOR_RXD "Serial Rx"
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"

// Units
#define D_UNIT_AMPERE "A"
Expand Down
6 changes: 6 additions & 0 deletions sonoff/language/ru-RU.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,12 @@
#define D_SENSOR_SM16716_CLK "SM16716 CLK"
#define D_SENSOR_SM16716_DAT "SM16716 DAT"
#define D_SENSOR_SM16716_POWER "SM16716 PWR"
#define D_SENSOR_MY92X1_DI "MY92x1 DI"
#define D_SENSOR_MY92X1_DCKI "MY92x1 DCKI"
#define D_SENSOR_ARIRFRCV "ALux IrRcv"
#define D_SENSOR_TXD "Serial Tx"
#define D_SENSOR_RXD "Serial Rx"
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"

// Units
#define D_UNIT_AMPERE "А"
Expand Down
7 changes: 6 additions & 1 deletion sonoff/language/sk-SK.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,6 @@
#define D_TX20_SOUTH "J"
#define D_TX20_WEST "Z"


// sonoff_template.h - keep them as short as possible to be able to fit them in GUI drop down box
#define D_SENSOR_NONE "Žiaden"
#define D_SENSOR_DHT11 "DHT11"
Expand Down Expand Up @@ -559,6 +558,12 @@
#define D_SENSOR_SM16716_CLK "SM16716 CLK"
#define D_SENSOR_SM16716_DAT "SM16716 DAT"
#define D_SENSOR_SM16716_POWER "SM16716 PWR"
#define D_SENSOR_MY92X1_DI "MY92x1 DI"
#define D_SENSOR_MY92X1_DCKI "MY92x1 DCKI"
#define D_SENSOR_ARIRFRCV "ALux IrRcv"
#define D_SENSOR_TXD "Serial Tx"
#define D_SENSOR_RXD "Serial Rx"
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"

// Units
#define D_UNIT_AMPERE "A"
Expand Down
6 changes: 6 additions & 0 deletions sonoff/language/sv-SE.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,12 @@
#define D_SENSOR_SM16716_CLK "SM16716 CLK"
#define D_SENSOR_SM16716_DAT "SM16716 DAT"
#define D_SENSOR_SM16716_POWER "SM16716 PWR"
#define D_SENSOR_MY92X1_DI "MY92x1 DI"
#define D_SENSOR_MY92X1_DCKI "MY92x1 DCKI"
#define D_SENSOR_ARIRFRCV "ALux IrRcv"
#define D_SENSOR_TXD "Serial Tx"
#define D_SENSOR_RXD "Serial Rx"
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"

// Units
#define D_UNIT_AMPERE "A"
Expand Down
6 changes: 6 additions & 0 deletions sonoff/language/tr-TR.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,12 @@
#define D_SENSOR_SM16716_CLK "SM16716 CLK"
#define D_SENSOR_SM16716_DAT "SM16716 DAT"
#define D_SENSOR_SM16716_POWER "SM16716 PWR"
#define D_SENSOR_MY92X1_DI "MY92x1 DI"
#define D_SENSOR_MY92X1_DCKI "MY92x1 DCKI"
#define D_SENSOR_ARIRFRCV "ALux IrRcv"
#define D_SENSOR_TXD "Serial Tx"
#define D_SENSOR_RXD "Serial Rx"
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"

// Units
#define D_UNIT_AMPERE "A"
Expand Down
6 changes: 6 additions & 0 deletions sonoff/language/uk-UK.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,12 @@
#define D_SENSOR_SM16716_CLK "SM16716 CLK"
#define D_SENSOR_SM16716_DAT "SM16716 DAT"
#define D_SENSOR_SM16716_POWER "SM16716 PWR"
#define D_SENSOR_MY92X1_DI "MY92x1 DI"
#define D_SENSOR_MY92X1_DCKI "MY92x1 DCKI"
#define D_SENSOR_ARIRFRCV "ALux IrRcv"
#define D_SENSOR_TXD "Serial Tx"
#define D_SENSOR_RXD "Serial Rx"
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"

// Units
#define D_UNIT_AMPERE "А"
Expand Down
6 changes: 6 additions & 0 deletions sonoff/language/zh-CN.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,12 @@
#define D_SENSOR_SM16716_CLK "SM16716 CLK"
#define D_SENSOR_SM16716_DAT "SM16716 DAT"
#define D_SENSOR_SM16716_POWER "SM16716 PWR"
#define D_SENSOR_MY92X1_DI "MY92x1 DI"
#define D_SENSOR_MY92X1_DCKI "MY92x1 DCKI"
#define D_SENSOR_ARIRFRCV "ALux IrRcv"
#define D_SENSOR_TXD "Serial Tx"
#define D_SENSOR_RXD "Serial Rx"
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"

// Units
#define D_UNIT_AMPERE "安"
Expand Down
6 changes: 6 additions & 0 deletions sonoff/language/zh-TW.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,12 @@
#define D_SENSOR_SM16716_CLK "SM16716 CLK"
#define D_SENSOR_SM16716_DAT "SM16716 DAT"
#define D_SENSOR_SM16716_POWER "SM16716 PWR"
#define D_SENSOR_MY92X1_DI "MY92x1 DI"
#define D_SENSOR_MY92X1_DCKI "MY92x1 DCKI"
#define D_SENSOR_ARIRFRCV "ALux IrRcv"
#define D_SENSOR_TXD "Serial Tx"
#define D_SENSOR_RXD "Serial Rx"
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"

// Units
#define D_UNIT_AMPERE "安"
Expand Down
7 changes: 4 additions & 3 deletions sonoff/settings.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ typedef union {
uint8_t mhz19b_abc_disable : 1; // Disable ABC (Automatic Baseline Correction for MHZ19(B) (0 = Enabled (default), 1 = Disabled with Sensor15 command)
};
} SensorCfg1;

/*
struct SYSCFG {
unsigned long cfg_holder; // 000 Pre v6 header
Expand Down Expand Up @@ -326,11 +326,12 @@ struct SYSCFG {
Mcp230xxCfg mcp230xx_config[16]; // 6F6
uint8_t mcp230xx_int_prio; // 716
SensorCfg1 SensorBits1; // 717 On/Off settings used by Sensor Commands

uint16_t mcp230xx_int_timer; // 718
uint8_t rgbwwTable[5]; // 71A
uint8_t user_template_base; // 71F
mytmplt user_template; // 720 29 bytes

uint8_t free_71F[117]; // 71F
uint8_t free_73D[87]; // 73D

uint32_t drivers[3]; // 794
uint32_t monitors; // 7A0
Expand Down
4 changes: 4 additions & 0 deletions sonoff/settings.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,7 @@ void SettingsDefaultSet2(void)
// Settings.flag.interlock = 0;
Settings.interlock[0] = 0xFF; // Legacy support using all relays in one interlock group
Settings.module = MODULE;
ModuleDefault(WEMOS);
// for (uint8_t i = 0; i < sizeof(Settings.my_gp); i++) { Settings.my_gp.io[i] = GPIO_NONE; }
strlcpy(Settings.friendlyname[0], FRIENDLY_NAME, sizeof(Settings.friendlyname[0]));
strlcpy(Settings.friendlyname[1], FRIENDLY_NAME"2", sizeof(Settings.friendlyname[1]));
Expand Down Expand Up @@ -1050,6 +1051,9 @@ void SettingsDelta(void)
if (Settings.version < 0x0604010D) {
Settings.param[P_BOOT_LOOP_OFFSET] = BOOT_LOOP_OFFSET;
}
if (Settings.version < 0x06040110) {
ModuleDefault(WEMOS);
}

Settings.version = VERSION;
SettingsSave(1);
Expand Down
Loading

3 comments on commit 98ae3ea

@meingraham
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@arendst

Is there a parameter for the Template command that you send to activate a Template? One can set a Template via a command, but right now I don't see a means to activate the template.

Mike

@arendst
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's as simple as selecting any other module using the commandline: module 0

@meingraham
Copy link
Collaborator

@meingraham meingraham commented on 98ae3ea Aug 18, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doh 😉

Please sign in to comment.