|
@@ -82,7 +82,6 @@ bool read_charge_is_running()
|
|
|
|
|
|
static void light_sleep_task(void *args)
|
|
static void light_sleep_task(void *args)
|
|
{
|
|
{
|
|
-
|
|
|
|
// if(Machine_info.eflagID != 0xff) //如果未分配ID
|
|
// if(Machine_info.eflagID != 0xff) //如果未分配ID
|
|
// {
|
|
// {
|
|
// esp_light_sleep_start(); //进入休眠
|
|
// esp_light_sleep_start(); //进入休眠
|
|
@@ -94,9 +93,9 @@ static void light_sleep_task(void *args)
|
|
int lev_2 = 0;
|
|
int lev_2 = 0;
|
|
while (true)
|
|
while (true)
|
|
{
|
|
{
|
|
- if (is_key_press() || !is_epd_ok || !is_epd_ok_cplt|| !is_change_chanel_ok)
|
|
|
|
|
|
+ if (is_key_press() || !is_epd_ok || !is_epd_ok_cplt || !is_change_chanel_ok)
|
|
{
|
|
{
|
|
- ESP_LOGI(LOG_TAG, "%d %d %d %dnot sleep 1s continue", is_key_press(), !is_epd_ok, !is_epd_ok_cplt,!is_change_chanel_ok);
|
|
|
|
|
|
+ ESP_LOGI(LOG_TAG, "%d %d %d %dnot sleep 1s continue", is_key_press(), !is_epd_ok, !is_epd_ok_cplt, !is_change_chanel_ok);
|
|
vTaskDelay(1000 / portTICK_PERIOD_MS);
|
|
vTaskDelay(1000 / portTICK_PERIOD_MS);
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
@@ -131,7 +130,7 @@ static void light_sleep_task(void *args)
|
|
|
|
|
|
gpio_reset_pin(4);
|
|
gpio_reset_pin(4);
|
|
int ext_wakeup_pin_0 = 4;
|
|
int ext_wakeup_pin_0 = 4;
|
|
- printf("Enabling EXT0 wakeup on pin GPIO%d\n", ext_wakeup_pin_0);
|
|
|
|
|
|
+ // printf("Enabling EXT0 wakeup on pin GPIO%d\n", ext_wakeup_pin_0);
|
|
ESP_ERROR_CHECK(esp_sleep_enable_ext0_wakeup(ext_wakeup_pin_0, 0));
|
|
ESP_ERROR_CHECK(esp_sleep_enable_ext0_wakeup(ext_wakeup_pin_0, 0));
|
|
|
|
|
|
// Configure pullup/downs via RTCIO to tie wakeup pins to inactive level during deepsleep.
|
|
// Configure pullup/downs via RTCIO to tie wakeup pins to inactive level during deepsleep.
|
|
@@ -161,7 +160,7 @@ static void light_sleep_task(void *args)
|
|
gpio_reset_pin(2);
|
|
gpio_reset_pin(2);
|
|
const int ext_wakeup_pin_1 = 2;
|
|
const int ext_wakeup_pin_1 = 2;
|
|
const uint64_t ext_wakeup_pin_1_mask = 1ULL << ext_wakeup_pin_1;
|
|
const uint64_t ext_wakeup_pin_1_mask = 1ULL << ext_wakeup_pin_1;
|
|
- printf("Enabling EXT1 wakeup on pins GPIO %d\r\n", ext_wakeup_pin_1);
|
|
|
|
|
|
+ // printf("Enabling EXT1 wakeup on pins GPIO %d\r\n", ext_wakeup_pin_1);
|
|
ESP_ERROR_CHECK(esp_sleep_enable_ext1_wakeup(ext_wakeup_pin_1_mask, ESP_EXT1_WAKEUP_ALL_LOW));
|
|
ESP_ERROR_CHECK(esp_sleep_enable_ext1_wakeup(ext_wakeup_pin_1_mask, ESP_EXT1_WAKEUP_ALL_LOW));
|
|
|
|
|
|
#endif
|
|
#endif
|
|
@@ -252,6 +251,7 @@ static void light_sleep_task(void *args)
|
|
if (!is_adv)
|
|
if (!is_adv)
|
|
{
|
|
{
|
|
getRtcTime(&Machine_info);
|
|
getRtcTime(&Machine_info);
|
|
|
|
+ printRtcTime("-> sleep");
|
|
ESP_LOGW(LOG_TAG, "-> sleep\r\n");
|
|
ESP_LOGW(LOG_TAG, "-> sleep\r\n");
|
|
uart_wait_tx_idle_polling(1); // 抛出剩余串口1消息
|
|
uart_wait_tx_idle_polling(1); // 抛出剩余串口1消息
|
|
uart_wait_tx_idle_polling(CONFIG_ESP_CONSOLE_UART_NUM); // 抛出剩余串口0消息
|
|
uart_wait_tx_idle_polling(CONFIG_ESP_CONSOLE_UART_NUM); // 抛出剩余串口0消息
|
|
@@ -283,6 +283,7 @@ static void light_sleep_task(void *args)
|
|
terminal_send_data(); // 添加数据队列
|
|
terminal_send_data(); // 添加数据队列
|
|
}
|
|
}
|
|
ESP_LOGW(LOG_TAG, "wakeup reson = %d\r\n", reson);
|
|
ESP_LOGW(LOG_TAG, "wakeup reson = %d\r\n", reson);
|
|
|
|
+ printRtcTime("wakeup ");
|
|
switch (reson)
|
|
switch (reson)
|
|
{
|
|
{
|
|
case ESP_SLEEP_WAKEUP_TIMER:
|
|
case ESP_SLEEP_WAKEUP_TIMER:
|
|
@@ -316,7 +317,6 @@ static void light_sleep_task(void *args)
|
|
// f_send_test();
|
|
// f_send_test();
|
|
f_send_get_time();
|
|
f_send_get_time();
|
|
f_send_get_chart_data();
|
|
f_send_get_chart_data();
|
|
- // f_send_lora_rssi(Machine_info.rssi);
|
|
|
|
f_send_battary_vaule(Machine_info.batt_precent);
|
|
f_send_battary_vaule(Machine_info.batt_precent);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -528,11 +528,13 @@ static void light_sleep_task(void *args)
|
|
**********************************************************************************/
|
|
**********************************************************************************/
|
|
void app_main(void)
|
|
void app_main(void)
|
|
{
|
|
{
|
|
|
|
+ printRtcTime("app_main before");
|
|
app_init(); // 用户任务相关
|
|
app_init(); // 用户任务相关
|
|
sleep_init(); // 使能协处理器相关
|
|
sleep_init(); // 使能协处理器相关
|
|
// 创建休眠任务
|
|
// 创建休眠任务
|
|
xTaskCreate(light_sleep_task, "light_sleep_task", 4096 * 5, NULL, 1, NULL);
|
|
xTaskCreate(light_sleep_task, "light_sleep_task", 4096 * 5, NULL, 1, NULL);
|
|
|
|
|
|
|
|
+ printRtcTime("app_main after");
|
|
printf("Machine_info.power_status = %d\r\n", Machine_info.power_status);
|
|
printf("Machine_info.power_status = %d\r\n", Machine_info.power_status);
|
|
|
|
|
|
if (Machine_info.power_status == 0) // 关机状态
|
|
if (Machine_info.power_status == 0) // 关机状态
|