Diff: SignalGenDisplay.h

Revision:

6:1f48212fbaf9

Parent:

5:49dd0c647a40

--- a/SignalGenDisplay.h	Mon Jan 16 22:57:59 2017 +0000
+++ b/SignalGenDisplay.h	Sat May 20 19:52:23 2017 +0000
@@ -169,7 +169,7 @@
     /// @param[in] force as true will force it to set the mode, redrawing the screen
     /// @returns true if the value was accepted
     ///
-    bool SetWaveformMode(SG_Mode mode, bool force = false);
+    bool SetWaveformMode(SG_Waveform mode, bool force = false);
     
     /// Operating mode changes
     ///
@@ -226,7 +226,7 @@
         VS_Settings,
     } VisualScreen;
     VisualScreen vis;
-    SG_Mode mode;       ///< signal mode
+    SG_Waveform mode;       ///< signal mode
     float frequency;    ///< selected frequency
     float dutycycle;    ///< selected duty cycle
     float voltage;      ///< selected voltage
@@ -266,8 +266,8 @@
     void DrawNavGadget(void);
     void DrawModeButtons(void);
     void DrawKeypadEnabled(bool enable = false);
-    void DrawButton(rect_t r, bool pressed, SG_Mode mode, bool enable = false, int label=0);
-    void DrawWaveform(rect_t r, SG_Mode mode, color_t color, bool drawPure = false);    // pure ignores, voltage,offset,dutycycle
+    void DrawButton(rect_t r, bool pressed, SG_Waveform mode, bool enable = false, int label=0);
+    void DrawWaveform(rect_t r, SG_Waveform mode, color_t color, bool drawPure = false);    // pure ignores, voltage,offset,dutycycle
     float rangelimit(float value, float minV, float maxV);
     void ShowCyclesControl(void);