Diff: io/DeviceFeedback.cpp

Revision:

93:0acd11870c6a

Parent:

91:423177e8a401

Child:

94:61d44636f020

--- a/io/DeviceFeedback.cpp	Fri Mar 20 14:27:10 2015 +0000
+++ b/io/DeviceFeedback.cpp	Mon Apr 13 14:24:58 2015 +0000
@@ -1,6 +1,6 @@
-#include "DeviceFeedback.h"
 #include <stdlib.h>
 #include <string.h>
+#include "DeviceFeedback.h"
 
 #define MSG_BEEP_SUCCESS 1
 #define MSG_BEEP_FAILURE 2
@@ -8,7 +8,7 @@
 #define MSG_OPEN_RELAY 4
 
 DeviceFeedback::DeviceFeedback() :
-    _speaker(D6),
+//    _speaker(D6),
 //    _thread(DeviceFeedback::thread_func, this),
     shieldLEDRed(D5),
     shieldLEDBlue(D8),
@@ -19,15 +19,15 @@
     shieldLEDGreen = 255;
 }
 
-void DeviceFeedback::beepSuccess()
-{
-    sendMessage(MSG_BEEP_SUCCESS);
-}
-
-void DeviceFeedback::beepFailure()
-{
-    sendMessage(MSG_BEEP_FAILURE);
-}
+//void DeviceFeedback::beepSuccess()
+//{
+//    sendMessage(MSG_BEEP_SUCCESS);
+//}
+//
+//void DeviceFeedback::beepFailure()
+//{
+//    sendMessage(MSG_BEEP_FAILURE);
+//}
 
 void DeviceFeedback::closeRelay()
 {
@@ -45,42 +45,42 @@
 //    sendMessage(MSG_OPEN_RELAY);
 }
 
-void DeviceFeedback::sendMessage(uint8_t msg)
-{
-    uint8_t *msgPtr = _mail.alloc();
-    *msgPtr = msg;
-    _mail.put(msgPtr);
-}
-
-void DeviceFeedback::thread()
-{
-    osEvent evt; uint8_t *msg;
-    bool relayState = false;
+//void DeviceFeedback::sendMessage(uint8_t msg)
+//{
+//    uint8_t *msgPtr = _mail.alloc();
+//    *msgPtr = msg;
+//    _mail.put(msgPtr);
+//}
 
-    while (true) {
-        if ((evt = _mail.get(1000)).status == osEventMail) {
-            msg = (uint8_t*)evt.value.p;
-            switch (*msg) {
-            case MSG_BEEP_SUCCESS:
-                for (float i=2000.0; i<10000.0; i+=2000.0) {
-                    _speaker.period(1.0/i);
-                    _speaker = 0.5;
-                    Thread::wait(200);
-                    _speaker = 0.0;
-                    Thread::wait(50);
-                }
-                break;
-            case MSG_BEEP_FAILURE:
-                for (float i=10000.0; i>2000.0; i-=2000.0) {
-                    _speaker.period(1.0/i);
-                    _speaker = 0.5;
-                    Thread::wait(200);
-                    _speaker = 0.0;
-                    Thread::wait(50);
-                }
-                break;
-            case MSG_CLOSE_RELAY:
-                relayState = true;
+//void DeviceFeedback::thread()
+//{
+//    osEvent evt;
+//    while (true) {
+//        evt = _mail.get();
+//        if (evt.status == osEventMail) {
+//            uint8_t *msg = (uint8_t*)evt.value.p;
+//            uint8_t u = *msg;
+//            _mail.free(msg);
+//            switch (u) {
+//                case MSG_BEEP_SUCCESS:
+//                    for (float i=2000.0; i<10000.0; i+=2000.0) {
+//                        _speaker.period(1.0/i);
+//                        _speaker = 0.5;
+//                        Thread::wait(200);
+//                        _speaker = 0.0;
+//                        Thread::wait(50);
+//                    }
+//                    break;
+//                case MSG_BEEP_FAILURE:
+//                    for (float i=10000.0; i>2000.0; i-=2000.0) {
+//                        _speaker.period(1.0/i);
+//                        _speaker = 0.5;
+//                        Thread::wait(200);
+//                        _speaker = 0.0;
+//                        Thread::wait(50);
+//                    }
+//                    break;
+//                case MSG_CLOSE_RELAY:
 //                if (!relayState) {
 //                    for (float i=2000.0; i<10000.0; i+=100) {
 //                        _speaker.period(1.0/i);
@@ -89,9 +89,8 @@
 //                    }
 //                    _speaker = 0.0;
 //                }
-                break;
-            case MSG_OPEN_RELAY:
-                relayState = false;
+//                    break;
+//                case MSG_OPEN_RELAY:
 //                if (relayState) {
 //                    for (float i=10000.0; i>2000.0; i-=100) {
 //                        _speaker.period(1.0/i);
@@ -100,23 +99,16 @@
 //                    }
 //                    _speaker = 0.0;
 //                }
-                break;
-            }
-            _mail.free(msg);
-        }
+//                    break;
+//            }
+//        }
+//
+//    }
+//}
 
-//        if (relayState) {
-//            _speaker.period(1.0/10000);
-//            _speaker = 0.5;
-//            Thread::wait(20);
-//            _speaker = 0.0;
-//        }
-    }
-}
-
-void DeviceFeedback::thread_func(void const *arg)
-{
-    DeviceFeedback *that;
-    that = (DeviceFeedback*)arg;
-    that->thread();
-}
+//void DeviceFeedback::thread_func(void const *arg)
+//{
+//    DeviceFeedback *that;
+//    that = (DeviceFeedback*)arg;
+//    that->thread();
+//}