jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-25 11:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Oops forgot most changes.

Browse Source
This commit is contained in:
Theo Arends 2021-08-01 17:51:54 +02:00
parent c3a1ba8de2
commit 5dc009b9c5
5 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tasmota/settings.h
View File

@ -245,8 +245,8 @@ typedef union {
uint32_t telegram_send_enable : 1; // bit 0 (v9.4.0.3) - CMND_TMSTATE 0/1 - Enable Telegram send uint32_t telegram_send_enable : 1; // bit 0 (v9.4.0.3) - CMND_TMSTATE 0/1 - Enable Telegram send
uint32_t telegram_recv_enable : 1; // bit 1 (v9.4.0.3) - CMND_TMSTATE 2/3 - Enable Telegram receive uint32_t telegram_recv_enable : 1; // bit 1 (v9.4.0.3) - CMND_TMSTATE 2/3 - Enable Telegram receive
uint32_t telegram_echo_enable : 1; // bit 2 (v9.4.0.3) - CMND_TMSTATE 4/5 - Enable Telegram echo uint32_t telegram_echo_enable : 1; // bit 2 (v9.4.0.3) - CMND_TMSTATE 4/5 - Enable Telegram echo
uint32_t spare03 : 1; // bit 3 uint32_t range_extender : 1; // bit 3 (v9.5.0.5) - CMND_RGXSTATE - Enable range extender
uint32_t spare04 : 1; // bit 4 uint32_t range_extender_napt : 1; // bit 4 (v9.5.0.5) - CMND_RGXNAPT - Enable range extender NAPT
uint32_t spare05 : 1; // bit 5 uint32_t spare05 : 1; // bit 5
uint32_t spare06 : 1; // bit 6 uint32_t spare06 : 1; // bit 6
uint32_t spare07 : 1; // bit 7 uint32_t spare07 : 1; // bit 7
@ -599,8 +599,10 @@ typedef struct {
uint16_t pulse_timer[MAX_PULSETIMERS]; // 532 uint16_t pulse_timer[MAX_PULSETIMERS]; // 532
uint16_t button_debounce; // 542 uint16_t button_debounce; // 542
uint32_t ipv4_address[5]; // 544 uint32_t ipv4_address[5]; // 544
uint32_t ipv4_rgx_address; // 558
uint32_t ipv4_rgx_subnetmask; // 55C
uint8_t free_558[100]; // 558 uint8_t free_560[92]; // 560
SysMBitfield1 flag2; // 5BC SysMBitfield1 flag2; // 5BC
unsigned long pulse_counter[MAX_COUNTERS]; // 5C0 unsigned long pulse_counter[MAX_COUNTERS]; // 5C0

10
tasmota/settings.ino
View File

@ -860,6 +860,8 @@ void SettingsDefaultSet2(void) {
ParseIPv4(&Settings->ipv4_address[2], PSTR(WIFI_SUBNETMASK)); ParseIPv4(&Settings->ipv4_address[2], PSTR(WIFI_SUBNETMASK));
ParseIPv4(&Settings->ipv4_address[3], PSTR(WIFI_DNS)); ParseIPv4(&Settings->ipv4_address[3], PSTR(WIFI_DNS));
ParseIPv4(&Settings->ipv4_address[4], PSTR(WIFI_DNS2)); ParseIPv4(&Settings->ipv4_address[4], PSTR(WIFI_DNS2));
ParseIPv4(&Settings->ipv4_rgx_address, PSTR(WIFI_RGX_IP_ADDRESS));
ParseIPv4(&Settings->ipv4_rgx_subnetmask, PSTR(WIFI_RGX_SUBNETMASK));
Settings->sta_config = WIFI_CONFIG_TOOL; Settings->sta_config = WIFI_CONFIG_TOOL;
// Settings->sta_active = 0; // Settings->sta_active = 0;
SettingsUpdateText(SET_STASSID1, PSTR(STA_SSID1)); SettingsUpdateText(SET_STASSID1, PSTR(STA_SSID1));
@ -867,6 +869,8 @@ void SettingsDefaultSet2(void) {
SettingsUpdateText(SET_STAPWD1, PSTR(STA_PASS1)); SettingsUpdateText(SET_STAPWD1, PSTR(STA_PASS1));
SettingsUpdateText(SET_STAPWD2, PSTR(STA_PASS2)); SettingsUpdateText(SET_STAPWD2, PSTR(STA_PASS2));
SettingsUpdateText(SET_HOSTNAME, WIFI_HOSTNAME); SettingsUpdateText(SET_HOSTNAME, WIFI_HOSTNAME);
SettingsUpdateText(SET_RGX_SSID, PSTR(WIFI_RGX_SSID));
SettingsUpdateText(SET_RGX_PASSWORD, PSTR(WIFI_RGX_PASSWORD));
// Syslog // Syslog
SettingsUpdateText(SET_SYSLOG_HOST, PSTR(SYS_LOG_HOST)); SettingsUpdateText(SET_SYSLOG_HOST, PSTR(SYS_LOG_HOST));
@ -1381,6 +1385,12 @@ void SettingsDelta(void) {
Settings->energy_kWhtotal = Settings->ipv4_address[4]; Settings->energy_kWhtotal = Settings->ipv4_address[4];
ParseIPv4(&Settings->ipv4_address[4], PSTR(WIFI_DNS2)); ParseIPv4(&Settings->ipv4_address[4], PSTR(WIFI_DNS2));
} }
if (Settings->version < 0x09050005) {
ParseIPv4(&Settings->ipv4_rgx_address, PSTR(WIFI_RGX_IP_ADDRESS));
ParseIPv4(&Settings->ipv4_rgx_subnetmask, PSTR(WIFI_RGX_SUBNETMASK));
SettingsUpdateText(SET_RGX_SSID, PSTR(WIFI_RGX_SSID));
SettingsUpdateText(SET_RGX_PASSWORD, PSTR(WIFI_RGX_PASSWORD));
}
Settings->version = VERSION; Settings->version = VERSION;
SettingsSave(1); SettingsSave(1);

1
tasmota/tasmota.h
View File

@ -368,6 +368,7 @@ enum SettingsTextIndex { SET_OTAURL,
SET_SWITCH_TXT25, SET_SWITCH_TXT26, SET_SWITCH_TXT27, SET_SWITCH_TXT28, // MAX_SWITCHES_TXT SET_SWITCH_TXT25, SET_SWITCH_TXT26, SET_SWITCH_TXT27, SET_SWITCH_TXT28, // MAX_SWITCHES_TXT
#endif // ESP32 #endif // ESP32
SET_SHD_PARAM, SET_SHD_PARAM,
SET_RGX_SSID, SET_RGX_PASSWORD,
SET_MAX }; SET_MAX };
enum SpiInterfaces { SPI_NONE, SPI_MOSI, SPI_MISO, SPI_MOSI_MISO }; enum SpiInterfaces { SPI_NONE, SPI_MOSI, SPI_MISO, SPI_MOSI_MISO };

17
tasmota/tasmota_globals.h
View File

@ -156,6 +156,10 @@ String EthernetMacAddress(void);
#endif // ESP32 #endif // ESP32
/*********************************************************************************************\
* Fallback parameters
\*********************************************************************************************/
#ifdef USE_PID #ifdef USE_PID
#define USE_TIMEPROP #define USE_TIMEPROP
#endif #endif
@ -340,6 +344,19 @@ String EthernetMacAddress(void);
#define STARTING_OFFSET 30 // NOVA SDS parameter used in settings #define STARTING_OFFSET 30 // NOVA SDS parameter used in settings
#endif #endif
#ifndef WIFI_RGX_SSID
#define WIFI_RGX_SSID ""
#endif
#ifndef WIFI_RGX_PASSWORD
#define WIFI_RGX_PASSWORD ""
#endif
#ifndef WIFI_RGX_IP_ADDRESS
#define WIFI_RGX_IP_ADDRESS "192.168.99.1"
#endif
#ifndef WIFI_RGX_SUBNETMASK
#define WIFI_RGX_SUBNETMASK "255.255.255.0"
#endif
/*********************************************************************************************\ /*********************************************************************************************\
* UserConfig related parameters * UserConfig related parameters
\*********************************************************************************************/ \*********************************************************************************************/

2
tasmota/tasmota_version.h
View File

@ -20,6 +20,6 @@
#ifndef _TASMOTA_VERSION_H_ #ifndef _TASMOTA_VERSION_H_
#define _TASMOTA_VERSION_H_ #define _TASMOTA_VERSION_H_
const uint32_t VERSION = 0x09050004; const uint32_t VERSION = 0x09050005;
#endif // _TASMOTA_VERSION_H_ #endif // _TASMOTA_VERSION_H_