Browse Source
isolate PROGMEM
Isolated dependencies sensors dependencies enums, macros and prototypes. I2C dependencies moved to actual sensor files. definitelly redefinepull/780/head
Lazar Obradovic
6 years ago
14 changed files with 451 additions and 400 deletions
Split View
Diff Options
-
+3 -0code/espurna/config/all.h
-
+0 -8code/espurna/config/defaults.h
-
+76 -0code/espurna/config/dependencies.h
-
+4 -188code/espurna/config/general.h
-
+97 -0code/espurna/config/progmem.h
-
+17 -0code/espurna/config/prototypes.h
-
+1 -204code/espurna/config/sensors.h
-
+231 -0code/espurna/config/types.h
-
+3 -0code/espurna/sensors/AM2320Sensor.h
-
+3 -0code/espurna/sensors/BH1750Sensor.h
-
+3 -0code/espurna/sensors/BMX280Sensor.h
-
+4 -0code/espurna/sensors/EmonSensor.h
-
+4 -0code/espurna/sensors/SHT3XI2CSensor.h
-
+5 -0code/espurna/sensors/SI7021Sensor.h
+ 3
- 0
code/espurna/config/all.h
View File
+ 0
- 8
code/espurna/config/defaults.h
View File
+ 76
- 0
code/espurna/config/dependencies.h
View File
| @ -0,0 +1,76 @@ | |||
| #ifndef DEPENDENCIES_H | |||
| #define DEPENDENCIES_H | |||
| //------------------------------------------------------------------------------ | |||
| // Do not change this file unless you know what you are doing | |||
| // Configuration settings are in the settings.h file | |||
| //------------------------------------------------------------------------------ | |||
| #if DEBUG_TELNET_SUPPORT | |||
| #undef TELNET_SUPPORT | |||
| #define TELNET_SUPPORT 1 | |||
| #endif | |||
| #ifndef DEBUG_WEB_SUPPORT | |||
| #define DEBUG_WEB_SUPPORT WEB_SUPPORT // Enable web debug log if web is enabled too | |||
| #endif | |||
| #if DEBUG_WEB_SUPPORT | |||
| #undef WEB_SUPPORT | |||
| #define WEB_SUPPORT 1 // Chicken and egg :) | |||
| #endif | |||
| #if WEB_SUPPORT == 0 | |||
| #undef SSDP_SUPPORT | |||
| #define SSDP_SUPPORT 0 // SSDP support requires web support | |||
| #endif | |||
| #if UART_MQTT_SUPPORT | |||
| #define MQTT_SUPPORT 1 | |||
| #undef TERMINAL_SUPPORT | |||
| #define TERMINAL_SUPPORT 0 | |||
| #undef DEBUG_SERIAL_SUPPORT | |||
| #define DEBUG_SERIAL_SUPPORT 0 | |||
| #endif | |||
| #if DOMOTICZ_SUPPORT | |||
| #undef MQTT_SUPPORT | |||
| #define MQTT_SUPPORT 1 // If Domoticz enabled enable MQTT | |||
| #endif | |||
| #if HOMEASSISTANT_SUPPORT | |||
| #undef MQTT_SUPPORT | |||
| #define MQTT_SUPPORT 1 // If Home Assistant enabled enable MQTT | |||
| #endif | |||
| #ifndef ASYNC_TCP_SSL_ENABLED | |||
| #if THINGSPEAK_USE_SSL && THINGSPEAK_USE_ASYNC | |||
| #undef THINGSPEAK_SUPPORT // Thingspeak in ASYNC mode requires ASYNC_TCP_SSL_ENABLED | |||
| #endif | |||
| #endif | |||
| #if SCHEDULER_SUPPORT | |||
| #undef NTP_SUPPORT | |||
| #define NTP_SUPPORT 1 // Scheduler needs NTP | |||
| #endif | |||
| //------------------------------------------------------------------------------ | |||
| // Sensors | |||
| //------------------------------------------------------------------------------ | |||
| #if ANALOG_SUPPORT | |||
| #undef ADC_VCC_ENABLED | |||
| #define ADC_VCC_ENABLED 0 | |||
| #endif | |||
| #if EMON_ANALOG_SUPPORT | |||
| #undef ADC_VCC_ENABLED | |||
| #define ADC_VCC_ENABLED 0 | |||
| #endif | |||
| // I2C dependencies moved to actual sensor files. | |||
| //------------------------------------------------------------------------------ | |||
| #endif // DEPENDENCIES_H | |||
+ 4
- 188
code/espurna/config/general.h
View File
+ 97
- 0
code/espurna/config/progmem.h
View File
| @ -0,0 +1,97 @@ | |||
| //-------------------------------------------------------------------------------- | |||
| // General PROGMEM definitions | |||
| //-------------------------------------------------------------------------------- | |||
| PROGMEM const char custom_reset_hardware[] = "Hardware button"; | |||
| PROGMEM const char custom_reset_web[] = "Reboot from web interface"; | |||
| PROGMEM const char custom_reset_terminal[] = "Reboot from terminal"; | |||
| PROGMEM const char custom_reset_mqtt[] = "Reboot from MQTT"; | |||
| PROGMEM const char custom_reset_rpc[] = "Reboot from RPC"; | |||
| PROGMEM const char custom_reset_ota[] = "Reboot after successful OTA update"; | |||
| PROGMEM const char custom_reset_http[] = "Reboot from HTTP"; | |||
| PROGMEM const char custom_reset_nofuss[] = "Reboot after successful NoFUSS update"; | |||
| PROGMEM const char custom_reset_upgrade[] = "Reboot after successful web update"; | |||
| PROGMEM const char custom_reset_factory[] = "Factory reset"; | |||
| PROGMEM const char* const custom_reset_string[] = { | |||
| custom_reset_hardware, custom_reset_web, custom_reset_terminal, | |||
| custom_reset_mqtt, custom_reset_rpc, custom_reset_ota, | |||
| custom_reset_http, custom_reset_nofuss, custom_reset_upgrade, | |||
| custom_reset_factory | |||
| }; | |||
| #if SENSOR_SUPPORT | |||
| PROGMEM const unsigned char magnitude_decimals[] = { | |||
| 0, | |||
| 1, 0, 2, | |||
| 3, 0, 0, 0, 0, 0, 0, 0, | |||
| 0, 0, 0, | |||
| 0, 0, 0, | |||
| 0, 0 | |||
| }; | |||
| PROGMEM const char magnitude_unknown_topic[] = "unknown"; | |||
| PROGMEM const char magnitude_temperature_topic[] = "temperature"; | |||
| PROGMEM const char magnitude_humidity_topic[] = "humidity"; | |||
| PROGMEM const char magnitude_pressure_topic[] = "pressure"; | |||
| PROGMEM const char magnitude_current_topic[] = "current"; | |||
| PROGMEM const char magnitude_voltage_topic[] = "voltage"; | |||
| PROGMEM const char magnitude_active_power_topic[] = "power"; | |||
| PROGMEM const char magnitude_apparent_power_topic[] = "apparent"; | |||
| PROGMEM const char magnitude_reactive_power_topic[] = "reactive"; | |||
| PROGMEM const char magnitude_power_factor_topic[] = "factor"; | |||
| PROGMEM const char magnitude_energy_topic[] = "energy"; | |||
| PROGMEM const char magnitude_energy_delta_topic[] = "energy_delta"; | |||
| PROGMEM const char magnitude_analog_topic[] = "analog"; | |||
| PROGMEM const char magnitude_digital_topic[] = "digital"; | |||
| PROGMEM const char magnitude_events_topic[] = "events"; | |||
| PROGMEM const char magnitude_pm1dot0_topic[] = "pm1dot0"; | |||
| PROGMEM const char magnitude_pm2dot5_topic[] = "pm2dot5"; | |||
| PROGMEM const char magnitude_pm10_topic[] = "pm10"; | |||
| PROGMEM const char magnitude_co2_topic[] = "co2"; | |||
| PROGMEM const char magnitude_lux_topic[] = "lux"; | |||
| PROGMEM const char magnitude_uv_topic[] = "uv"; | |||
| PROGMEM const char magnitude_distance_topic[] = "distance"; | |||
| PROGMEM const char* const magnitude_topics[] = { | |||
| magnitude_unknown_topic, magnitude_temperature_topic, magnitude_humidity_topic, | |||
| magnitude_pressure_topic, magnitude_current_topic, magnitude_voltage_topic, | |||
| magnitude_active_power_topic, magnitude_apparent_power_topic, magnitude_reactive_power_topic, | |||
| magnitude_power_factor_topic, magnitude_energy_topic, magnitude_energy_delta_topic, | |||
| magnitude_analog_topic, magnitude_digital_topic, magnitude_events_topic, | |||
| magnitude_pm1dot0_topic, magnitude_pm2dot5_topic, magnitude_pm10_topic, | |||
| magnitude_co2_topic, magnitude_lux_topic, magnitude_uv_topic, | |||
| magnitude_distance_topic | |||
| }; | |||
| PROGMEM const char magnitude_empty[] = ""; | |||
| PROGMEM const char magnitude_celsius[] = "C"; | |||
| PROGMEM const char magnitude_fahrenheit[] = "F"; | |||
| PROGMEM const char magnitude_percentage[] = "%"; | |||
| PROGMEM const char magnitude_hectopascals[] = "hPa"; | |||
| PROGMEM const char magnitude_amperes[] = "A"; | |||
| PROGMEM const char magnitude_volts[] = "V"; | |||
| PROGMEM const char magnitude_watts[] = "W"; | |||
| PROGMEM const char magnitude_kw[] = "kW"; | |||
| PROGMEM const char magnitude_joules[] = "J"; | |||
| PROGMEM const char magnitude_kwh[] = "kWh"; | |||
| PROGMEM const char magnitude_ugm3[] = "µg/m3"; | |||
| PROGMEM const char magnitude_ppm[] = "ppm"; | |||
| PROGMEM const char magnitude_lux[] = "lux"; | |||
| PROGMEM const char magnitude_uv[] = "uv"; | |||
| PROGMEM const char magnitude_distance[] = "m"; | |||
| PROGMEM const char* const magnitude_units[] = { | |||
| magnitude_empty, magnitude_celsius, magnitude_percentage, | |||
| magnitude_hectopascals, magnitude_amperes, magnitude_volts, | |||
| magnitude_watts, magnitude_watts, magnitude_watts, | |||
| magnitude_percentage, magnitude_joules, magnitude_joules, | |||
| magnitude_empty, magnitude_empty, magnitude_empty, | |||
| magnitude_ugm3, magnitude_ugm3, magnitude_ugm3, | |||
| magnitude_ppm, magnitude_lux, magnitude_uv, | |||
| magnitude_distance | |||
| }; | |||
| #endif | |||
+ 17
- 0
code/espurna/config/prototypes.h
View File
+ 1
- 204
code/espurna/config/sensors.h
View File
+ 231
- 0
code/espurna/config/types.h
View File
| @ -0,0 +1,231 @@ | |||
| //------------------------------------------------------------------------------ | |||
| // Type definitions | |||
| //------------------------------------------------------------------------------ | |||
| //------------------------------------------------------------------------------ | |||
| // BUTTONS | |||
| //------------------------------------------------------------------------------ | |||
| #define BUTTON_EVENT_NONE 0 | |||
| #define BUTTON_EVENT_PRESSED 1 | |||
| #define BUTTON_EVENT_RELEASED 2 | |||
| #define BUTTON_EVENT_CLICK 2 | |||
| #define BUTTON_EVENT_DBLCLICK 3 | |||
| #define BUTTON_EVENT_LNGCLICK 4 | |||
| #define BUTTON_EVENT_LNGLNGCLICK 5 | |||
| #define BUTTON_MODE_NONE 0 | |||
| #define BUTTON_MODE_TOGGLE 1 | |||
| #define BUTTON_MODE_ON 2 | |||
| #define BUTTON_MODE_OFF 3 | |||
| #define BUTTON_MODE_AP 4 | |||
| #define BUTTON_MODE_RESET 5 | |||
| #define BUTTON_MODE_PULSE 6 | |||
| #define BUTTON_MODE_FACTORY 7 | |||
| // Needed for ESP8285 boards under Windows using PlatformIO (?) | |||
| #ifndef BUTTON_PUSHBUTTON | |||
| #define BUTTON_PUSHBUTTON 0 | |||
| #define BUTTON_SWITCH 1 | |||
| #define BUTTON_DEFAULT_HIGH 2 | |||
| #define BUTTON_SET_PULLUP 4 | |||
| #endif | |||
| //------------------------------------------------------------------------------ | |||
| // RELAY | |||
| //------------------------------------------------------------------------------ | |||
| #define RELAY_BOOT_OFF 0 | |||
| #define RELAY_BOOT_ON 1 | |||
| #define RELAY_BOOT_SAME 2 | |||
| #define RELAY_BOOT_TOGGLE 3 | |||
| #define RELAY_TYPE_NORMAL 0 | |||
| #define RELAY_TYPE_INVERSE 1 | |||
| #define RELAY_TYPE_LATCHED 2 | |||
| #define RELAY_TYPE_LATCHED_INVERSE 3 | |||
| #define RELAY_SYNC_ANY 0 | |||
| #define RELAY_SYNC_NONE_OR_ONE 1 | |||
| #define RELAY_SYNC_ONE 2 | |||
| #define RELAY_SYNC_SAME 3 | |||
| #define RELAY_PULSE_NONE 0 | |||
| #define RELAY_PULSE_OFF 1 | |||
| #define RELAY_PULSE_ON 2 | |||
| #define RELAY_PROVIDER_RELAY 0 | |||
| #define RELAY_PROVIDER_DUAL 1 | |||
| #define RELAY_PROVIDER_LIGHT 2 | |||
| #define RELAY_PROVIDER_RFBRIDGE 3 | |||
| #define RELAY_PROVIDER_STM 4 | |||
| //------------------------------------------------------------------------------ | |||
| // LED | |||
| //------------------------------------------------------------------------------ | |||
| #define LED_MODE_MQTT 0 // LED will be managed from MQTT (OFF by default) | |||
| #define LED_MODE_WIFI 1 // LED will blink according to the WIFI status | |||
| #define LED_MODE_FOLLOW 2 // LED will follow state of linked relay (check RELAY#_LED) | |||
| #define LED_MODE_FOLLOW_INVERSE 3 // LED will follow the opposite state of linked relay (check RELAY#_LED) | |||
| #define LED_MODE_FINDME 4 // LED will be ON if all relays are OFF | |||
| #define LED_MODE_FINDME_WIFI 5 // A mixture between WIFI and FINDME | |||
| #define LED_MODE_ON 6 // LED always ON | |||
| #define LED_MODE_OFF 7 // LED always OFF | |||
| #define LED_MODE_RELAY 8 // If any relay is ON, LED will be ON, otherwise OFF | |||
| #define LED_MODE_RELAY_WIFI 9 // A mixture between WIFI and RELAY, the reverse of MIXED | |||
| // ----------------------------------------------------------------------------- | |||
| // UI | |||
| // ----------------------------------------------------------------------------- | |||
| #define UI_TAG_INPUT 0 | |||
| #define UI_TAG_CHECKBOX 1 | |||
| #define UI_TAG_SELECT 2 | |||
| // ----------------------------------------------------------------------------- | |||
| // LIGHT | |||
| // ----------------------------------------------------------------------------- | |||
| // Available light providers (do not change) | |||
| #define LIGHT_PROVIDER_NONE 0 | |||
| #define LIGHT_PROVIDER_MY92XX 1 // works with MY9291 and MY9231 | |||
| #define LIGHT_PROVIDER_DIMMER 2 | |||
| // ----------------------------------------------------------------------------- | |||
| // SCHEDULER | |||
| // ----------------------------------------------------------------------------- | |||
| #define SCHEDULER_TYPE_SWITCH 1 | |||
| #define SCHEDULER_TYPE_DIM 2 | |||
| // ----------------------------------------------------------------------------- | |||
| // IR | |||
| // ----------------------------------------------------------------------------- | |||
| // IR Button modes | |||
| #define IR_BUTTON_MODE_NONE 0 | |||
| #define IR_BUTTON_MODE_RGB 1 | |||
| #define IR_BUTTON_MODE_HSV 2 | |||
| #define IR_BUTTON_MODE_BRIGHTER 3 | |||
| #define IR_BUTTON_MODE_STATE 4 | |||
| #define IR_BUTTON_MODE_EFFECT 5 | |||
| #define LIGHT_EFFECT_SOLID 0 | |||
| #define LIGHT_EFFECT_FLASH 1 | |||
| #define LIGHT_EFFECT_STROBE 2 | |||
| #define LIGHT_EFFECT_FADE 3 | |||
| #define LIGHT_EFFECT_SMOOTH 4 | |||
| //------------------------------------------------------------------------------ | |||
| // RESET | |||
| //------------------------------------------------------------------------------ | |||
| #define CUSTOM_RESET_HARDWARE 1 // Reset from hardware button | |||
| #define CUSTOM_RESET_WEB 2 // Reset from web interface | |||
| #define CUSTOM_RESET_TERMINAL 3 // Reset from terminal | |||
| #define CUSTOM_RESET_MQTT 4 // Reset via MQTT | |||
| #define CUSTOM_RESET_RPC 5 // Reset via RPC (HTTP) | |||
| #define CUSTOM_RESET_OTA 6 // Reset after successful OTA update | |||
| #define CUSTOM_RESET_HTTP 7 // Reset via HTTP GET | |||
| #define CUSTOM_RESET_NOFUSS 8 // Reset after successful NOFUSS update | |||
| #define CUSTOM_RESET_UPGRADE 9 // Reset after update from web interface | |||
| #define CUSTOM_RESET_FACTORY 10 // Factory reset from terminal | |||
| #define CUSTOM_RESET_MAX 10 | |||
| //------------------------------------------------------------------------------ | |||
| // ENVIRONMENTAL | |||
| //------------------------------------------------------------------------------ | |||
| // American Society of Heating, Refrigerating and Air-Conditioning Engineers suggests a range of 45% - 55% humidity to manage health effects and illnesses. | |||
| // Comfortable: 30% - 60% | |||
| // Recommended: 45% - 55% | |||
| // High : 55% - 80% | |||
| #define HUMIDITY_NORMAL 0 // > %30 | |||
| #define HUMIDITY_COMFORTABLE 1 // > %45 | |||
| #define HUMIDITY_DRY 2 // < %30 | |||
| #define HUMIDITY_WET 3 // > %70 | |||
| // United States Environmental Protection Agency - UV Index Scale | |||
| // One UV Index unit is equivalent to 25 milliWatts per square meter. | |||
| #define UV_INDEX_LOW 0 // 0 to 2 means low danger from the sun's UV rays for the average person. | |||
| #define UV_INDEX_MODERATE 1 // 3 to 5 means moderate risk of harm from unprotected sun exposure. | |||
| #define UV_INDEX_HIGH 2 // 6 to 7 means high risk of harm from unprotected sun exposure. Protection against skin and eye damage is needed. | |||
| #define UV_INDEX_VERY_HIGH 3 // 8 to 10 means very high risk of harm from unprotected sun exposure. | |||
| // Take extra precautions because unprotected skin and eyes will be damaged and can burn quickly. | |||
| #define UV_INDEX_EXTREME 4 // 11 or more means extreme risk of harm from unprotected sun exposure. | |||
| // Take all precautions because unprotected skin and eyes can burn in minutes. | |||
| //------------------------------------------------------------------------------ | |||
| // UNITS | |||
| //------------------------------------------------------------------------------ | |||
| #define POWER_WATTS 0 | |||
| #define POWER_KILOWATTS 1 | |||
| #define ENERGY_JOULES 0 | |||
| #define ENERGY_KWH 1 | |||
| #define TMP_CELSIUS 0 | |||
| #define TMP_FAHRENHEIT 1 | |||
| //-------------------------------------------------------------------------------- | |||
| // Sensor ID | |||
| // These should remain over time, do not modify them, only add new ones at the end | |||
| //-------------------------------------------------------------------------------- | |||
| #define SENSOR_DHTXX_ID 0x01 | |||
| #define SENSOR_DALLAS_ID 0x02 | |||
| #define SENSOR_EMON_ANALOG_ID 0x03 | |||
| #define SENSOR_EMON_ADC121_ID 0x04 | |||
| #define SENSOR_EMON_ADS1X15_ID 0x05 | |||
| #define SENSOR_HLW8012_ID 0x06 | |||
| #define SENSOR_V9261F_ID 0x07 | |||
| #define SENSOR_ECH1560_ID 0x08 | |||
| #define SENSOR_ANALOG_ID 0x09 | |||
| #define SENSOR_DIGITAL_ID 0x10 | |||
| #define SENSOR_EVENTS_ID 0x11 | |||
| #define SENSOR_PMSX003_ID 0x12 | |||
| #define SENSOR_BMX280_ID 0x13 | |||
| #define SENSOR_MHZ19_ID 0x14 | |||
| #define SENSOR_SI7021_ID 0x15 | |||
| #define SENSOR_SHT3X_I2C_ID 0x16 | |||
| #define SENSOR_BH1750_ID 0x17 | |||
| #define SENSOR_PZEM004T_ID 0x18 | |||
| #define SENSOR_AM2320_ID 0x19 | |||
| #define SENSOR_GUVAS12SD_ID 0x20 | |||
| #define SENSOR_CSE7766_ID 0x21 | |||
| #define SENSOR_TMP3X_ID 0x22 | |||
| #define SENSOR_HCSR04_ID 0x23 | |||
| //-------------------------------------------------------------------------------- | |||
| // Magnitudes | |||
| //-------------------------------------------------------------------------------- | |||
| #define MAGNITUDE_NONE 0 | |||
| #define MAGNITUDE_TEMPERATURE 1 | |||
| #define MAGNITUDE_HUMIDITY 2 | |||
| #define MAGNITUDE_PRESSURE 3 | |||
| #define MAGNITUDE_CURRENT 4 | |||
| #define MAGNITUDE_VOLTAGE 5 | |||
| #define MAGNITUDE_POWER_ACTIVE 6 | |||
| #define MAGNITUDE_POWER_APPARENT 7 | |||
| #define MAGNITUDE_POWER_REACTIVE 8 | |||
| #define MAGNITUDE_POWER_FACTOR 9 | |||
| #define MAGNITUDE_ENERGY 10 | |||
| #define MAGNITUDE_ENERGY_DELTA 11 | |||
| #define MAGNITUDE_ANALOG 12 | |||
| #define MAGNITUDE_DIGITAL 13 | |||
| #define MAGNITUDE_EVENTS 14 | |||
| #define MAGNITUDE_PM1dot0 15 | |||
| #define MAGNITUDE_PM2dot5 16 | |||
| #define MAGNITUDE_PM10 17 | |||
| #define MAGNITUDE_CO2 18 | |||
| #define MAGNITUDE_LUX 19 | |||
| #define MAGNITUDE_UV 20 | |||
| #define MAGNITUDE_DISTANCE 21 | |||
| #define MAGNITUDE_MAX 22 | |||