Log In
New Account
  
Home My Page Project Cloud Code Snippets Project Openings Pierogi
Summary Forums Tracker Lists Tasks Docs News SCM Files
index c70b040..09569f5 100644 (file)
@@ -3,10 +3,12 @@
 
 #include "pirkeynames.h"
 #include "pirmakenames.h"
-#include "pirdevicetypenames.h"
+//#include "pirdevicetypenames.h"
+
+#include "pirdeviceinfo.h"
 
 #include <map>
-#include <list>
+//#include <list>
 
 class QThread;
 class QObject;
@@ -16,24 +18,6 @@ class PIRProtocol;
 
 typedef std::map<PIRKeyName, const char *> KeyCollection;
 
-class DeviceInfo
-{
-public:
-  DeviceInfo(
-    PIRMakeName ma,
-    const char *mo,
-    PIRDeviceTypeName t)
-  : make(ma),
-    model(mo),
-    type(t)
-  {}
-
-  PIRMakeName make;
-  const char *model;
-  PIRDeviceTypeName type;
-};
-
-typedef std::list<DeviceInfo> PIRDeviceCollection;
 
 class PIRKeysetMetaData
 {
@@ -43,6 +27,8 @@ public:
     PIRMakeName make,
     unsigned int index);
 
+  ~PIRKeysetMetaData();
+
   bool hasKey(
     PIRKeyName name) const;
 
@@ -52,15 +38,26 @@ public:
 
   const char *getKeysetName() const;
 
+  unsigned int getCarrierFrequency() const;
+
+  void setCarrierFrequency(
+    unsigned int carrierFrequency);
+
+  unsigned int getDutyCycle() const;
+
+  void setDutyCycle(
+    unsigned int dutyCycle);
+
   virtual void populateProtocol(
     QObject *guiObject) = 0;
 
+  bool clearProtocol();
+
   void moveToThread(
     QThread *thread);
 
-  void populateDevices(
-    unsigned int id,
-    PIRSelectDeviceForm *sdf) const;
+  static void populateDevices(
+    PIRSelectDeviceForm *sdf);
 
 protected:
   void addControlledDevice(
@@ -110,6 +107,12 @@ protected:
     unsigned int addressData,
     unsigned int commandData);
 
+  void addPanOldKey(
+    const char *name,
+    PIRKeyName key,
+    unsigned int addressData,
+    unsigned int commandData);
+
   void addPioneerKey(
     const char *name,
     PIRKeyName key,
@@ -138,6 +141,12 @@ protected:
     unsigned int firstCommand,
     unsigned int secondCommand);
 
+  void addXMPKey(
+    const char *name,
+    PIRKeyName key,
+    unsigned int firstCommand,
+    unsigned int secondCommand);
+
   void setPreData(
     unsigned long data,
     unsigned int bits);
@@ -151,15 +160,14 @@ protected:
 
   KeyCollection keys;
 
-  PIRDeviceCollection controlledDevices;
-
   PIRProtocol *threadableProtocol;
   unsigned int index;
 
 private:
   const char *keysetName;
   PIRMakeName make;
-  PIRDeviceTypeCollection deviceTypes;
+  static PIRDeviceCollection controlledDevices;
+//  PIRDeviceTypeCollection deviceTypes;
 };
 
 

Terms of Use    Privacy Policy    Contribution Guidelines    Feedback

Powered By GForge Collaborative Development Environment