Diff: io/DeviceFeedback.cpp

Revision:

90:423177e8a401

Parent:

78:bf32dfe6c47f

Child:

92:0acd11870c6a

--- a/io/DeviceFeedback.cpp	Mon Mar 16 12:12:04 2015 +0000
+++ b/io/DeviceFeedback.cpp	Fri Mar 20 13:55:21 2015 +0000
@@ -7,9 +7,9 @@
 #define MSG_CLOSE_RELAY 3
 #define MSG_OPEN_RELAY 4
 
-DeviceFeedback::DeviceFeedback(PwmOut speaker) :
-    _speaker(speaker),
-    _thread(DeviceFeedback::thread_func, this),
+DeviceFeedback::DeviceFeedback() :
+    _speaker(D6),
+//    _thread(DeviceFeedback::thread_func, this),
     shieldLEDRed(D5),
     shieldLEDBlue(D8),
     shieldLEDGreen(D9)
@@ -34,7 +34,7 @@
     shieldLEDRed = 255;
     shieldLEDBlue = 255;
     shieldLEDGreen = 0;
-    sendMessage(MSG_CLOSE_RELAY);
+//    sendMessage(MSG_CLOSE_RELAY);
 }
 
 void DeviceFeedback::openRelay()
@@ -42,7 +42,7 @@
     shieldLEDRed = 255;
     shieldLEDBlue = 255;
     shieldLEDGreen = 255;
-    sendMessage(MSG_OPEN_RELAY);
+//    sendMessage(MSG_OPEN_RELAY);
 }
 
 void DeviceFeedback::sendMessage(uint8_t msg)
@@ -80,26 +80,26 @@
                 }
                 break;
             case MSG_CLOSE_RELAY:
-                if (!relayState) {
-                    relayState = true;
+                relayState = true;
+//                if (!relayState) {
 //                    for (float i=2000.0; i<10000.0; i+=100) {
 //                        _speaker.period(1.0/i);
 //                        _speaker = 0.5;
 //                        Thread::wait(20);
 //                    }
 //                    _speaker = 0.0;
-                }
+//                }
                 break;
             case MSG_OPEN_RELAY:
-                if (relayState) {
-                    relayState = false;
+                relayState = false;
+//                if (relayState) {
 //                    for (float i=10000.0; i>2000.0; i-=100) {
 //                        _speaker.period(1.0/i);
 //                        _speaker = 0.5;
 //                        Thread::wait(20);
 //                    }
 //                    _speaker = 0.0;
-                }
+//                }
                 break;
             }
             _mail.free(msg);