Upstream merge

M5Paper_FactoryTest.ino

@@ -0,0 +1,5 @@
+// Satisfy Arduino IDE (needs a .ino file, even if it's empty)
+
+#if !defined ARDUINO_M5STACK_FIRE
+  #error "Please Select M5Fire from the board menu"
+#endif

platformio.ini

@@ -9,18 +9,18 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [env:m5stack-fire]
-platform = espressif32
+platform = espressif32@^3.2.0
 board = m5stack-fire
 framework = arduino
 lib_deps = 
-	m5stack/M5EPD @ ^0.1.1
-	bblanchon/ArduinoJson@^6.17.3
-upload_port = /dev/ttyUSB*
-monitor_port = /dev/ttyUSB*
-upload_speed = 2000000
+	m5stack/M5EPD
+	bblanchon/ArduinoJson@ 6.17.3
+upload_speed = 1500000
 monitor_speed = 115200
 board_build.partitions = default_16MB.csv
-build_flags = 
-	-DCORE_DEBUG_LEVEL=4
+build_flags =
+	-DCORE_DEBUG_LEVEL=0
+	-DINCLUDE_FACTORYTESTS=1
+	-DINCLUDE_HOMESAMPLE=1
 	-DBOARD_HAS_PSRAM
 	-mfix-esp32-psram-cache-issue

src/epdgui/epdgui.cpp

@@ -3,133 +3,120 @@
 #include <list>
 #include "epdgui.h"
 
-typedef struct
-{
+typedef struct {
     Frame_Base* frame;
     epdgui_args_vector_t args;
-}frame_struct_t;
+} frame_struct_t;
 
 std::list<EPDGUI_Base*> epdgui_object_list;
-uint32_t obj_id = 1;
+uint32_t obj_id             = 1;
 Frame_Base* wait_for_delete = NULL;
-std::stack <Frame_Base*> frame_stack;
+std::stack<Frame_Base*> frame_stack;
 std::map<String, frame_struct_t> frame_map;
 uint8_t frame_switch_count = 0;
-bool _is_auto_update = true;
+bool _is_auto_update       = true;
+
+uint16_t _is_last_finger_up = 0xFFFF;
 uint16_t _last_pos_x = 0xFFFF, _last_pos_y = 0xFFFF;
 
-void EPDGUI_AddObject(EPDGUI_Base* object)
-{
+uint32_t g_last_active_time_millis = 0;
+
+void EPDGUI_AddObject(EPDGUI_Base* object) {
     object->SetID(obj_id);
     obj_id++;
     epdgui_object_list.push_back(object);
 }
 
-void EPDGUI_Draw(m5epd_update_mode_t mode)
-{
-    for(std::list<EPDGUI_Base*>::iterator p = epdgui_object_list.begin(); p != epdgui_object_list.end(); p++)
-    {
+void EPDGUI_Draw(m5epd_update_mode_t mode) {
+    for (std::list<EPDGUI_Base*>::iterator p = epdgui_object_list.begin();
+         p != epdgui_object_list.end(); p++) {
         (*p)->Draw(mode);
     }
 }
 
-void EPDGUI_Process(void)
-{
-    for(std::list<EPDGUI_Base*>::iterator p = epdgui_object_list.begin(); p != epdgui_object_list.end(); p++)
-    {
+void EPDGUI_Process(void) {
+    for (std::list<EPDGUI_Base*>::iterator p = epdgui_object_list.begin();
+         p != epdgui_object_list.end(); p++) {
         (*p)->UpdateState(-1, -1);
     }
 }
 
-void EPDGUI_Process(int16_t x, int16_t y)
-{
-    for(std::list<EPDGUI_Base*>::iterator p = epdgui_object_list.begin(); p != epdgui_object_list.end(); p++)
-    {
-        // log_d("%d, %d -> %d, %d, %d, %d", x, y, (*p)->getX(), (*p)->getY(), (*p)->getRX(), (*p)->getBY());
+void EPDGUI_Process(int16_t x, int16_t y) {
+    for (std::list<EPDGUI_Base*>::iterator p = epdgui_object_list.begin();
+         p != epdgui_object_list.end(); p++) {
+        // log_d("%d, %d -> %d, %d, %d, %d", x, y, (*p)->getX(), (*p)->getY(),
+        // (*p)->getRX(), (*p)->getBY());
         (*p)->UpdateState(x, y);
     }
 }
 
-void EPDGUI_Clear(void)
-{
+void EPDGUI_Clear(void) {
     epdgui_object_list.clear();
 }
 
-void EPDGUI_Run(Frame_Base* frame)
-{
+void EPDGUI_Run(Frame_Base* frame) {
     uint32_t last_active_time = 0;
 
-    if(frame->isRun() == 0)
-    {
+    if (frame->isRun() == 0) {
         frame->exit();
         log_d("Exit %s", frame->GetFrameName().c_str());
-        if(wait_for_delete != NULL)
-        {
+        if (wait_for_delete != NULL) {
             delete wait_for_delete;
             wait_for_delete = NULL;
         }
         return;
     }
 
     EPDGUI_Draw(UPDATE_MODE_NONE);
-    if((frame->GetFrameID() == 1) || (frame_switch_count > 3))
-    {
+    if ((frame->GetFrameID() == 1) || (frame_switch_count > 3)) {
         frame_switch_count = 0;
         M5.EPD.UpdateFull(UPDATE_MODE_GC16);
-    }
-    else
-    {
+    } else {
         M5.EPD.UpdateFull(UPDATE_MODE_GL16);
         frame_switch_count++;
     }
 
-    while (1)
-    {
-        if((frame->isRun() == 0) || (frame->run() == 0))
-        {
+    while (1) {
+        if ((frame->isRun() == 0) || (frame->run() == 0)) {
             frame->exit();
-            // M5.EPD.Clear();
+            M5.EPD.Clear(true);
             log_d("Exit %s", frame->GetFrameName().c_str());
-            if(wait_for_delete != NULL)
-            {
+            if (wait_for_delete != NULL) {
                 log_d("delete %s", wait_for_delete->GetFrameName().c_str());
                 delete wait_for_delete;
                 wait_for_delete = NULL;
             }
             return;
         }
 
-        if (M5.TP.avaliable())
-        {
+        if (M5.TP.avaliable()) {
             M5.TP.update();
-            bool is_finger_up = M5.TP.isFingerUp();
-            if(is_finger_up || (_last_pos_x != M5.TP.readFingerX(0)) || (_last_pos_y != M5.TP.readFingerY(0)))
-            {
-                _last_pos_x = M5.TP.readFingerX(0);
-                _last_pos_y = M5.TP.readFingerY(0);
-                if(is_finger_up)
-                {
+            uint16_t is_finger_up = M5.TP.isFingerUp() ? 1 : 0;
+            uint16_t pos_x        = M5.TP.readFingerX(0);
+            uint16_t pos_y        = M5.TP.readFingerY(0);
+            // Avoid duplicate events
+            if (_is_last_finger_up != is_finger_up || _last_pos_x != pos_x ||
+                _last_pos_y != pos_y) {
+                EPDGUI_UpdateGlobalLastActiveTime();
+                _last_pos_x        = pos_x;
+                _last_pos_y        = pos_y;
+                _is_last_finger_up = is_finger_up;
+                if (is_finger_up) {
                     EPDGUI_Process();
                     last_active_time = millis();
-                }
-                else
-                {
-                    EPDGUI_Process(M5.TP.readFingerX(0), M5.TP.readFingerY(0));
+                } else {
+                    EPDGUI_Process(pos_x, pos_y);
                     last_active_time = 0;
                 }
             }
-
-
+
             M5.TP.flush();
         }
 
-        if((last_active_time != 0) && (millis() - last_active_time > 2000))
-        {
-            if(M5.EPD.UpdateCount() > 4)
-            {
+        if ((last_active_time != 0) && (millis() - last_active_time > 2000)) {
+            if (M5.EPD.UpdateCount() > 4) {
                 M5.EPD.ResetUpdateCount();
-                if(_is_auto_update)
-                {
+                if (_is_auto_update) {
                     M5.EPD.UpdateFull(UPDATE_MODE_GL16);
                 }
             }
@@ -138,11 +125,9 @@ void EPDGUI_Run(Frame_Base* frame)
     }
 }
 
-void EPDGUI_MainLoop(void)
-{
-    if((!frame_stack.empty()) && (frame_stack.top() != NULL))
-    {
-        Frame_Base *frame = frame_stack.top();
+void EPDGUI_MainLoop(void) {
+    if ((!frame_stack.empty()) && (frame_stack.top() != NULL)) {
+        Frame_Base* frame = frame_stack.top();
         log_d("Run %s", frame->GetFrameName().c_str());
         EPDGUI_Clear();
         _is_auto_update = true;
@@ -151,63 +136,54 @@ void EPDGUI_MainLoop(void)
     }
 }
 
-void EPDGUI_AddFrame(String name, Frame_Base* frame)
-{
+void EPDGUI_AddFrame(String name, Frame_Base* frame) {
     frame_struct_t f;
     f.frame = frame;
     frame_map.insert(std::pair<String, frame_struct_t>(name, f));
 }
 
-void EPDGUI_AddFrameArg(String name, int n, void* arg)
-{
-    if(frame_map.count(name) == 0)
-    {
+void EPDGUI_AddFrameArg(String name, int n, void* arg) {
+    if (frame_map.count(name) == 0) {
         return;
     }
-    if(frame_map[name].args.size() > n)
-    {
+    if (frame_map[name].args.size() > n) {
         frame_map[name].args[n] = arg;
-    }
-    else
-    {
+    } else {
         frame_map[name].args.push_back(arg);
     }
     log_d("%d", frame_map[name].args.size());
 }
 
-Frame_Base* EPDGUI_GetFrame(String name)
-{
-    if(frame_map.count(name) > 0)
-    {
+Frame_Base* EPDGUI_GetFrame(String name) {
+    if (frame_map.count(name) > 0) {
         return frame_map[name].frame;
     }
     return NULL;
 }
 
-void EPDGUI_PushFrame(Frame_Base* frame)
-{
+void EPDGUI_PushFrame(Frame_Base* frame) {
     frame_stack.push(frame);
 }
 
-void EPDGUI_PopFrame(bool isDelete)
-{
-    if(isDelete)
-    {
+void EPDGUI_PopFrame(bool isDelete) {
+    if (isDelete) {
         wait_for_delete = frame_stack.top();
     }
     frame_stack.pop();
 }
 
-void EPDGUI_OverwriteFrame(Frame_Base* frame)
-{
-    while(!frame_stack.empty())
-    {
+void EPDGUI_OverwriteFrame(Frame_Base* frame) {
+    while (!frame_stack.empty()) {
         frame_stack.pop();
     }
     frame_stack.push(frame);
 }
 
-void EPDGUI_SetAutoUpdate(bool isAuto)
-{
+void EPDGUI_SetAutoUpdate(bool isAuto) {
     _is_auto_update = isAuto;
 }
+
+/// Update active time to avoid power saving
+void EPDGUI_UpdateGlobalLastActiveTime() {
+    g_last_active_time_millis = millis();
+}

src/epdgui/epdgui.h

@@ -24,4 +24,8 @@ void EPDGUI_AddFrameArg(String name, int n, void* arg);
 Frame_Base* EPDGUI_GetFrame(String name);
 void EPDGUI_SetAutoUpdate(bool isAuto);
 
-#endif //__EPDGUI_H
+extern uint32_t g_last_active_time_millis;
+
+void EPDGUI_UpdateGlobalLastActiveTime();
+
+#endif  //__EPDGUI_H