mirror of
https://github.com/letscontrolit/ESPEasy.git
synced 2026-07-27 19:57:38 +00:00
Revert "Merge pull request #1116 from TD-er/feature/allow_own_defaults"
This reverts commit 8ccbdcadf0.
This commit is contained in:
Unknown
@@ -5,5 +5,3 @@
|
||||
|
||||
lib/readme.txt
|
||||
src/Custom.h
|
||||
|
||||
src/espeasy_personal_defaults\.h
|
||||
|
||||
+10
-124
@@ -9,72 +9,34 @@
|
||||
// You can always change these during runtime and save to eeprom
|
||||
// After loading firmware, issue a 'reset' command to load the defaults.
|
||||
|
||||
#ifdef USE_OWN_DEFAULTS
|
||||
#include <espeasy_personal_defaults.h>
|
||||
#endif
|
||||
|
||||
|
||||
// --- Basic Config Settings ------------------------------------------------------------------------
|
||||
#ifndef DEFAULT_NAME
|
||||
#define DEFAULT_NAME "ESP_Easy" // Enter your device friendly name
|
||||
#endif
|
||||
#ifndef UNIT
|
||||
#define UNIT 0 // Unit Number
|
||||
#endif
|
||||
#ifndef DEFAULT_DELAY
|
||||
#define DEFAULT_DELAY 60 // Sleep Delay in seconds
|
||||
#endif
|
||||
|
||||
// --- Wifi AP Mode (when your Wifi Network is not reachable) ----------------------------------------
|
||||
#ifndef DEFAULT_AP_IP
|
||||
#define DEFAULT_AP_IP 192,168,4,1 // Enter IP address (comma separated) for AP (config) mode
|
||||
#endif
|
||||
#ifndef DEFAULT_AP_KEY
|
||||
#define DEFAULT_AP_KEY "configesp" // Enter network WPA key for AP (config) mode
|
||||
#endif
|
||||
|
||||
// --- Wifi Client Mode -----------------------------------------------------------------------------
|
||||
#ifndef DEFAULT_SSID
|
||||
#define DEFAULT_SSID "ssid" // Enter your Wifi network SSID
|
||||
#endif
|
||||
#ifndef DEFAULT_KEY
|
||||
#define DEFAULT_KEY "wpakey" // Enter your Wifi network WPA key
|
||||
#endif
|
||||
#ifndef DEFAULT_USE_STATIC_IP
|
||||
|
||||
#define DEFAULT_USE_STATIC_IP false // (true|false) enabled or disabled static IP
|
||||
#endif
|
||||
#ifndef DEFAULT_IP
|
||||
#define DEFAULT_IP "192.168.0.50" // Enter your IP address
|
||||
#endif
|
||||
#ifndef DEFAULT_DNS
|
||||
#define DEFAULT_DNS "192.168.0.1" // Enter your DNS
|
||||
#endif
|
||||
#ifndef DEFAULT_GW
|
||||
#define DEFAULT_GW "192.168.0.1" // Enter your Gateway
|
||||
#endif
|
||||
#ifndef DEFAULT_SUBNET
|
||||
#define DEFAULT_SUBNET "255.255.255.0" // Enter your Subnet
|
||||
#endif
|
||||
|
||||
// --- Default Controller ------------------------------------------------------------------------------
|
||||
#ifndef DEFAULT_CONTROLLER
|
||||
#define DEFAULT_CONTROLLER false // true or false enabled or disabled, set 1st controller defaults
|
||||
#endif
|
||||
// using a default template, you also need to set a DEFAULT PROTOCOL to a suitable MQTT protocol !
|
||||
#ifndef DEFAULT_PUB
|
||||
#define DEFAULT_PUB "sensors/espeasy/%sysname%/%tskname%/%valname%" // Enter your pub
|
||||
#endif
|
||||
#ifndef DEFAULT_SUB
|
||||
#define DEFAULT_SUB "sensors/espeasy/%sysname%/#" // Enter your sub
|
||||
#endif
|
||||
#ifndef DEFAULT_SERVER
|
||||
#define DEFAULT_SERVER "192.168.0.8" // Enter your Server IP address
|
||||
#endif
|
||||
#ifndef DEFAULT_PORT
|
||||
#define DEFAULT_PORT 8080 // Enter your Server port value
|
||||
#endif
|
||||
|
||||
#ifndef DEFAULT_PROTOCOL
|
||||
#define DEFAULT_PROTOCOL 1 // Protocol used for controller communications
|
||||
// 1 = Domoticz HTTP
|
||||
// 2 = Domoticz MQTT
|
||||
@@ -85,64 +47,32 @@
|
||||
// 7 = EmonCMS
|
||||
// 8 = Generic HTTP
|
||||
// 9 = FHEM HTTP
|
||||
#endif
|
||||
|
||||
|
||||
// --- Advanced Settings ---------------------------------------------------------------------------------
|
||||
#ifndef DEFAULT_USE_RULES
|
||||
#define DEFAULT_USE_RULES false // (true|false) Enable Rules?
|
||||
#endif
|
||||
|
||||
#ifndef DEFAULT_MQTT_RETAIN
|
||||
#define DEFAULT_MQTT_RETAIN false // (true|false) Retain MQTT messages?
|
||||
#endif
|
||||
#ifndef DEFAULT_MQTT_DELAY
|
||||
#define DEFAULT_MQTT_DELAY 1000 // Time in milliseconds to retain MQTT messages
|
||||
#endif
|
||||
|
||||
#ifndef DEFAULT_USE_NTP
|
||||
#define DEFAULT_USE_NTP false // (true|false) Use NTP Server
|
||||
#endif
|
||||
#ifndef DEFAULT_NTP_HOST
|
||||
#define DEFAULT_NTP_HOST "" // NTP Server Hostname
|
||||
#endif
|
||||
#ifndef DEFAULT_TIME_ZONE
|
||||
#define DEFAULT_TIME_ZONE 0 // Time Offset (in minutes)
|
||||
#endif
|
||||
#ifndef DEFAULT_USE_DST
|
||||
#define DEFAULT_USE_DST false // (true|false) Use Daily Time Saving
|
||||
#endif
|
||||
|
||||
#define LOG_TO_SERIAL 1
|
||||
#define LOG_TO_SYSLOG 2
|
||||
#define LOG_TO_WEBLOG 3
|
||||
#define LOG_TO_SDCARD 4
|
||||
|
||||
#ifndef DEFAULT_SYSLOG_IP
|
||||
#define DEFAULT_SYSLOG_IP "" // Syslog IP Address
|
||||
#endif
|
||||
#ifndef DEFAULT_SYSLOG_LEVEL
|
||||
#define DEFAULT_SYSLOG_LEVEL 0 // Syslog Log Level
|
||||
#endif
|
||||
#ifndef DEFAULT_SERIAL_LOG_LEVEL
|
||||
#define DEFAULT_SERIAL_LOG_LEVEL LOG_LEVEL_INFO // Serial Log Level
|
||||
#endif
|
||||
#ifndef DEFAULT_WEB_LOG_LEVEL
|
||||
#define DEFAULT_WEB_LOG_LEVEL LOG_LEVEL_INFO // Web Log Level
|
||||
#endif
|
||||
#ifndef DEFAULT_SD_LOG_LEVEL
|
||||
#define DEFAULT_SD_LOG_LEVEL 0 // SD Card Log Level
|
||||
#endif
|
||||
#ifndef DEFAULT_USE_SD_LOG
|
||||
#define DEFAULT_USE_SD_LOG false // (true|false) Enable Logging to the SD card
|
||||
#endif
|
||||
|
||||
#ifndef DEFAULT_USE_SERIAL
|
||||
#define DEFAULT_USE_SERIAL true // (true|false) Enable Logging to the Serial Port
|
||||
#endif
|
||||
#ifndef DEFAULT_SERIAL_BAUD
|
||||
#define DEFAULT_SERIAL_BAUD 115200 // Serial Port Baud Rate
|
||||
#endif
|
||||
|
||||
/*
|
||||
// --- Experimental Advanced Settings (NOT ACTIVES at this time) ------------------------------------
|
||||
@@ -209,9 +139,7 @@
|
||||
#define BUILD_GIT "(custom)"
|
||||
#endif
|
||||
|
||||
#ifndef MAX_FLASHWRITES_PER_DAY
|
||||
#define MAX_FLASHWRITES_PER_DAY 100 // per 24 hour window
|
||||
#endif
|
||||
|
||||
#define NODE_TYPE_ID_ESP_EASY_STD 1
|
||||
#define NODE_TYPE_ID_ESP_EASYM_STD 17
|
||||
@@ -283,80 +211,38 @@
|
||||
#define CMD_REBOOT 89
|
||||
#define CMD_WIFI_DISCONNECT 135
|
||||
|
||||
#ifndef DEVICES_MAX
|
||||
#if defined(PLUGIN_BUILD_TESTING) || defined(PLUGIN_BUILD_DEV)
|
||||
#define DEVICES_MAX 72
|
||||
#else
|
||||
#define DEVICES_MAX 64
|
||||
#endif
|
||||
#if defined(PLUGIN_BUILD_TESTING) || defined(PLUGIN_BUILD_DEV)
|
||||
#define DEVICES_MAX 72
|
||||
#else
|
||||
#define DEVICES_MAX 64
|
||||
#endif
|
||||
|
||||
#ifndef TASKS_MAX
|
||||
#if defined(ESP8266)
|
||||
#define TASKS_MAX 12 // max 12!
|
||||
#endif
|
||||
#if defined(ESP32)
|
||||
#define TASKS_MAX 32
|
||||
#endif
|
||||
#if defined(ESP8266)
|
||||
#define TASKS_MAX 12 // max 12!
|
||||
#endif
|
||||
#if defined(ESP32)
|
||||
#define TASKS_MAX 32
|
||||
#endif
|
||||
|
||||
#ifndef CONTROLLER_MAX
|
||||
#define CONTROLLER_MAX 3 // max 4!
|
||||
#endif
|
||||
#ifndef NOTIFICATION_MAX
|
||||
#define NOTIFICATION_MAX 3 // max 4!
|
||||
#endif
|
||||
#ifndef VARS_PER_TASK
|
||||
#define VARS_PER_TASK 4
|
||||
#endif
|
||||
#ifndef PLUGIN_MAX
|
||||
#define PLUGIN_MAX DEVICES_MAX
|
||||
#endif
|
||||
#ifndef PLUGIN_CONFIGVAR_MAX
|
||||
#define PLUGIN_CONFIGVAR_MAX 8
|
||||
#endif
|
||||
#ifndef PLUGIN_CONFIGFLOATVAR_MAX
|
||||
#define PLUGIN_CONFIGFLOATVAR_MAX 4
|
||||
#endif
|
||||
#ifndef PLUGIN_CONFIGLONGVAR_MAX
|
||||
#define PLUGIN_CONFIGLONGVAR_MAX 4
|
||||
#endif
|
||||
#ifndef PLUGIN_EXTRACONFIGVAR_MAX
|
||||
#define PLUGIN_EXTRACONFIGVAR_MAX 16
|
||||
#endif
|
||||
#ifndef CPLUGIN_MAX
|
||||
#define CPLUGIN_MAX 16
|
||||
#endif
|
||||
#ifndef NPLUGIN_MAX
|
||||
#define NPLUGIN_MAX 4
|
||||
#endif
|
||||
#ifndef UNIT_MAX
|
||||
#define UNIT_MAX 32 // Only relevant for UDP unicast message 'sweeps' and the nodelist.
|
||||
#endif
|
||||
#ifndef RULES_TIMER_MAX
|
||||
#define RULES_TIMER_MAX 8
|
||||
#endif
|
||||
#ifndef SYSTEM_TIMER_MAX
|
||||
#define SYSTEM_TIMER_MAX 8
|
||||
#endif
|
||||
#ifndef SYSTEM_CMD_TIMER_MAX
|
||||
#define SYSTEM_CMD_TIMER_MAX 2
|
||||
#endif
|
||||
#ifndef PINSTATE_TABLE_MAX
|
||||
#define PINSTATE_TABLE_MAX 32
|
||||
#endif
|
||||
#ifndef RULES_MAX_SIZE
|
||||
#define RULES_MAX_SIZE 2048
|
||||
#endif
|
||||
#ifndef RULES_MAX_NESTING_LEVEL
|
||||
#define RULES_MAX_NESTING_LEVEL 3
|
||||
#endif
|
||||
#ifndef RULESETS_MAX
|
||||
#define RULESETS_MAX 4
|
||||
#endif
|
||||
#ifndef RULES_BUFFER_SIZE
|
||||
#define RULES_BUFFER_SIZE 64
|
||||
#endif
|
||||
|
||||
#define PIN_MODE_UNDEFINED 0
|
||||
#define PIN_MODE_INPUT 1
|
||||
|
||||
@@ -1,97 +0,0 @@
|
||||
#ifndef ESPEASY_PERSONAL_DEFAULTS_H_
|
||||
#define ESPEASY_PERSONAL_DEFAULTS_H_
|
||||
// ********************************************************************************
|
||||
// User specific configuration, not updated via GIT updates
|
||||
// ********************************************************************************
|
||||
|
||||
|
||||
// --- Basic Config Settings ------------------------------------------------------------------------
|
||||
// #define DEFAULT_NAME "ESP_Easy" // Enter your device friendly name
|
||||
// #define UNIT 0 // Unit Number
|
||||
// #define DEFAULT_DELAY 60 // Sleep Delay in seconds
|
||||
|
||||
// --- Wifi AP Mode (when your Wifi Network is not reachable) ----------------------------------------
|
||||
// #define DEFAULT_AP_IP 192,168,4,1 // Enter IP address (comma separated) for AP (config) mode
|
||||
// #define DEFAULT_AP_KEY "configesp" // Enter network WPA key for AP (config) mode
|
||||
|
||||
// --- Wifi Client Mode -----------------------------------------------------------------------------
|
||||
// #define DEFAULT_SSID "ssid" // Enter your Wifi network SSID
|
||||
// #define DEFAULT_KEY "wpakey" // Enter your Wifi network WPA key
|
||||
|
||||
// #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_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
|
||||
// #define DEFAULT_IP_BLOCK_LEVEL 1 // 0: ALL_ALLOWED 1: LOCAL_SUBNET_ALLOWED 2: ONLY_IP_RANGE_ALLOWED
|
||||
|
||||
// --- Default Controller ------------------------------------------------------------------------------
|
||||
// #define DEFAULT_CONTROLLER false // true or false enabled or disabled, set 1st controller defaults
|
||||
// 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_PORT 8080 // Enter your Server port value
|
||||
|
||||
// #define DEFAULT_PROTOCOL 1 // Protocol used for controller communications
|
||||
// 1 = Domoticz HTTP
|
||||
// 2 = Domoticz MQTT
|
||||
// 3 = Nodo Telnet
|
||||
// 4 = ThingSpeak
|
||||
// 5 = OpenHAB MQTT
|
||||
// 6 = PiDome MQTT
|
||||
// 7 = EmonCMS
|
||||
// 8 = Generic HTTP
|
||||
// 9 = FHEM HTTP
|
||||
|
||||
|
||||
// --- Advanced Settings ---------------------------------------------------------------------------------
|
||||
// #define DEFAULT_USE_RULES false // (true|false) Enable Rules?
|
||||
|
||||
// #define DEFAULT_MQTT_RETAIN false // (true|false) Retain MQTT messages?
|
||||
// #define DEFAULT_MQTT_DELAY 1000 // Time in milliseconds to retain MQTT messages
|
||||
|
||||
// #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_SYSLOG_IP "" // Syslog IP Address
|
||||
// #define DEFAULT_SYSLOG_LEVEL 0 // 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
|
||||
// #define DEFAULT_USE_SD_LOG false // (true|false) Enable Logging to the SD card
|
||||
|
||||
// #define DEFAULT_USE_SERIAL true // (true|false) Enable Logging to the Serial Port
|
||||
// #define DEFAULT_SERIAL_BAUD 115200 // Serial Port Baud Rate
|
||||
|
||||
|
||||
// #define MAX_FLASHWRITES_PER_DAY 100 // per 24 hour window
|
||||
// #define DEVICES_MAX 72
|
||||
// #define TASKS_MAX 12 // max 12 for ESP8266
|
||||
|
||||
// #define CONTROLLER_MAX 3 // max 4!
|
||||
// #define NOTIFICATION_MAX 3 // max 4!
|
||||
// #define VARS_PER_TASK 4
|
||||
// #define PLUGIN_MAX DEVICES_MAX
|
||||
// #define PLUGIN_CONFIGVAR_MAX 8
|
||||
// #define PLUGIN_CONFIGFLOATVAR_MAX 4
|
||||
// #define PLUGIN_CONFIGLONGVAR_MAX 4
|
||||
// #define PLUGIN_EXTRACONFIGVAR_MAX 16
|
||||
// #define CPLUGIN_MAX 16
|
||||
// #define NPLUGIN_MAX 4
|
||||
// #define UNIT_MAX 32 // Only relevant for UDP unicast message 'sweeps' and the nodelist.
|
||||
// #define RULES_TIMER_MAX 8
|
||||
// #define SYSTEM_TIMER_MAX 8
|
||||
// #define SYSTEM_CMD_TIMER_MAX 2
|
||||
// #define PINSTATE_TABLE_MAX 32
|
||||
// #define RULES_MAX_SIZE 2048
|
||||
// #define RULES_MAX_NESTING_LEVEL 3
|
||||
// #define RULESETS_MAX 4
|
||||
// #define RULES_BUFFER_SIZE 64
|
||||
|
||||
|
||||
#endif /* ESPEASY_PERSONAL_DEFAULTS_H_ */
|
||||
Reference in New Issue
Block a user