fixed shift reg clk

FreeJoy-Team · Jan 29, 2022 · 3741354 · 3741354
1 parent 557f04c
commit 3741354
Show file tree

Hide file tree

Showing 8 changed files with 242 additions and 181 deletions.
diff --git a/src/version.h b/src/version.h
@@ -4,7 +4,7 @@
 #define MAJOR_VERSION 1
 #define MINOR_VERSION 7
 #define PATCH_VERSION 1
-#define BUILD_VERSION 1
+#define BUILD_VERSION 2
 
 #ifdef INNO_SETUP
 	#define APP_VERSION Str(MAJOR_VERSION) + "." + Str(MINOR_VERSION) + "." + Str(PATCH_VERSION) + "." + "b" + Str(BUILD_VERSION)

diff --git a/src/widgets/pins/pinconfig.cpp b/src/widgets/pins/pinconfig.cpp
@@ -17,8 +17,7 @@ PinConfig::PinConfig(QWidget *parent) :         // пины - первое, чт
     m_contrLite->hide();
 
     m_maxButtonsWarning = false;
-    m_shiftLatchCount = 0;
-    m_shiftDataCount = 0;
+    m_shiftLatchCount = m_shiftDataCount = m_shiftClkCount = 0;
 
     // create pin combo box. i+1! start from 1
     // возможно использовать одни и те же комбобоксы пинов в разных виджетах плат - изврат,
@@ -173,18 +172,26 @@ void PinConfig::signalsForWidgets(int currentDeviceEnum, int previousDeviceEnum,
     // shift register latch selected
     if (currentDeviceEnum == SHIFT_REG_LATCH){
         m_shiftLatchCount++;
-        emit shiftRegSelected(pinNumber, 0, m_pinCBoxPtrList[0]->pinList()[pinIndex].guiName);    // hz
+        emit shiftRegSelected(pinNumber, 0, 0, m_pinCBoxPtrList[0]->pinList()[pinIndex].guiName);    // hz
     } else if (previousDeviceEnum == SHIFT_REG_LATCH){
         m_shiftLatchCount--;
-        emit shiftRegSelected((pinNumber)*-1, 0, m_pinCBoxPtrList[0]->pinList()[pinIndex].guiName);    // hz
+        emit shiftRegSelected((pinNumber)*-1, 0, 0, m_pinCBoxPtrList[0]->pinList()[pinIndex].guiName);    // hz
+    }
+    // shift register CLK selected
+    if (currentDeviceEnum == SHIFT_REG_CLK){
+        m_shiftClkCount++;
+        emit shiftRegSelected(0, pinNumber, 0, m_pinCBoxPtrList[0]->pinList()[pinIndex].guiName);    // hz
+    } else if (previousDeviceEnum == SHIFT_REG_CLK){
+        m_shiftClkCount--;
+        emit shiftRegSelected(0, (pinNumber)*-1, 0, m_pinCBoxPtrList[0]->pinList()[pinIndex].guiName);    // hz
     }
     // shift register data selected
     if (currentDeviceEnum == SHIFT_REG_DATA){
         m_shiftDataCount++;
-        emit shiftRegSelected(0, pinNumber, m_pinCBoxPtrList[0]->pinList()[pinIndex].guiName);    // hz
+        emit shiftRegSelected(0, 0, pinNumber, m_pinCBoxPtrList[0]->pinList()[pinIndex].guiName);    // hz
     } else if (previousDeviceEnum == SHIFT_REG_DATA){
         m_shiftDataCount--;
-        emit shiftRegSelected(0, (pinNumber)*-1, m_pinCBoxPtrList[0]->pinList()[pinIndex].guiName);    // hz
+        emit shiftRegSelected(0, 0, (pinNumber)*-1, m_pinCBoxPtrList[0]->pinList()[pinIndex].guiName);    // hz
     }
     // I2C selected
     if (currentDeviceEnum == I2C_SCL){// || current_device_enum == I2C_SDA){

diff --git a/src/widgets/pins/pinconfig.h b/src/widgets/pins/pinconfig.h
@@ -13,7 +13,7 @@ class QGridLayout;
 QT_END_NAMESPACE
 
 #define SOURCE_COUNT 8
-#define PIN_TYPE_LIMIT_COUNT 2
+#define PIN_TYPE_LIMIT_COUNT 3
 
 namespace Ui {
 class PinConfig;
@@ -37,7 +37,7 @@ class PinConfig : public QWidget
     void totalButtonsValueChanged(int count);
     void totalLEDsValueChanged(int totalLed);
     void fastEncoderSelected(const QString &pinGuiName, bool isSelected);
-    void shiftRegSelected(int latchPin, int dataPin, const QString &pinGuiName);
+    void shiftRegSelected(int latchPin, int clkPin, int dataPin, const QString &pinGuiName);
     void i2cSelected(bool i2cSelected);
     void axesSourceChanged(int sourceEnum, const QString &sourceName, bool isAdd);
 
@@ -67,6 +67,7 @@ private slots:
 
     int m_shiftLatchCount;
     int m_shiftDataCount;
+    int m_shiftClkCount;
 
     void signalsForWidgets(int currentDeviceEnum, int previousDeviceEnum, int pinNumber, QString pinName);
     void pinTypeLimit(int currentDeviceEnum, int previousDeviceEnum);
@@ -104,6 +105,7 @@ private slots:
     {
         {SHIFT_REG_LATCH,        4},
         {SHIFT_REG_DATA,         4},
+        {SHIFT_REG_CLK,          4},
     };
 
     enum        // and in current config

diff --git a/src/widgets/shift-reg/shiftregisters.cpp b/src/widgets/shift-reg/shiftregisters.cpp
@@ -24,6 +24,7 @@ ShiftRegisters::ShiftRegisters(int shiftRegNumber, QWidget *parent)
     for (int i = 0; i < SHIFT_REG_TYPES; ++i) {
         ui->comboBox_ShiftRegType->addItem(m_shiftRegistersList[i].guiName);
         ui->label_DataPin->setText(m_notDefined);
+        ui->label_ClkPin->setText(m_notDefined);
         ui->label_LatchPin->setText(m_notDefined);
     }
 
@@ -62,6 +63,18 @@ void ShiftRegisters::setLatchPin(int latchPin, QString pinGuiName)
     setUiOnOff();
 }
 
+void ShiftRegisters::setClkPin(int clkPin, QString pinGuiName)
+{
+    if (clkPin != 0) {
+        m_clkPin = clkPin;
+        ui->label_ClkPin->setText(pinGuiName);
+    } else {
+        m_clkPin = 0;
+        ui->label_ClkPin->setText(m_notDefined);
+    }
+    setUiOnOff();
+}
+
 void ShiftRegisters::setDataPin(int dataPin, QString pinGuiName)
 {
     if (dataPin != 0) {
@@ -76,7 +89,7 @@ void ShiftRegisters::setDataPin(int dataPin, QString pinGuiName)
 
 void ShiftRegisters::setUiOnOff()
 {
-    if (m_latchPin > 0 && m_dataPin > 0) {
+    if (m_latchPin > 0 && m_clkPin > 0 && m_dataPin > 0) {
         for (auto &&child : this->findChildren<QWidget *>()) {
             child->setEnabled(true);
         }

diff --git a/src/widgets/shift-reg/shiftregisters.h b/src/widgets/shift-reg/shiftregisters.h
@@ -26,6 +26,7 @@ class ShiftRegisters : public QWidget
     void retranslateUi();
 
     void setLatchPin(int latchPin, QString pinGuiName);
+    void setClkPin(int clkPin, QString pinGuiName);
     void setDataPin(int dataPin, QString pinGuiName);
 
     const QString &defaultText() const;
@@ -44,6 +45,7 @@ private slots:
     int m_buttonsCount;
     int m_shiftRegNumber;
     int m_latchPin;
+    int m_clkPin;
     int m_dataPin;
 
     const deviceEnum_guiName_t m_shiftRegistersList[SHIFT_REG_TYPES] = // порядов обязан быть как в common_types.h!!!!!!!!!!!