Add rotary button to change fps in Sono

logic/include/model/ButtonHelper.h

@@ -23,6 +23,29 @@ public: \
     } \
     Q_SIGNAL void SMALL_NAME ## LedChanged(char value)
 
+/*************************************************************************************************/
+#define PUSH_BUTTON_FPS(CAPITAL_NAME, SMALL_NAME) \
+private:    \
+    PushButton _ ## SMALL_NAME{0x00}; \
+    void init ## CAPITAL_NAME()    \
+    {   \
+        connect(this, &Console::dataReady, _ ## SMALL_NAME.getLed(), &Led::newData); \
+        connect(_ ## SMALL_NAME.getLed(), SIGNAL(ledChanged(char)), this, \
+                SIGNAL(SMALL_NAME ## LedChanged(char))); \
+    } \
+public: \
+    void press ## CAPITAL_NAME()    \
+    {   \
+        auto arr = _ ## SMALL_NAME.press(); \
+        _dataSender->send(arr); \
+    } \
+    void release ## CAPITAL_NAME()  \
+    {     \
+        auto arr = _ ## SMALL_NAME.release(); \
+        _dataSender->send(arr); \
+    } \
+    Q_SIGNAL void SMALL_NAME ## LedChanged(char value)
+
 /*************************************************************************************************/
 #define PUSH_BUTTON_PROBE_SLOT(CAPITAL_NAME, SMALL_NAME, SLOT_NUMBER) \
 private:    \
@@ -107,4 +130,23 @@ public: \
     } \
     Q_SIGNAL void SMALL_NAME ## LedChanged(char value)
 
+/*************************************************************************************************/
+#define ROTARY_BUTTON_FPS(CAPITAL_NAME, SMALL_NAME) \
+private:    \
+    RotaryButton _ ## SMALL_NAME{0x00}; \
+    void init ## CAPITAL_NAME()    \
+    {   \
+        connect(this, &Console::dataReady, _ ## SMALL_NAME.getLed(), &Led::newData); \
+        connect(_ ## SMALL_NAME.getLed(), SIGNAL(ledChanged(char)), this, \
+                SIGNAL(SMALL_NAME ## LedChanged(char))); \
+    } \
+public: \
+    void rotate ## CAPITAL_NAME(int value)    \
+    {   \
+        auto arr = _ ## SMALL_NAME.rotate(value); \
+        arr[7] = 0x01; \
+        _dataSender->sendProbeSlots(arr); \
+    } \
+    Q_SIGNAL void SMALL_NAME ## LedChanged(char value)
+
 #endif //BUTTONHELPER_H

logic/include/model/Console.h

@@ -65,7 +65,8 @@ class Console : public QObject
 	PUSH_BUTTON(ModeCCenter, modeCCenter, MODE_C_CENTER_FC, static_cast<char>(MODE_C_LED_FC));
 	PUSH_BUTTON(ModeBCenter, modeBCenter, MODE_2D_CENTER_FC, static_cast<char>(MODE_2D_LED_FC));
 	PUSH_BUTTON(DepthBottom, depthBottom, DEPTH_BOTTOM_FC, static_cast<char>(DEPTH_LED_FC));
-	PUSH_BUTTON(FocusBottom, focusBottom, FOCUS_BOTTOM_FC, static_cast<char>(FOCUS_DEPTH_LED_FC));
+    PUSH_BUTTON(FocusBottom, focusBottom, FOCUS_BOTTOM_FC, static_cast<char>(FOCUS_DEPTH_LED_FC));
+    PUSH_BUTTON_FPS(FrameRateCenter, frameRateCenter);
 
 	//PushButton with No LED
 	PUSH_BUTTON_NO_LED(Js1Top, js1Top, JOYSTICK1_TOP_FC);
@@ -109,6 +110,7 @@ class Console : public QObject
 	ROTARY_BUTTON_NO_LED(Js5, js5, JOYSTICK5_FC);
 	ROTARY_BUTTON_NO_LED(Depth, depth, DEPTH_FC);
 	ROTARY_BUTTON_NO_LED(ModePw, modePw, MODE_PW_FC);
+    ROTARY_BUTTON_FPS(FrameRate, frameRate);
 
 private:
 	DataSender* _dataSender;

logic/include/viewModel/MainViewModel.h

@@ -109,6 +109,10 @@ class MainViewModel : public QtMvvm::ViewModel
 	JOYSTICK_PROPERTY(modeM, ModeM)
 	JOYSTICK_PROPERTY(modeB, ModeB)
 
+    LED_PROPERTY(frameRateCenter, LED_OFF) //modeB -> modeBCenterLed
+    BUTTON_PROPERTY(frameRateCenter, FrameRateCenter, false)
+    JOYSTICK_PROPERTY(frameRate, FrameRate)
+
 	//JoystickCouple
     LED_PROPERTY(depthCenter, LED_OFF) //zoom -> depthCenterLed
     LED_PROPERTY(depthBottom, LED_OFF) //depth -> depthBottomLed
@@ -235,6 +239,8 @@ public slots:
 	LED_SLOT(focusCenter)
 	LED_SLOT(depthBottom)
 	LED_SLOT(focusBottom)
+
+    LED_SLOT(frameRateCenter)
 //uncrustify on
 };
 

logic/src/model/Console.cpp

@@ -163,4 +163,6 @@ void Console::initializeButtons()
     initModePd();
     initModeC();
     initModeB();
+
+    initFrameRate();
 }

ui/emulator/Emulator.qml

@@ -4,36 +4,56 @@ import QtGraphicalEffects 1.13
 import "qrc:/emulator/items"
 import "qrc:/theme"
 import "qrc:/const"
+import "qrc:/emulator/elements"
+
 
 Item {
-	width: Const.windowWidth
+    width: Const.windowWidth
-	height: Const.windowHeight
+    height: Const.windowHeight
-
+
-	Setting {
+    Setting {
-		anchors.horizontalCenter: topLeft.horizontalCenter
+        anchors.horizontalCenter: topLeft.horizontalCenter
-		anchors.top: topLeft.bottom
+        anchors.top: topLeft.bottom
-		anchors.topMargin: 120
+        anchors.topMargin: 120
-	}
+    }
     TopLeftTop {
 
     }
 
-	TopLeft {
+    TopLeft {
-		id: topLeft
+        id: topLeft
-	}
+    }
 
-	TopRight {}
+    TopRight {}
 
-	BottomRight {}
+    BottomRight {}
 
-	CurveButtons {}
+    CurveButtons {}
 
-	Joysticks {}
+    Joysticks {}
 
-	Encoders {}
+    Encoders {}
 
-	JoystickCouple {}
+    JoystickCouple {}
 
-	TrackballGroup {}
+    TrackballGroup {}
 
+
+    ModeButtonBind {
+        id: frameRate
+        anchors.right: parent.right
+        anchors.bottom: parent.bottom
+        anchors.bottomMargin:  20
+        anchors.rightMargin: 30
+
+        name: "frameRate"
+        nameLed: "frameRateLed"
+        nameIncrease: "frameRateRight"
+        nameDecrease: "frameRateLeft"
+        image: ""
+        Text {
+            anchors.centerIn: parent
+            text: "FPS"
+        }
+    }
 }