small gui fixes

eez-open · Mar 23, 2020 · 439d861 · 439d861
1 parent c91e9cd
commit 439d861
Show file tree

Hide file tree

Showing 8 changed files with 16,041 additions and 16,044 deletions.
diff --git a/modular-psu-firmware.eez-project b/modular-psu-firmware.eez-project
@@ -22053,7 +22053,7 @@
                               "top": 30,
                               "width": 22,
                               "height": 28,
-                              "text": "DC"
+                              "text": "Dt"
                             },
                             {
                               "type": "DisplayData",

diff --git a/src/eez/gui/document_simulator.cpp b/src/eez/gui/document_simulator.cpp
@@ -4007,7 +4007,7 @@ const uint8_t assets[403467] = {
     0x79, 0x00, 0x20, 0x00, 0xAE, 0x00, 0x20, 0xAD, 0x5C, 0x16, 0x86, 0x79, 0x00, 0x20, 0x00, 0xAC,
     0x00, 0x28, 0xAD, 0x78, 0x08, 0x02, 0x14, 0x00, 0x5D, 0xAF, 0x00, 0x2C, 0xAD, 0x01, 0x68, 0x00,
     0x04, 0xB8, 0x17, 0x04, 0x08, 0x00, 0x0C, 0x20, 0x00, 0x0F, 0x28, 0x41, 0x05, 0xD3, 0x53, 0x65,
-    0x74, 0x20, 0x73, 0x70, 0x65, 0x65, 0x64, 0x20, 0x74, 0x6F, 0x3A, 0xC0, 0x4C, 0x22, 0x44, 0x43,
+    0x74, 0x20, 0x73, 0x70, 0x65, 0x65, 0x64, 0x20, 0x74, 0x6F, 0x3A, 0xC0, 0x4C, 0x22, 0x44, 0x74,
     0x00, 0x09, 0x11, 0x94, 0xA7, 0x00, 0x73, 0x5F, 0x00, 0x1C, 0x00, 0x06, 0x00, 0x34, 0x88, 0x00,
     0x08, 0x14, 0x00, 0x13, 0x3C, 0x14, 0x00, 0x02, 0x02, 0x00, 0x7F, 0x5F, 0x00, 0x1C, 0x00, 0xA4,
     0x00, 0x44, 0x14, 0x00, 0x00, 0x13, 0x4C, 0x14, 0x00, 0x11, 0xA2, 0x29, 0x00, 0x02, 0x50, 0x00,
@@ -4032,8 +4032,8 @@ const uint8_t assets[403467] = {
     0x07, 0x11, 0x98, 0x30, 0x00, 0x0A, 0xDC, 0x0E, 0x11, 0x9C, 0x80, 0x00, 0x02, 0x6C, 0x00, 0x02,
     0xCC, 0x0D, 0x3D, 0x00, 0x01, 0xA0, 0x14, 0x00, 0x33, 0x01, 0x01, 0xA8, 0x14, 0x00, 0x02, 0xA4,
     0x0D, 0x02, 0x10, 0x13, 0x13, 0xB0, 0x14, 0x00, 0x11, 0x49, 0x3F, 0x00, 0x7F, 0x2E, 0x00, 0x20,
-    0x00, 0x03, 0x01, 0xB8, 0x14, 0x00, 0x00, 0x13, 0xC0, 0x14, 0x00, 0x02, 0x02, 0x00, 0x02, 0x10,
-    0x13, 0x71, 0xC8, 0xAD, 0x01, 0x00, 0x53, 0x65, 0x74, 0x74, 0x33, 0x06, 0x18, 0x00, 0x31, 0xE8,
+    0x00, 0x03, 0x01, 0xB8, 0x14, 0x00, 0x00, 0x13, 0xC0, 0x14, 0x00, 0x02, 0x02, 0x00, 0x02, 0x30,
+    0x0E, 0x71, 0xC8, 0xAD, 0x01, 0x00, 0x53, 0x65, 0x74, 0x74, 0x33, 0x06, 0x18, 0x00, 0x31, 0xE8,
     0x00, 0xD0, 0xA4, 0x00, 0x0A, 0xDC, 0x0E, 0x19, 0xD4, 0xD4, 0x00, 0x0A, 0xDC, 0x0E, 0x11, 0xD8,
     0x30, 0x00, 0x19, 0x5D, 0x0C, 0x0F, 0x1D, 0xDC, 0x70, 0x00, 0x3D, 0x00, 0x01, 0xE0, 0x14, 0x00,
     0x33, 0x01, 0x01, 0xE8, 0x14, 0x00, 0x08, 0xD4, 0x00, 0x13, 0xF0, 0x14, 0x00, 0x02, 0x02, 0x00,

diff --git a/src/eez/gui/document_stm32.cpp b/src/eez/gui/document_stm32.cpp
diff --git a/src/eez/gui/document_stm32.h b/src/eez/gui/document_stm32.h
@@ -1636,4 +1636,4 @@ enum PagesEnum {
     PAGE_ID_TOUCH_TEST = 160
 };
 
-extern const uint8_t assets[310955];
+extern const uint8_t assets[310954];
diff --git a/src/eez/gui/widget.cpp b/src/eez/gui/widget.cpp
@@ -22,7 +22,6 @@
 #include <cstddef>
 #include <limits.h>
 
-#include <eez/debug.h>
 #include <eez/system.h>
 
 #include <eez/gui/gui.h>

diff --git a/src/eez/gui/widget.h b/src/eez/gui/widget.h
@@ -141,6 +141,8 @@ struct WidgetList {
 
 void WidgetList_fixPointers(WidgetList &widgetList);
 
+////////////////////////////////////////////////////////////////////////////////
+
 #define SHADOW_FLAG 1
 #define CLOSE_PAGE_IF_TOUCHED_OUTSIDE_FLAG 2
 
@@ -214,8 +216,6 @@ struct WidgetState {
     Value data;
 };
 
-////////////////////////////////////////////////////////////////////////////////
-
 class AppContext;
 
 struct WidgetCursor {

diff --git a/src/eez/modules/psu/gui/page_ch_settings.cpp b/src/eez/modules/psu/gui/page_ch_settings.cpp
@@ -924,8 +924,6 @@ void ChSettingsListsPage::insertRow(int iRow, int iCopyRow) {
             m_currentList[i + 1] = m_currentList[i];
         }
 
-        Cursor cursor(getCursorIndexWithinPage());
-
         if (iCopyRow < m_dwellListLength && iRow <= m_dwellListLength) {
             m_dwellList[iRow] = m_dwellList[iCopyRow];
             ++m_dwellListLength;

diff --git a/src/eez/modules/psu/persist_conf.cpp b/src/eez/modules/psu/persist_conf.cpp
@@ -175,7 +175,7 @@ void initDefaultDevConf() {
     g_defaultDevConf.ytGraphUpdateMethod = YT_GRAPH_UPDATE_METHOD_SCROLL;
 
     // block 7
-    g_defaultDevConf.userSwitchAction = USER_SWITCH_ACTION_ENCODER_STEP;
+    g_defaultDevConf.userSwitchAction = USER_SWITCH_ACTION_INHIBIT;
     g_defaultDevConf.sortFilesOption = SORT_FILES_BY_TIME_DESC;
     g_defaultDevConf.eventQueueFilter = event_queue::EVENT_TYPE_INFO;