Add: useLowClockDelay setting.

lovyan03 · Apr 7, 2019 · 7859236 · 7859236
1 parent bed6837
commit 7859236
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/library.json b/library.json
@@ -14,7 +14,7 @@
   "dependencies": {
   	"name": "M5Stack"
   },
-  "version": "0.2.8",
+  "version": "0.2.9",
   "framework": "arduino",
   "platforms": "espressif32",
   "build": {

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=M5Stack_TreeView
-version=0.2.8
+version=0.2.9
 author=lovyan03
 maintainer=Lovyan <[email protected]>
 sentence=TreeView Menu UI for M5Stack

diff --git a/src/M5TreeView.cpp b/src/M5TreeView.cpp
@@ -117,9 +117,9 @@ M5TreeView::eCmd M5TreeView::checkInput() {
 MenuItem* M5TreeView::update(bool redraw) {
   if (millis() - _msec < 16) {
     uint32_t freq = getCpuFrequencyMhz();
-    setCpuFrequencyMhz(getXtalFrequencyMhz() / 4);
+    if (useLowClockDelay) setCpuFrequencyMhz(getXtalFrequencyMhz() / 4);
     delay(16 - (millis() - _msec));
-    setCpuFrequencyMhz(freq);
+    if (useLowClockDelay) setCpuFrequencyMhz(freq);
   }
 
   redraw |= _redraw;
@@ -170,7 +170,7 @@ MenuItem* M5TreeView::update(bool redraw) {
   if (oldFocus != focusItem) {
     scrollTarget(focusItem);
   }
-  focusItem->onFocusLoop();
+  if (focusItem) focusItem->onFocusLoop();
 
   return res;
 }

diff --git a/src/MenuItem.cpp b/src/MenuItem.cpp
@@ -18,6 +18,7 @@ bool MenuItem::useFACES = false;
 bool MenuItem::useCardKB = false;
 bool MenuItem::useJoyStick = false;
 bool MenuItem::usePLUSEncoder = false;
+bool MenuItem::useLowClockDelay = false;
 bool MenuItem::swapBtnBC = false;
 
 int16_t MenuItem::titleOffset = 14;

diff --git a/src/MenuItem.h b/src/MenuItem.h
@@ -28,6 +28,7 @@ class MenuItem {
   static bool useCardKB;
   static bool useJoyStick;
   static bool usePLUSEncoder;
+  static bool useLowClockDelay;
   static bool swapBtnBC;
 
   static void setTextFont(int f) { gfxFont = NULL; font = f; }