diff --git a/platformio.ini b/platformio.ini index 7b50617..9ffc168 100644 --- a/platformio.ini +++ b/platformio.ini @@ -14,6 +14,7 @@ board = ttgo-t-watch framework = arduino board_build.f_flash = 80000000L monitor_speed = 115200 +monitor_filters = default, esp32_exception_decoder build_flags = ; -DCORE_DEBUG_LEVEL=3 -DBOARD_HAS_PSRAM @@ -25,5 +26,4 @@ lib_deps = ESP Async WebServer@>=1.2.0 AsyncTCP@>=1.1.1 ArduinoJson@>=6.15.2 - ESP32SSPD@>=1.1.0 -;monitor_filters= default, esp32_exception_decoder \ No newline at end of file + ESP32SSPD@>=1.1.0 \ No newline at end of file diff --git a/src/config.h b/src/config.h index 901daa4..c32df47 100644 --- a/src/config.h +++ b/src/config.h @@ -26,11 +26,12 @@ #define LILYGO_WATCH_2020_V1 //To use T-Watch2020, please uncomment this line #define LILYGO_WATCH_LVGL //To use LVGL, you need to enable the macro LVGL + #define TWATCH_USE_PSRAM_ALLOC_LVGL #include /* * firmeware version string */ - #define __FIRMWARE__ "2020080702" + #define __FIRMWARE__ "2020081001" #endif // _CONFIG_H diff --git a/src/hardware/bma.cpp b/src/hardware/bma.cpp index 14ced08..c9fb27d 100644 --- a/src/hardware/bma.cpp +++ b/src/hardware/bma.cpp @@ -114,7 +114,6 @@ void IRAM_ATTR bma_irq( void ) { { portYIELD_FROM_ISR (); } - setCpuFrequencyMhz( 240 ); } /* @@ -125,7 +124,9 @@ void bma_loop( TTGOClass *ttgo ) { * handle IRQ event */ if ( xEventGroupGetBitsFromISR( bma_event_handle ) & BMA_EVENT_INT ) { - while( !ttgo->bma->readInterrupt() ); + setCpuFrequencyMhz(240); + + while( !ttgo->bma->readInterrupt() ); if ( ttgo->bma->isDoubleClick() ) { powermgm_set_event( POWERMGM_BMA_WAKEUP ); xEventGroupClearBitsFromISR( bma_event_handle, BMA_EVENT_INT ); diff --git a/src/hardware/powermgm.cpp b/src/hardware/powermgm.cpp index 56c3fa5..02cd59c 100644 --- a/src/hardware/powermgm.cpp +++ b/src/hardware/powermgm.cpp @@ -83,16 +83,26 @@ void powermgm_loop( TTGOClass *ttgo ) { display_wakeup(); timesyncToSystem(); - ttgo->startLvglTick(); - lv_disp_trig_activity(NULL); wifictl_wakeup(); + Serial.printf("Total heap: %d\r\n", ESP.getHeapSize()); + Serial.printf("Free heap: %d\r\n", ESP.getFreeHeap()); + Serial.printf("Total PSRAM: %d\r\n", ESP.getPsramSize()); + Serial.printf("Free PSRAM: %d\r\n", ESP.getFreePsram()); + + ttgo->startLvglTick(); + lv_disp_trig_activity(NULL); } else { + ttgo->stopLvglTick(); + + Serial.printf("Total heap: %d\r\n", ESP.getHeapSize()); + Serial.printf("Free heap: %d\r\n", ESP.getFreeHeap()); + Serial.printf("Total PSRAM: %d\r\n", ESP.getPsramSize()); + Serial.printf("Free PSRAM: %d\r\n", ESP.getFreePsram()); display_standby(); mainbar_jump_to_maintile( LV_ANIM_OFF ); - ttgo->stopLvglTick(); timesyncToRTC(); bma_standby(); diff --git a/ttgo-t-watch2020_v1.ino.bin b/ttgo-t-watch2020_v1.ino.bin index d9b71f1..cae6940 100644 Binary files a/ttgo-t-watch2020_v1.ino.bin and b/ttgo-t-watch2020_v1.ino.bin differ diff --git a/ttgo-t-watch2020_v1.version.json b/ttgo-t-watch2020_v1.version.json index df38553..c5d7709 100644 --- a/ttgo-t-watch2020_v1.version.json +++ b/ttgo-t-watch2020_v1.version.json @@ -1 +1 @@ -{"version":"2020080702","host":"http://www.neo-guerillaz.de","file":"ttgo-t-watch2020_v1.ino.bin"} +{"version":"2020081001","host":"http://www.neo-guerillaz.de","file":"ttgo-t-watch2020_v1.ino.bin"}