encoder step

eez-open · Jan 30, 2020 · 7381d80 · 7381d80
1 parent 1fa920b
commit 7381d80
Show file tree

Hide file tree

Showing 10 changed files with 54 additions and 25 deletions.
diff --git a/modular-psu-firmware.eez-project b/modular-psu-firmware.eez-project
@@ -8585,13 +8585,22 @@
           {
             "type": "ButtonGroup",
             "style": {
-              "inheritFrom": "default_S"
+              "inheritFrom": "default_S",
+              "color": "Action color",
+              "activeBackgroundColor": "Action color"
             },
             "data": "edit_steps",
             "left": 0,
             "top": 32,
             "width": 54,
-            "height": 208
+            "height": 208,
+            "selectedStyle": {
+              "inheritFrom": "default_S",
+              "color": "Background",
+              "backgroundColor": "text_regular",
+              "activeColor": "text_regular",
+              "activeBackgroundColor": "Background"
+            }
           },
           {
             "type": "Select",

diff --git a/src/eez/gui/action_impl.cpp b/src/eez/gui/action_impl.cpp
@@ -1000,8 +1000,14 @@ void action_user_switch_clicked() {
         if (getActivePageId() == PAGE_ID_EDIT_MODE_STEP) {
             psu::gui::edit_mode_step::switchToNextStepIndex();
         } else {
-            mcu::encoder::switchEncoderMode();
-            psu::gui::edit_mode_step::showCurrentEncoderMode();
+            if (g_appContext->getActivePageId() == INTERNAL_PAGE_ID_TOAST_MESSAGE && !((ToastMessagePage *)g_appContext->getActivePage())->hasAction()) {
+                popPage();
+            }
+
+            if (psu::gui::isEncoderEnabledInActivePage()) {
+                mcu::encoder::switchEncoderMode();
+                psu::gui::edit_mode_step::showCurrentEncoderMode();
+            }
         }
 #endif
         break;

diff --git a/src/eez/gui/page.cpp b/src/eez/gui/page.cpp
@@ -189,7 +189,7 @@ ToastMessagePage *ToastMessagePage::create(ToastType type, const char *message,
 }
 
 void ToastMessagePage::onEncoder(int counter) {
-    if (counter < 0) {
+    if (counter < 0 || !hasAction()) {
         popPage();
     }
 }

diff --git a/src/eez/gui/widgets/button_group.cpp b/src/eez/gui/widgets/button_group.cpp
@@ -29,8 +29,7 @@ using namespace eez::mcu;
 namespace eez {
 namespace gui {
 
-void drawButtons(const Widget *widget, int x, int y, const Style *style, int selectedButton,
-                 const data::Value *labels, int count) {
+void drawButtons(const Widget *widget, int x, int y, const Style *style, const Style *selectedStyle, int selectedButton, const data::Value *labels, int count) {
     if (widget->w > widget->h) {
         // horizontal orientation
         display::setColor(style->background_color);
@@ -42,7 +41,7 @@ void drawButtons(const Widget *widget, int x, int y, const Style *style, int sel
         for (int i = 0; i < count; ++i) {
             char text[32];
             labels[i].toText(text, 32);
-            drawText(text, -1, x, y, w, h, style, i == selectedButton, false, false, nullptr, nullptr, nullptr, nullptr);
+            drawText(text, -1, x, y, w, h, i == selectedButton ? selectedStyle : style, false, false, false, nullptr, nullptr, nullptr, nullptr);
             x += w;
         }
     } else {
@@ -71,7 +70,7 @@ void drawButtons(const Widget *widget, int x, int y, const Style *style, int sel
 
             char text[32];
             labels[i].toText(text, 32);
-            drawText(text, -1, x, y + yOffset, w, labelHeight, style, i == selectedButton, false, false, nullptr, nullptr, nullptr, nullptr);
+            drawText(text, -1, x, y + yOffset, w, labelHeight, i == selectedButton ? selectedStyle: style, false, false, false, nullptr, nullptr, nullptr, nullptr);
 
             int b = y + yOffset + labelHeight;
 
@@ -92,6 +91,7 @@ void drawButtons(const Widget *widget, int x, int y, const Style *style, int sel
 
 void ButtonGroupWidget_draw(const WidgetCursor &widgetCursor) {
     const Widget *widget = widgetCursor.widget;
+    const ButtonGroupWidget *buttonGroupWidget = GET_WIDGET_PROPERTY(widget, specific, const ButtonGroupWidget *);
 
     widgetCursor.currentState->size = sizeof(ButtonGroupWidgetState);
     widgetCursor.currentState->data = data::get(widgetCursor.cursor, widget->data);
@@ -111,7 +111,8 @@ void ButtonGroupWidget_draw(const WidgetCursor &widgetCursor) {
 
     if (refresh) {
         const Style* style = getStyle(widget->style);
-        drawButtons(widget, widgetCursor.x, widgetCursor.y, style,
+        const Style* selectedStyle = getStyle(buttonGroupWidget->selectedStyle);
+        drawButtons(widget, widgetCursor.x, widgetCursor.y, style, selectedStyle,
                     widgetCursor.currentState->data.getInt(), labels, count);
     }
 }

diff --git a/src/eez/gui/widgets/button_group.h b/src/eez/gui/widgets/button_group.h
@@ -21,6 +21,10 @@
 namespace eez {
 namespace gui {
 
+struct ButtonGroupWidget {
+    uint16_t selectedStyle;
+};
+
 struct ButtonGroupWidgetState {
     WidgetState genericState;
     const data::Value *labels;

diff --git a/src/eez/modules/mcu/encoder.cpp b/src/eez/modules/mcu/encoder.cpp
@@ -192,7 +192,7 @@ void write(int counter, bool clicked) {
 #endif
 
 void switchEncoderMode() {
-    if (g_encoderMode == ENCODER_MODE_STEP5) {
+    if (g_encoderMode == ENCODER_MODE_STEP4) {
         g_encoderMode = ENCODER_MODE_AUTO;
     } else {
         g_encoderMode = EncoderMode(g_encoderMode + 1);

diff --git a/src/eez/modules/mcu/encoder.h b/src/eez/modules/mcu/encoder.h
@@ -35,8 +35,7 @@ enum EncoderMode {
     ENCODER_MODE_STEP1,
     ENCODER_MODE_STEP2,
     ENCODER_MODE_STEP3,
-    ENCODER_MODE_STEP4,
-    ENCODER_MODE_STEP5
+    ENCODER_MODE_STEP4
 };
 
 extern EncoderMode g_encoderMode;

diff --git a/src/eez/modules/psu/gui/edit_mode_step.cpp b/src/eez/modules/psu/gui/edit_mode_step.cpp
@@ -44,56 +44,56 @@ namespace edit_mode_step {
 
 using data::Value;
 
-#define NUM_UNITS 6
+#define NUM_UNITS 7
 
 static const Value CONF_GUI_UNIT_STEPS_LIST[NUM_UNITS][NUM_STEPS_PER_UNIT] = {
     { 
-        Value(5.0f, UNIT_VOLT), 
         Value(2.0f, UNIT_VOLT), 
         Value(1.0f, UNIT_VOLT), 
         Value(0.5f, UNIT_VOLT), 
         Value(0.1f, UNIT_VOLT) 
     },
     { 
-        Value(0.5f, UNIT_AMPER), 
         Value(0.25f, UNIT_AMPER), 
         Value(0.1f, UNIT_AMPER), 
         Value(0.05f, UNIT_AMPER), 
         Value(0.01f, UNIT_AMPER) 
     },
     { 
-        Value(0.005f, UNIT_AMPER), 
         Value(0.0025f, UNIT_AMPER), 
         Value(0.001f, UNIT_AMPER), 
         Value(0.0005f, UNIT_AMPER), 
         Value(0.0001f, UNIT_AMPER) 
     },
     { 
-        Value(10.0f, UNIT_WATT), 
         Value(5.0f, UNIT_WATT), 
         Value(2.0f, UNIT_WATT), 
         Value(1.0f, UNIT_WATT), 
         Value(0.5f, UNIT_WATT) 
     },
     { 
-        Value(20.0f, UNIT_CELSIUS), 
         Value(10.0f, UNIT_CELSIUS), 
         Value(5.0f, UNIT_CELSIUS), 
         Value(2.0f, UNIT_CELSIUS), 
         Value(1.0f, UNIT_CELSIUS) 
     },
     { 
-        Value(30.0f, UNIT_SECOND), 
         Value(20.0f, UNIT_SECOND), 
         Value(10.0f, UNIT_SECOND), 
         Value(5.0f, UNIT_SECOND), 
         Value(1.0f, UNIT_SECOND) 
     },
+    { 
+        Value(0.2f, UNIT_AMPER), 
+        Value(0.1f, UNIT_AMPER), 
+        Value(0.04f, UNIT_AMPER), 
+        Value(0.02f, UNIT_AMPER) 
+    }
 };
 
 static int g_stepIndexes[NUM_UNITS][CH_MAX];
 
-static const int DEFAULT_INDEX = 2;
+static const int DEFAULT_INDEX = 1;
 
 static bool g_changed;
 static int g_startPos;
@@ -104,9 +104,18 @@ int getUnitStepValuesIndex(Unit unit) {
     } 
 
     if (unit == UNIT_AMPER) {
-        if (Channel::get(g_focusCursor.i).flags.currentRangeSelectionMode == CURRENT_RANGE_SELECTION_ALWAYS_LOW) {
+        Channel &channel = Channel::get(g_focusCursor.i);
+        if (channel.flags.currentRangeSelectionMode == CURRENT_RANGE_SELECTION_ALWAYS_LOW) {
             return 2;
         }
+
+        // DCM220
+        int slotIndex = Channel::get(channel.channelIndex).slotIndex;
+        auto &slot = g_slots[slotIndex];
+        if (slot.moduleInfo->moduleType == MODULE_TYPE_DCM220) {
+            return 6;
+        }
+
         return 1;
     } 
 
@@ -228,7 +237,7 @@ Value getCurrentEncoderStepValue() {
     if (!data::getEncoderStepValues(g_focusCursor, g_focusDataId, stepValues)) {
         getUnitStepValues(getCurrentEncoderUnit(), stepValues);
     }
-    int stepValueIndex = mcu::encoder::ENCODER_MODE_STEP5 - mcu::encoder::g_encoderMode;
+    int stepValueIndex = mcu::encoder::ENCODER_MODE_STEP4 - mcu::encoder::g_encoderMode;
     if (stepValueIndex >= stepValues.count) {
         stepValueIndex = stepValues.count - 1;
     }

diff --git a/src/eez/modules/psu/gui/edit_mode_step.h b/src/eez/modules/psu/gui/edit_mode_step.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#define NUM_STEPS_PER_UNIT 5
+#define NUM_STEPS_PER_UNIT 4
 
 namespace eez {
 namespace psu {
@@ -28,7 +28,6 @@ namespace edit_mode_step {
 int getStepIndex();
 
 void getStepValues(eez::gui::data::StepValues &stepValues);
-void getUnitStepValues(Unit unit, eez::gui::data::StepValues &stepValues);
 
 void setStepIndex(int value);
 

diff --git a/src/eez/modules/psu/gui/psu.h b/src/eez/modules/psu/gui/psu.h
@@ -60,6 +60,8 @@ Unit getCurrentEncoderUnit();
 
 float encoderIncrement(data::Value value, int counter, float min, float max, int channelIndex, float precision = 1.0f);
 
+bool isEncoderEnabledInActivePage();
+
 class PsuAppContext : public AppContext {
 public:
     PsuAppContext();