jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-27 20:56:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed IPV4 from the existing macros so the change is externally minimal

Browse Source
This commit is contained in:
polarduck-dev 2021-01-19 16:33:06 +00:00
parent ff08501b39
commit e14f464a23
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platformio.ini
View File

@ -133,7 +133,7 @@ build_flags = ${esp_defaults.build_flags}
-DBEARSSL_SSL_BASIC -DBEARSSL_SSL_BASIC
; NONOSDK22x_190703 = 2.2.2-dev(38a443e) ; NONOSDK22x_190703 = 2.2.2-dev(38a443e)
-DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703 -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703
-DPIO_FRAMEWORK_ARDUINO_LWIP2_IPV6_HIGHER_BANDWIDTH -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
; VTABLES in Flash ; VTABLES in Flash
-DVTABLES_IN_FLASH -DVTABLES_IN_FLASH
; remove the 4-bytes alignment for PSTR() ; remove the 4-bytes alignment for PSTR()

8
tasmota/my_user_config.h
View File

@ -65,10 +65,10 @@
#define BOOT_LOOP_OFFSET 1 // [SetOption36] Number of boot loops before starting restoring defaults (0 = disable, 1..200 = boot loops offset) #define BOOT_LOOP_OFFSET 1 // [SetOption36] Number of boot loops before starting restoring defaults (0 = disable, 1..200 = boot loops offset)
// -- Wifi ---------------------------------------- // -- Wifi ----------------------------------------
#define WIFI_IPV4_ADDRESS "0.0.0.0" // [IpAddress1] Set to 0.0.0.0 for using DHCP or enter a static IP address #define WIFI_IP_ADDRESS "0.0.0.0" // [IpAddress1] Set to 0.0.0.0 for using DHCP or enter a static IP address
#define WIFI_IPV4_GATEWAY "192.168.1.1" // [IpAddress2] If not using DHCP set Gateway IP address #define WIFI_GATEWAY "192.168.1.1" // [IpAddress2] If not using DHCP set Gateway IP address
#define WIFI_IPV4_SUBNETMASK "255.255.255.0" // [IpAddress3] If not using DHCP set Network mask #define WIFI_SUBNETMASK "255.255.255.0" // [IpAddress3] If not using DHCP set Network mask
#define WIFI_IPV4_DNS "192.168.1.1" // [IpAddress4] If not using DHCP set DNS IP address (might be equal to WIFI_GATEWAY) #define WIFI_DNS "192.168.1.1" // [IpAddress4] If not using DHCP set DNS IP address (might be equal to WIFI_GATEWAY)
#define STA_SSID1 "" // [Ssid1] Wifi SSID #define STA_SSID1 "" // [Ssid1] Wifi SSID
#define STA_PASS1 "" // [Password1] Wifi password #define STA_PASS1 "" // [Password1] Wifi password

8
tasmota/settings.ino
View File

@ -812,10 +812,10 @@ void SettingsDefaultSet2(void)
flag3.use_wifi_rescan |= WIFI_SCAN_REGULARLY; flag3.use_wifi_rescan |= WIFI_SCAN_REGULARLY;
Settings.wifi_output_power = 170; Settings.wifi_output_power = 170;
Settings.param[P_ARP_GRATUITOUS] = WIFI_ARP_INTERVAL; Settings.param[P_ARP_GRATUITOUS] = WIFI_ARP_INTERVAL;
ParseIPv4(&Settings.ipv4_address[0], WIFI_IPV4_ADDRESS); ParseIPv4(&Settings.ipv4_address[0], WIFI_IP_ADDRESS);
ParseIPv4(&Settings.ipv4_address[1], WIFI_IPV4_GATEWAY); ParseIPv4(&Settings.ipv4_address[1], WIFI_GATEWAY);
ParseIPv4(&Settings.ipv4_address[2], WIFI_IPV4_SUBNETMASK); ParseIPv4(&Settings.ipv4_address[2], WIFI_SUBNETMASK);
ParseIPv4(&Settings.ipv4_address[3], WIFI_IPV4_DNS); ParseIPv4(&Settings.ipv4_address[3], WIFI_DNS);
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));

12
tasmota/user_config_override_sample.h
View File

@ -68,18 +68,18 @@ Examples :
// Ie: export PLATFORMIO_BUILD_FLAGS='-DUSE_CONFIG_OVERRIDE -DMY_IP="192.168.1.99" -DMY_GW="192.168.1.1" -DMY_DNS="192.168.1.1"' // Ie: export PLATFORMIO_BUILD_FLAGS='-DUSE_CONFIG_OVERRIDE -DMY_IP="192.168.1.99" -DMY_GW="192.168.1.1" -DMY_DNS="192.168.1.1"'
#ifdef MY_IP #ifdef MY_IP
#undef WIFI_IPV4_ADDRESS #undef WIFI_IP_ADDRESS
#define WIFI_IPV4_ADDRESS MY_IP // Set to 0.0.0.0 for using DHCP or enter a static IP address #define WIFI_IP_ADDRESS MY_IP // Set to 0.0.0.0 for using DHCP or enter a static IP address
#endif #endif
#ifdef MY_GW #ifdef MY_GW
#undef WIFI_IPV4_GATEWAY #undef WIFI_GATEWAY
#define WIFI_IPV4_GATEWAY MY_GW // if not using DHCP set Gateway IP address #define WIFI_GATEWAY MY_GW // if not using DHCP set Gateway IP address
#endif #endif
#ifdef MY_DNS #ifdef MY_DNS
#undef WIFI_IPV4_DNS #undef WIFI_DNS
#define WIFI_IPV4_DNS MY_DNS // If not using DHCP set DNS IP address (might be equal to WIFI_GATEWAY) #define WIFI_DNS MY_DNS // If not using DHCP set DNS IP address (might be equal to WIFI_GATEWAY)
#endif #endif
*/ */