Changeset 830

Timestamp:

01/10/08 13:11:59 (16 years ago)

Author:

ppalmers

Message:

add some extra control elements

Files:

• branches/api-cleanup/src/bebob/focusrite/focusrite_saffirepro.cpp (modified) (5 diffs)
• branches/api-cleanup/src/bebob/focusrite/focusrite_saffirepro.h (modified) (3 diffs)

branches/api-cleanup/src/bebob/focusrite/focusrite_saffirepro.cpp

@@ -231 +231 @@
-            "UseHighVoltageRail", "Use High Supply", "Prefer the high voltage power supply rail"));
-
+    result &= m_ControlContainer->addElement(
+        new SaffireProMultiControl(*this, SaffireProMultiControl::eTCT_ExitStandalone,
+            "ExitStandalone", "Exit Standalone mode", "Try to leave standalonbe mode"));
+
+    result &= m_ControlContainer->addElement(
+        new SaffireProMultiControl(*this, SaffireProMultiControl::eTCT_PllLockRange,
+            "PllLockRange", "PLL Lock Range", "Get/Set PLL Lock range"));
+
-    if (!result) {
-        debugWarning("One or more device control elements could not be created.");
@@ -484 +492 @@
-
-void
+SaffireProDevice::exitStandalone() {
+    debugOutput( DEBUG_LEVEL_VERBOSE, "exit standalone mode...\n" );
+    if ( !setSpecificValue(FR_SAFFIREPRO_CMD_ID_EXIT_STANDALONE, 
+                           FR_SAFFIREPRO_CMD_EXIT_STANDALONE_CODE ) ) {
+        debugError( "setSpecificValue failed\n" );
+    }
+}
+
+void
-SaffireProDevice::flashLed() {
-    int ledFlashDuration=2;
@@ -570 +587 @@
-}
-
+void
+SaffireProDevice::setPllLockRange(unsigned int i) {
+    uint32_t reg=i;
+    debugOutput( DEBUG_LEVEL_VERBOSE, "set PLL lock range: %d ...\n", i );
+
+    if ( !setSpecificValue(FR_SAFFIREPRO_CMD_ID_PLL_LOCK_RANGE, 
+                           reg ) ) {
+        debugError( "setSpecificValue failed\n" );
+    }
+}
+
+unsigned int
+SaffireProDevice::getPllLockRange() {
+    uint32_t retval;
+    if ( !getSpecificValue(FR_SAFFIREPRO_CMD_ID_PLL_LOCK_RANGE, &retval ) ) {
+        debugError( "getSpecificValue failed\n" );
+        return false;
+    }
+
+    debugOutput( DEBUG_LEVEL_VERBOSE,
+                     "PLL lock range: %d\n", retval );
+    return retval;
+}
+
-// swiss army knife control element
-Trigger
+Multi
-: Control::Discrete()
-, m_Parent(parent)
-, m_type ( t )
-{}
-Trigger
+Multi
-                std::string name, std::string label, std::string descr)
-: Control::Discrete()
@@ -594 +635 @@
-        case eTCT_FlashLed: m_Parent.flashLed(); return true;
-        case eTCT_UseHighVoltageRail: m_Parent.useHighVoltageRail(v); return true;
+        case eTCT_ExitStandalone: m_Parent.exitStandalone(); return true;
+        case eTCT_PllLockRange: m_Parent.setPllLockRange(v); return true;
-    }
-    return false;
@@ -605 +648 @@
-        case eTCT_FlashLed: return 0;
-        case eTCT_UseHighVoltageRail: return m_Parent.usingHighVoltageRail();
+        case eTCT_ExitStandalone: return 0;
+        case eTCT_PllLockRange: return m_Parent.getPllLockRange();
-    }
-    return -1;

branches/api-cleanup/src/bebob/focusrite/focusrite_saffirepro.h

@@ -254 +254 @@
-{
-public:
-Trigger
+Multi
-        eTCT_Reboot,
-        eTCT_FlashLed,
-        eTCT_UseHighVoltageRail,
+        eTCT_ExitStandalone,
+        eTCT_PllLockRange,
-    };
-
-public:
-Trigger
-Trigger
+Multi
+Multi
-                  std::string name, std::string label, std::string descr);
-
@@ -270 +272 @@
-private:
-    SaffireProDevice&          m_Parent;
-Trigger
+Multi
-};
-
@@ -320 +322 @@
-    bool isExtClockLocked();
-    uint32_t getCount32();
+    void exitStandalone();
-
-    void useHighVoltageRail(bool useIt);
-    bool usingHighVoltageRail();
+    unsigned int getPllLockRange();
+    void setPllLockRange(unsigned int);
+
-private:
-    virtual bool setSamplingFrequencyDo( uint32_t );