Diff: SnConfigFrame.h

Revision:

30:f869ed4bcc08

Parent:

28:484943132bb0

Child:

31:b5bd3b189150

--- a/SnConfigFrame.h	Sat Nov 24 20:23:19 2012 +0000
+++ b/SnConfigFrame.h	Wed Nov 28 01:24:23 2012 +0000
@@ -210,16 +210,18 @@
         { return (fCommSendData<0) && ((fCommSendData & kForceSBDdata)!=0); }
     
     uint8_t GetPowerMode() const { return fPowerMode; }
-    int     GetPowPinSetting(const EPowerModeBit p) const {
-        // return int to correspond to what DigitalOut::operator= expects
-        const bool on = IsPoweredFor(p);
+    int     GetPowPinSetting(const EPowerModeBit p, const bool isOn) const {
         if (p==kCardDatTak || p==kCardComWin ||
             p==kAmpsDatTak || p==kAmpsComWin) {
-            return on ? 0 : 1;
+            return isOn ? 0 : 1;
         } else {
-            return on ? 1 : 0;
+            return isOn ? 1 : 0;
         }
     }
+    int     GetPowPinSetting(const EPowerModeBit p) const {
+        // return int to correspond to what DigitalOut::operator= expects
+        return GetPowPinSetting(p, IsPoweredFor(p));
+    }
     bool   IsPoweredFor(const EPowerModeBit p) const {
         return ((fPowerMode & p)!=0);
     }