Diff: action.hpp

Revision:

6:ea8136eb6976

Parent:

4:f009306756b3

Child:

7:dba9221acf48

--- a/action.hpp	Wed Jun 19 16:12:11 2013 +0000
+++ b/action.hpp	Thu Jun 20 03:04:36 2013 +0000
@@ -14,14 +14,17 @@
            bool _state = false,
            DigitalOut *_out = 0,
            char const *_outName = 0)
-        : actionTime(_time), desiredState(_state)
-        , output(_out) {
+        : actionTime(_time)
+        , output(_out)
+        , desiredState(_state)
+        , code('.') {
+        if (_outName) code = _outName[0];
     }
 
     bool operator < (Action const &other) const {
         return actionTime < other.actionTime;
     }
-    
+
     // return <0 if *p1 is before *p2
     static int compare(const void* p1, const void* p2) {
         return static_cast<Action const *>(p1)->actionTime - static_cast<Action const *>(p2)->actionTime;
@@ -41,15 +44,18 @@
             return true;
         } else return false;
     }
-    void set(float _time, int _state, DigitalOut* _out) {
+
+    void set(float _time, int _state, DigitalOut* _out, char _code = '.') {
         actionTime = _time;
         desiredState = _state;
         output = _out;
+        code = _code;
     }
 
     float actionTime;
-    int desiredState;
     DigitalOut *output;
+    uint8_t desiredState;
+    char code;
 };
 
 #endif