Michel2/ESPEasy
1
0
Fork 0
mirror of https://github.com/letscontrolit/ESPEasy.git synced 2026-07-28 04:07:47 +00:00
Code Issues Releases Activity

Merge branch 'mega' into feature/AtlasEZOPlugins_pH_EC

Browse Source
This commit is contained in:
Peter Kretz
2021-05-09 22:45:52 +02:00
committed by GitHub
parent 7278a21f0f f0427dead1
commit d3854d0bde
3 changed files with 63 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platformio_esp32_envs.ini
+12
View File
@@ -24,6 +24,9 @@ build_flags = ${mqtt_flags.build_flags}
-DCONFIG_LWIP_ESP_GRATUITOUS_ARP
-DCONFIG_LWIP_GARP_TMR_INTERVAL=30
monitor_filters = esp32_exception_decoder
;upload_port = COM4
upload_speed = 921600
;monitor_port = COM4
@@ -54,6 +57,10 @@ build_flags = ${esp32_common.build_flags}
board = esp32dev
extra_scripts = ${esp32_common.extra_scripts}
[env:Peter_Custom_ESP32_4M316k]
extends = env:normal_ESP32_4M316k
platform = ${env:normal_ESP32_4M316k.platform}
build_flags = ${env:normal_ESP32_4M316k.build_flags} -DUSE_CUSTOM_H -DESP32
[env:test_A_ESP32_4M316k]
extends = esp32_common
@@ -246,6 +253,11 @@ extends = env:test_B_ESP32_4M316k
platform = ${env:test_B_ESP32_4M316k.platform}
build_flags = ${env:test_B_ESP32_4M316k.build_flags} -DHAS_ETHERNET
[env:Peter_Custom_ESP32_4M316k_ETH]
extends = env:normal_ESP32_4M316k
platform = ${env:normal_ESP32_4M316k.platform}
build_flags = ${env:normal_ESP32_4M316k.build_flags} -DHAS_ETHERNET -DUSE_CUSTOM_H
[env:test_C_ESP32_4M316k_ETH]
extends = env:test_C_ESP32_4M316k
platform = ${env:test_C_ESP32_4M316k.platform}
platformio_esp82xx_envs.ini
+5
View File
@@ -194,6 +194,11 @@ platform_packages = ${regular_platform.platform_packages}
build_flags = ${regular_platform.build_flags}
${esp8285_1M.build_flags}
[env:Peter_Custom_ESP8285_1M]
extends = env:normal_ESP8285_1M
platform = ${env:normal_ESP8285_1M.platform}
build_flags = ${env:normal_ESP8285_1M.build_flags} -DUSE_CUSTOM_H
; NORMAL: 2048k WROOM02 version --------------------------
[env:normal_WROOM02_2M]
src/Custom-sample.h
+46 -45
View File
@@ -25,11 +25,11 @@
# undef BUILD_GIT
#endif // ifdef BUILD_GIT
#define BUILD_GIT "My Build: " __DATE__ " " __TIME__
#define BUILD_GIT "Peters Build: " __DATE__ " " __TIME__
#define DEFAULT_NAME "MyEspEasyDevice" // Enter your device friendly name
#define UNIT 0 // Unit Number
#define DEFAULT_NAME "PoolMeter" // Enter your device friendly name
#define UNIT 9 // Unit Number
#define DEFAULT_DELAY 60 // Sleep Delay in seconds
// --- Wifi AP Mode (when your Wifi Network is not reachable) ----------------------------------------
@@ -38,15 +38,15 @@
#define DEFAULT_AP_KEY "configesp" // Enter network WPA key for AP (config) mode
// --- Wifi Client Mode -----------------------------------------------------------------------------
#define DEFAULT_SSID "MyHomeSSID" // Enter your network SSID
#define DEFAULT_KEY "MySuperSecretPassword" // Enter your network WPA key
#define DEFAULT_SSID "" // Enter your network SSID
#define DEFAULT_KEY "" // Enter your network WPA key
#define DEFAULT_SSID2 "" // Enter your fallback network SSID
#define DEFAULT_KEY2 "" // Enter your fallback network WPA key
#define DEFAULT_WIFI_INCLUDE_HIDDEN_SSID false // Allow to connect to hidden SSID APs
#define DEFAULT_USE_STATIC_IP false // (true|false) enabled or disabled static IP
#define DEFAULT_IP "192.168.0.50" // Enter your IP address
#define DEFAULT_DNS "192.168.0.1" // Enter your DNS
#define DEFAULT_GW "192.168.0.1" // Enter your Gateway
#define DEFAULT_DNS "192.168.1.1" // Enter your DNS
#define DEFAULT_GW "192.168.1.1" // Enter your Gateway
#define DEFAULT_SUBNET "255.255.255.0" // Enter your Subnet
#define DEFAULT_IPRANGE_LOW "0.0.0.0" // Allowed IP range to access webserver
#define DEFAULT_IPRANGE_HIGH "255.255.255.255" // Allowed IP range to access webserver
@@ -77,16 +77,16 @@
#define DEFAULT_CONTROLLER_PASS "" // Default controller Password
// using a default template, you also need to set a DEFAULT PROTOCOL to a suitable MQTT protocol !
#define DEFAULT_PUB "sensors/espeasy/%sysname%/%tskname%/%valname%" // Enter your pub
#define DEFAULT_SUB "sensors/espeasy/%sysname%/#" // Enter your sub
#define DEFAULT_SERVER "192.168.0.8" // Enter your Server IP address
#define DEFAULT_PUB "/%sysname%/%tskname%/%valname%" // Enter your pub
#define DEFAULT_SUB "/%sysname%/#" // Enter your sub
#define DEFAULT_SERVER "192.168.1.104" // Enter your Server IP address
#define DEFAULT_SERVER_HOST "" // Server hostname
#define DEFAULT_SERVER_USEDNS false // true: Use hostname. false: use IP
#define DEFAULT_USE_EXTD_CONTROLLER_CREDENTIALS false // true: Allow longer user credentials for controllers
#define DEFAULT_PORT 8080 // Enter your Server port value
#define DEFAULT_PORT 1883 // Enter your Server port value
#define DEFAULT_PROTOCOL 0 // Protocol used for controller communications
#define DEFAULT_PROTOCOL 5 // Protocol used for controller communications
// 0 = Stand-alone (no controller set)
// 1 = Domoticz HTTP
// 2 = Domoticz MQTT
@@ -98,8 +98,8 @@
// 8 = Generic HTTP
// 9 = FHEM HTTP
#define DEFAULT_PIN_I2C_SDA 4
#define DEFAULT_PIN_I2C_SCL 5
#define DEFAULT_PIN_I2C_SDA 13
#define DEFAULT_PIN_I2C_SCL 16
#define DEFAULT_I2C_CLOCK_SPEED 400000 // Use 100 kHz if working with old I2C chips
#define DEFAULT_SPI 0 //0=disabled 1=enabled and for ESP32 there is option 2 =HSPI
@@ -110,26 +110,26 @@
#define DEFAULT_PIN_RESET_BUTTON (-1)
#define DEFAULT_USE_RULES false // (true|false) Enable Rules?
#define DEFAULT_USE_RULES true // (true|false) Enable Rules?
#define DEFAULT_RULES_OLDENGINE true
#define DEFAULT_MQTT_RETAIN false // (true|false) Retain MQTT messages?
#define DEFAULT_MQTT_RETAIN true // (true|false) Retain MQTT messages?
#define DEFAULT_MQTT_DELAY 100 // Time in milliseconds to retain MQTT messages
#define DEFAULT_MQTT_LWT_TOPIC "" // Default lwt topic
#define DEFAULT_MQTT_LWT_CONNECT_MESSAGE "Connected" // Default lwt message
#define DEFAULT_MQTT_LWT_DISCONNECT_MESSAGE "Connection Lost" // Default lwt message
#define DEFAULT_MQTT_USE_UNITNAME_AS_CLIENTID 0
#define DEFAULT_USE_NTP false // (true|false) Use NTP Server
#define DEFAULT_NTP_HOST "" // NTP Server Hostname
#define DEFAULT_TIME_ZONE 0 // Time Offset (in minutes)
#define DEFAULT_USE_DST false // (true|false) Use Daily Time Saving
#define DEFAULT_USE_NTP true // (true|false) Use NTP Server
#define DEFAULT_NTP_HOST "pool.ntp.org" // NTP Server Hostname
#define DEFAULT_TIME_ZONE 60 // Time Offset (in minutes)
#define DEFAULT_USE_DST true // (true|false) Use Daily Time Saving
#define DEFAULT_LATITUDE 0.0f // Default Latitude
#define DEFAULT_LONGITUDE 0.0f // Default Longitude
#define DEFAULT_SYSLOG_IP "" // Syslog IP Address
#define DEFAULT_SYSLOG_LEVEL 0 // Syslog Log Level
#define DEFAULT_SYSLOG_IP "192.168.1.104" // Syslog IP Address
#define DEFAULT_SYSLOG_LEVEL LOG_LEVEL_INFO // Syslog Log Level
#define DEFAULT_SERIAL_LOG_LEVEL LOG_LEVEL_INFO // Serial Log Level
#define DEFAULT_WEB_LOG_LEVEL LOG_LEVEL_INFO // Web Log Level
#define DEFAULT_SD_LOG_LEVEL 0 // SD Card Log Level
@@ -209,10 +209,11 @@
CSS / template
#######################################################################################################
*/
#define WEBPAGE_TEMPLATE_DEFAULT_HEADER "<header class='headermenu'><h1>Kretz IoT: {{title}}</h1><BR>"
#define WEBPAGE_TEMPLATE_DEFAULT_FOOTER "<footer><br><h6>Server: <a href='https://openhab:8443' style='font-size: 15px; text-decoration: none'>Openhab</a></h6></footer></body></html>"
#define WEBPAGE_TEMPLATE_AP_HEADER "<body><header class='apheader'><h1>Willkommen im kretz-net.</h1>"
/*
#define WEBPAGE_TEMPLATE_DEFAULT_HEADER "<header class='headermenu'><h1>ESP Easy Mega: {{title}}</h1><BR>"
#define WEBPAGE_TEMPLATE_DEFAULT_FOOTER "<footer><br><h6>Powered by <a href='http://www.letscontrolit.com' style='font-size: 15px; text-decoration: none'>Let's Control It</a> community</h6></footer></body></html>"
#define WEBPAGE_TEMPLATE_AP_HEADER "<body><header class='apheader'><h1>Welcome to ESP Easy Mega AP</h1>"
#define WEBPAGE_TEMPLATE_HIDE_HELP_BUTTON
*/
// Embed Custom CSS in Custom.h:
@@ -252,20 +253,20 @@ static const char DATA_ESPEASY_DEFAULT_MIN_CSS[] PROGMEM = {
// #define USE_SERVO
// #define USES_P001 // Switch
#define USES_P001 // Switch
// #define USES_P002 // ADC
// #define USES_P003 // Pulse
// #define USES_P004 // Dallas
// #define USES_P005 // DHT
// #define USES_P006 // BMP085
#define USES_P004 // Dallas
#define USES_P005 // DHT
#define USES_P006 // BMP085
// #define USES_P007 // PCF8591
// #define USES_P008 // RFID
// #define USES_P009 // MCP
// #define USES_P010 // BH1750
// #define USES_P011 // PME
// #define USES_P012 // LCD
// #define USES_P013 // HCSR04
#define USES_P012 // LCD
#define USES_P013 // HCSR04
// #define USES_P014 // SI7021
// #define USES_P015 // TSL2561
// #define USES_P017 // PN532
@@ -275,20 +276,20 @@ static const char DATA_ESPEASY_DEFAULT_MIN_CSS[] PROGMEM = {
// #define USES_P020 // Ser2Net
// #define USES_P021 // Level
// #define USES_P022 // PCA9685
// #define USES_P023 // OLED
#define USES_P023 // OLED
// #define USES_P024 // MLX90614
// #define USES_P025 // ADS1115
// #define USES_P026 // SysInfo
// #define USES_P027 // INA219
// #define USES_P028 // BME280
#define USES_P028 // BME280
// #define USES_P029 // Output
// #define USES_P031 // SHT1X
// #define USES_P032 // MS5611
// #define USES_P033 // Dummy
// #define USES_P034 // DHT12
// #define USES_P036 // FrameOLED
// #define USES_P037 // MQTTImport
#define USES_P033 // Dummy
#define USES_P034 // DHT12
#define USES_P036 // FrameOLED
#define USES_P037 // MQTTImport
// #define USES_P038 // NeoPixel
// #define USES_P039 // Environment - Thermocouple
@@ -330,7 +331,7 @@ static const char DATA_ESPEASY_DEFAULT_MIN_CSS[] PROGMEM = {
// #define USES_P072 // HDC1080
// #define USES_P073 // 7DG
// #define USES_P074 // TSL2561
// #define USES_P075 // Nextion
#define USES_P075 // Nextion
// #define USES_P076 // HWL8012 in POW r1
// #define USES_P077 // CSE7766 in POW R2
// #define USES_P078 // Eastron Modbus Energy meters
@@ -352,19 +353,19 @@ static const char DATA_ESPEASY_DEFAULT_MIN_CSS[] PROGMEM = {
// #define USES_P092 // DLbus
// #define USES_P093 // MitsubishiHP
// #define USES_P094 // CULReader
// #define USES_P095 // ILI9341
// #define USES_P096 // eInk
// #define USES_P097 // ESP32Touch
#define USES_P095 // ILI9341
#define USES_P096 // eInk
#define USES_P097 // ESP32Touch
// #define USES_P098 //
// #define USES_P099 // XPT2046 touchscreen
// #define USES_P100 // DS2423 counter
// #define USES_P101 // WakeOnLan
// #define USES_P102 // PZEM004Tv3
// #define USES_P103 // Atlas_EZO_pH
#define USES_P103 // Atlas_EZO_pH
// #define USES_P104 // Atlas_EZO_EC
// #define USES_P105 // Atlas_EZO_ORP
// #define USES_P106 // BME680
#define USES_P106 // BME680
// #define USES_P107 // Si1145
// #define USES_P110 // VL53L0X Time of Flight sensor
// #define USES_P111 // RF522 RFID reader
@@ -393,7 +394,7 @@ static const char DATA_ESPEASY_DEFAULT_MIN_CSS[] PROGMEM = {
// #define USES_C002 // Domoticz MQTT
// #define USES_C003 // Nodo telnet
// #define USES_C004 // ThingSpeak
// #define USES_C005 // Home Assistant (openHAB) MQTT
#define USES_C005 // Home Assistant (openHAB) MQTT
// #define USES_C006 // PiDome MQTT
// #define USES_C007 // Emoncms
// #define USES_C008 // Generic HTTP
@@ -401,7 +402,7 @@ static const char DATA_ESPEASY_DEFAULT_MIN_CSS[] PROGMEM = {
// #define USES_C010 // Generic UDP
// #define USES_C011 // Generic HTTP Advanced
// #define USES_C012 // Blynk HTTP
// #define USES_C013 // ESPEasy P2P network
#define USES_C013 // ESPEasy P2P network
// #define USES_C014 // homie 3 & 4dev MQTT
// #define USES_C015 // Blynk
// #define USES_C016 // Cache controller