Merge branch 'feature/unifiedButton'

GOB52 · Nov 14, 2023 · 9e508b0 · 9e508b0
2 parents 473b0e2 + 9a9531e
commit 9e508b0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/platformio.ini b/platformio.ini
@@ -10,9 +10,9 @@ framework = arduino
 board_build.flash_mode = qio
 board_build.f_flash = 80000000L
 
-lib_deps = m5stack/M5Unified @ 0.1.7
+lib_deps = m5stack/M5Unified @ 0.1.10
   greiman/SdFat @ 2.2.2
-  https://github.com/GOB52/gob_unifiedButton
+  gob/gob_unifiedButton @ ^0.1.0
 lib_ldf_mode = deep
 
 monitor_speed = 115200

diff --git a/src/main.cpp b/src/main.cpp
@@ -110,7 +110,7 @@ gob::GMVFile gmv{};
 uint8_t* buffers[NUMBER_OF_BUFFERS]; // For 1 of JPEG and wav block
 uint32_t bufferIndex{}, outIndex{}, jpegSize{}, wavSize{}, wavTotal{};
 
-gob::UnifiedButton unfiedButton;
+goblib::UnifiedButton unfiedButton;
 
 enum class PlayType : int8_t { Single, RepeatSingle, RepeatAll, Shuffle };
 PlayType& operator++(PlayType& pt)
@@ -349,7 +349,7 @@ static void loopMenu()
         if(playMovie(list.getCurrentFullpath()))
         {
             loop_f = loopRender;
-            unfiedButton.changeAppearance(gob::UnifiedButton::appearance_t::transparent_all);
+            unfiedButton.changeAppearance(goblib::UnifiedButton::appearance_t::transparent_all);
             lastTime = ESP32Clock::now();
             return;
         }
@@ -395,7 +395,7 @@ static void changeToMenu()
 {
     M5.Speaker.stop();
     loop_f = loopMenu;
-    unfiedButton.changeAppearance(gob::UnifiedButton::appearance_t::bottom);
+    unfiedButton.changeAppearance(goblib::UnifiedButton::appearance_t::bottom);
     display.clear(0);
 
 }
@@ -488,8 +488,8 @@ static void loopRender()
 //
 void loop()
 {
-    unfiedButton.update();
     M5.update();
+    unfiedButton.update();
     loop_f();
 }