wip:
This commit is contained in:
@@ -19,8 +19,6 @@ static void zh_pcf8574_event_handler(void *arg, esp_event_base_t event_base, int
|
|||||||
|
|
||||||
void app_main(void)
|
void app_main(void)
|
||||||
{
|
{
|
||||||
esp_log_level_set("zh_pcf8574", ESP_LOG_NONE);
|
|
||||||
esp_log_level_set("zh_vector", ESP_LOG_NONE);
|
|
||||||
nvs_flash_init();
|
nvs_flash_init();
|
||||||
esp_event_loop_create_default();
|
esp_event_loop_create_default();
|
||||||
zh_wifi_softap_init();
|
zh_wifi_softap_init();
|
||||||
@@ -83,6 +81,7 @@ static void zh_io_expander_init(void)
|
|||||||
esp_event_handler_instance_register(ZH_PCF8574, ESP_EVENT_ANY_ID, &zh_pcf8574_event_handler, NULL, NULL);
|
esp_event_handler_instance_register(ZH_PCF8574, ESP_EVENT_ANY_ID, &zh_pcf8574_event_handler, NULL, NULL);
|
||||||
zh_pcf8574_init_config_t config = ZH_PCF8574_INIT_CONFIG_DEFAULT();
|
zh_pcf8574_init_config_t config = ZH_PCF8574_INIT_CONFIG_DEFAULT();
|
||||||
config.i2c_handle = i2c_bus_handle;
|
config.i2c_handle = i2c_bus_handle;
|
||||||
|
config.stack_size = 3072;
|
||||||
config.i2c_address = LED_I2C_ADDRESS;
|
config.i2c_address = LED_I2C_ADDRESS;
|
||||||
zh_pcf8574_init(&config, &led_handle);
|
zh_pcf8574_init(&config, &led_handle);
|
||||||
config.i2c_address = RELAY_I2C_ADDRESS;
|
config.i2c_address = RELAY_I2C_ADDRESS;
|
||||||
@@ -107,14 +106,14 @@ static void zh_pcf8574_event_handler(void *arg, esp_event_base_t event_base, int
|
|||||||
{
|
{
|
||||||
zh_pcf8574_write_gpio(&led_handle, TS_LED_RED, LED_ON);
|
zh_pcf8574_write_gpio(&led_handle, TS_LED_RED, LED_ON);
|
||||||
zh_pcf8574_write_gpio(&led_handle, TS_LED_GREEN, LED_OFF);
|
zh_pcf8574_write_gpio(&led_handle, TS_LED_GREEN, LED_OFF);
|
||||||
zh_pcf8574_write_gpio(&relay_handle, TS_RELAY, RELAY_OFF);
|
zh_pcf8574_write_gpio(&relay_handle, TS_RELAY, RELAY_ON);
|
||||||
is_ts = false;
|
is_ts = false;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
zh_pcf8574_write_gpio(&led_handle, TS_LED_RED, LED_OFF);
|
zh_pcf8574_write_gpio(&led_handle, TS_LED_RED, LED_OFF);
|
||||||
zh_pcf8574_write_gpio(&led_handle, TS_LED_GREEN, LED_ON);
|
zh_pcf8574_write_gpio(&led_handle, TS_LED_GREEN, LED_ON);
|
||||||
zh_pcf8574_write_gpio(&relay_handle, TS_RELAY, RELAY_ON);
|
zh_pcf8574_write_gpio(&relay_handle, TS_RELAY, RELAY_OFF);
|
||||||
is_ts = true;
|
is_ts = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,9 +27,9 @@
|
|||||||
#define RELAY_I2C_ADDRESS 0x20 /*!< U5. */
|
#define RELAY_I2C_ADDRESS 0x20 /*!< U5. */
|
||||||
|
|
||||||
#define GROUND_RELAY 0x00 /*!< Relay K1. RL1 pin on U5. */
|
#define GROUND_RELAY 0x00 /*!< Relay K1. RL1 pin on U5. */
|
||||||
#define TS_RELAY 0x04 /*!< Relay K4. RL4 pin on U5. */
|
#define TS_RELAY 0x03 /*!< Relay K4. RL4 pin on U5. */
|
||||||
#define RET_RELAY 0x03 /*!< Relay K3. RL3 pin on U5. */
|
#define RET_RELAY 0x02 /*!< Relay K3. RL3 pin on U5. */
|
||||||
#define EXT_RELAY 0x02 /*!< Relay K2. RL2 pin on U5. */
|
#define EXT_RELAY 0x01 /*!< Relay K2. RL2 pin on U5. */
|
||||||
|
|
||||||
#define TS_BUTTON 0x00 /*!< Connector BT1. B1-0 on U7. */
|
#define TS_BUTTON 0x00 /*!< Connector BT1. B1-0 on U7. */
|
||||||
#define RET_BUTTON 0x01 /*!< Connector BT2. B2-1 on U7. */
|
#define RET_BUTTON 0x01 /*!< Connector BT2. B2-1 on U7. */
|
||||||
|
|||||||
49
sdkconfig
49
sdkconfig
@@ -296,9 +296,9 @@ CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
|
|||||||
# end of Recovery Bootloader and Rollback
|
# end of Recovery Bootloader and Rollback
|
||||||
|
|
||||||
CONFIG_BOOTLOADER_OFFSET_IN_FLASH=0x1000
|
CONFIG_BOOTLOADER_OFFSET_IN_FLASH=0x1000
|
||||||
CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
|
# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE is not set
|
||||||
# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_DEBUG is not set
|
# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_DEBUG is not set
|
||||||
# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_PERF is not set
|
CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_PERF=y
|
||||||
# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_NONE is not set
|
# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_NONE is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
@@ -307,12 +307,12 @@ CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
|
|||||||
CONFIG_BOOTLOADER_LOG_VERSION_1=y
|
CONFIG_BOOTLOADER_LOG_VERSION_1=y
|
||||||
CONFIG_BOOTLOADER_LOG_VERSION=1
|
CONFIG_BOOTLOADER_LOG_VERSION=1
|
||||||
# CONFIG_BOOTLOADER_LOG_LEVEL_NONE is not set
|
# CONFIG_BOOTLOADER_LOG_LEVEL_NONE is not set
|
||||||
# CONFIG_BOOTLOADER_LOG_LEVEL_ERROR is not set
|
CONFIG_BOOTLOADER_LOG_LEVEL_ERROR=y
|
||||||
# CONFIG_BOOTLOADER_LOG_LEVEL_WARN is not set
|
# CONFIG_BOOTLOADER_LOG_LEVEL_WARN is not set
|
||||||
CONFIG_BOOTLOADER_LOG_LEVEL_INFO=y
|
# CONFIG_BOOTLOADER_LOG_LEVEL_INFO is not set
|
||||||
# CONFIG_BOOTLOADER_LOG_LEVEL_DEBUG is not set
|
# CONFIG_BOOTLOADER_LOG_LEVEL_DEBUG is not set
|
||||||
# CONFIG_BOOTLOADER_LOG_LEVEL_VERBOSE is not set
|
# CONFIG_BOOTLOADER_LOG_LEVEL_VERBOSE is not set
|
||||||
CONFIG_BOOTLOADER_LOG_LEVEL=3
|
CONFIG_BOOTLOADER_LOG_LEVEL=1
|
||||||
|
|
||||||
#
|
#
|
||||||
# Format
|
# Format
|
||||||
@@ -402,13 +402,13 @@ CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
|
|||||||
CONFIG_ESPTOOLPY_FLASHFREQ="40m"
|
CONFIG_ESPTOOLPY_FLASHFREQ="40m"
|
||||||
# CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
|
# CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
|
||||||
# CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set
|
# CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set
|
||||||
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
|
# CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set
|
||||||
# CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
|
CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
|
||||||
# CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set
|
# CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set
|
||||||
# CONFIG_ESPTOOLPY_FLASHSIZE_32MB is not set
|
# CONFIG_ESPTOOLPY_FLASHSIZE_32MB is not set
|
||||||
# CONFIG_ESPTOOLPY_FLASHSIZE_64MB is not set
|
# CONFIG_ESPTOOLPY_FLASHSIZE_64MB is not set
|
||||||
# CONFIG_ESPTOOLPY_FLASHSIZE_128MB is not set
|
# CONFIG_ESPTOOLPY_FLASHSIZE_128MB is not set
|
||||||
CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
|
CONFIG_ESPTOOLPY_FLASHSIZE="8MB"
|
||||||
# CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE is not set
|
# CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE is not set
|
||||||
CONFIG_ESPTOOLPY_BEFORE_RESET=y
|
CONFIG_ESPTOOLPY_BEFORE_RESET=y
|
||||||
# CONFIG_ESPTOOLPY_BEFORE_NORESET is not set
|
# CONFIG_ESPTOOLPY_BEFORE_NORESET is not set
|
||||||
@@ -436,8 +436,8 @@ CONFIG_PARTITION_TABLE_MD5=y
|
|||||||
#
|
#
|
||||||
# OTA websocket update
|
# OTA websocket update
|
||||||
#
|
#
|
||||||
CONFIG_OTA_DEFAULT_URI="/"
|
CONFIG_OTA_DEFAULT_URI="/ota"
|
||||||
CONFIG_OTA_DEFAULT_WS_URI="/ws"
|
CONFIG_OTA_DEFAULT_WS_URI="/ota/ws"
|
||||||
CONFIG_OTA_CHUNK_SIZE=8192
|
CONFIG_OTA_CHUNK_SIZE=8192
|
||||||
# CONFIG_OTA_PRE_ENCRYPTED_MODE is not set
|
# CONFIG_OTA_PRE_ENCRYPTED_MODE is not set
|
||||||
# end of OTA websocket update
|
# end of OTA websocket update
|
||||||
@@ -445,9 +445,9 @@ CONFIG_OTA_CHUNK_SIZE=8192
|
|||||||
#
|
#
|
||||||
# Compiler options
|
# Compiler options
|
||||||
#
|
#
|
||||||
CONFIG_COMPILER_OPTIMIZATION_DEBUG=y
|
# CONFIG_COMPILER_OPTIMIZATION_DEBUG is not set
|
||||||
# CONFIG_COMPILER_OPTIMIZATION_SIZE is not set
|
# CONFIG_COMPILER_OPTIMIZATION_SIZE is not set
|
||||||
# CONFIG_COMPILER_OPTIMIZATION_PERF is not set
|
CONFIG_COMPILER_OPTIMIZATION_PERF=y
|
||||||
# CONFIG_COMPILER_OPTIMIZATION_NONE is not set
|
# CONFIG_COMPILER_OPTIMIZATION_NONE is not set
|
||||||
CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y
|
CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y
|
||||||
# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT is not set
|
# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT is not set
|
||||||
@@ -1301,7 +1301,7 @@ CONFIG_FATFS_DONT_TRUST_LAST_ALLOC=0
|
|||||||
#
|
#
|
||||||
# CONFIG_FREERTOS_SMP is not set
|
# CONFIG_FREERTOS_SMP is not set
|
||||||
# CONFIG_FREERTOS_UNICORE is not set
|
# CONFIG_FREERTOS_UNICORE is not set
|
||||||
CONFIG_FREERTOS_HZ=100
|
CONFIG_FREERTOS_HZ=1000
|
||||||
# CONFIG_FREERTOS_CHECK_STACKOVERFLOW_NONE is not set
|
# CONFIG_FREERTOS_CHECK_STACKOVERFLOW_NONE is not set
|
||||||
# CONFIG_FREERTOS_CHECK_STACKOVERFLOW_PTRVAL is not set
|
# CONFIG_FREERTOS_CHECK_STACKOVERFLOW_PTRVAL is not set
|
||||||
CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY=y
|
CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY=y
|
||||||
@@ -1331,7 +1331,6 @@ CONFIG_FREERTOS_TASK_NOTIFICATION_ARRAY_ENTRIES=1
|
|||||||
#
|
#
|
||||||
# Port
|
# Port
|
||||||
#
|
#
|
||||||
CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=y
|
|
||||||
# CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK is not set
|
# CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK is not set
|
||||||
CONFIG_FREERTOS_TLSP_DELETION_CALLBACKS=y
|
CONFIG_FREERTOS_TLSP_DELETION_CALLBACKS=y
|
||||||
# CONFIG_FREERTOS_TASK_PRE_DELETION_HOOK is not set
|
# CONFIG_FREERTOS_TASK_PRE_DELETION_HOOK is not set
|
||||||
@@ -1399,16 +1398,18 @@ CONFIG_LOG_VERSION=1
|
|||||||
# Log Level
|
# Log Level
|
||||||
#
|
#
|
||||||
# CONFIG_LOG_DEFAULT_LEVEL_NONE is not set
|
# CONFIG_LOG_DEFAULT_LEVEL_NONE is not set
|
||||||
# CONFIG_LOG_DEFAULT_LEVEL_ERROR is not set
|
CONFIG_LOG_DEFAULT_LEVEL_ERROR=y
|
||||||
# CONFIG_LOG_DEFAULT_LEVEL_WARN is not set
|
# CONFIG_LOG_DEFAULT_LEVEL_WARN is not set
|
||||||
CONFIG_LOG_DEFAULT_LEVEL_INFO=y
|
# CONFIG_LOG_DEFAULT_LEVEL_INFO is not set
|
||||||
# CONFIG_LOG_DEFAULT_LEVEL_DEBUG is not set
|
# CONFIG_LOG_DEFAULT_LEVEL_DEBUG is not set
|
||||||
# CONFIG_LOG_DEFAULT_LEVEL_VERBOSE is not set
|
# CONFIG_LOG_DEFAULT_LEVEL_VERBOSE is not set
|
||||||
CONFIG_LOG_DEFAULT_LEVEL=3
|
CONFIG_LOG_DEFAULT_LEVEL=1
|
||||||
CONFIG_LOG_MAXIMUM_EQUALS_DEFAULT=y
|
CONFIG_LOG_MAXIMUM_EQUALS_DEFAULT=y
|
||||||
|
# CONFIG_LOG_MAXIMUM_LEVEL_WARN is not set
|
||||||
|
# CONFIG_LOG_MAXIMUM_LEVEL_INFO is not set
|
||||||
# CONFIG_LOG_MAXIMUM_LEVEL_DEBUG is not set
|
# CONFIG_LOG_MAXIMUM_LEVEL_DEBUG is not set
|
||||||
# CONFIG_LOG_MAXIMUM_LEVEL_VERBOSE is not set
|
# CONFIG_LOG_MAXIMUM_LEVEL_VERBOSE is not set
|
||||||
CONFIG_LOG_MAXIMUM_LEVEL=3
|
CONFIG_LOG_MAXIMUM_LEVEL=1
|
||||||
|
|
||||||
#
|
#
|
||||||
# Level Settings
|
# Level Settings
|
||||||
@@ -2033,21 +2034,21 @@ CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y
|
|||||||
CONFIG_APP_ROLLBACK_ENABLE=y
|
CONFIG_APP_ROLLBACK_ENABLE=y
|
||||||
# CONFIG_APP_ANTI_ROLLBACK is not set
|
# CONFIG_APP_ANTI_ROLLBACK is not set
|
||||||
# CONFIG_LOG_BOOTLOADER_LEVEL_NONE is not set
|
# CONFIG_LOG_BOOTLOADER_LEVEL_NONE is not set
|
||||||
# CONFIG_LOG_BOOTLOADER_LEVEL_ERROR is not set
|
CONFIG_LOG_BOOTLOADER_LEVEL_ERROR=y
|
||||||
# CONFIG_LOG_BOOTLOADER_LEVEL_WARN is not set
|
# CONFIG_LOG_BOOTLOADER_LEVEL_WARN is not set
|
||||||
CONFIG_LOG_BOOTLOADER_LEVEL_INFO=y
|
# CONFIG_LOG_BOOTLOADER_LEVEL_INFO is not set
|
||||||
# CONFIG_LOG_BOOTLOADER_LEVEL_DEBUG is not set
|
# CONFIG_LOG_BOOTLOADER_LEVEL_DEBUG is not set
|
||||||
# CONFIG_LOG_BOOTLOADER_LEVEL_VERBOSE is not set
|
# CONFIG_LOG_BOOTLOADER_LEVEL_VERBOSE is not set
|
||||||
CONFIG_LOG_BOOTLOADER_LEVEL=3
|
CONFIG_LOG_BOOTLOADER_LEVEL=1
|
||||||
# CONFIG_FLASH_ENCRYPTION_ENABLED is not set
|
# CONFIG_FLASH_ENCRYPTION_ENABLED is not set
|
||||||
# CONFIG_FLASHMODE_QIO is not set
|
# CONFIG_FLASHMODE_QIO is not set
|
||||||
# CONFIG_FLASHMODE_QOUT is not set
|
# CONFIG_FLASHMODE_QOUT is not set
|
||||||
CONFIG_FLASHMODE_DIO=y
|
CONFIG_FLASHMODE_DIO=y
|
||||||
# CONFIG_FLASHMODE_DOUT is not set
|
# CONFIG_FLASHMODE_DOUT is not set
|
||||||
CONFIG_MONITOR_BAUD=115200
|
CONFIG_MONITOR_BAUD=115200
|
||||||
CONFIG_OPTIMIZATION_LEVEL_DEBUG=y
|
# CONFIG_OPTIMIZATION_LEVEL_DEBUG is not set
|
||||||
CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG=y
|
# CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set
|
||||||
CONFIG_COMPILER_OPTIMIZATION_DEFAULT=y
|
# CONFIG_COMPILER_OPTIMIZATION_DEFAULT is not set
|
||||||
# CONFIG_OPTIMIZATION_LEVEL_RELEASE is not set
|
# CONFIG_OPTIMIZATION_LEVEL_RELEASE is not set
|
||||||
# CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE is not set
|
# CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE is not set
|
||||||
CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y
|
CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y
|
||||||
|
|||||||
Reference in New Issue
Block a user