Diff: main.cpp

Revision:

4:0fb159501a04

Parent:

3:23fae3efa1c0

Child:

5:5654666925e1

diff -r 23fae3efa1c0 -r 0fb159501a04 main.cpp
--- a/main.cpp	Thu May 19 07:42:49 2016 +0000
+++ b/main.cpp	Thu May 19 11:53:35 2016 +0000
@@ -21,7 +21,7 @@
 // https://developer.mbed.org/users/mbed_official/code/mbed/docs/252557024ec3/classmbed_1_1RawSerial.html
 RawSerial pc(PA_2,NC);
 //RawSerial pc(USBTX,USBRX);
-DigitalIn reed_gpio(REED_PORT);
+//DigitalIn reed_gpio(REED_PORT);
 
 
 
@@ -40,7 +40,7 @@
     
     change = reed_has_changed;
     reed_has_changed = 0;
-    reed_gpio_value = reed_gpio.read();
+    //reed_gpio_value = reed_gpio.read();
 
     return(change);
 }
@@ -60,7 +60,7 @@
 
 void send_reed(void) {
     
-    reed_value_last_sent = reed_gpio.read();
+    //reed_value_last_sent = reed_gpio.read();
     
     pc.printf("%d: Sending REED = %d\r\n",time(NULL),reed_value_last_sent);
     
@@ -83,29 +83,26 @@
     pc.printf(        "* Build: " __DATE__ ", " __TIME__" *\r\n");
     pc.printf(        "********************************\r\n\r\n");
 
-    reed_gpio.mode(PullUp);
+    //reed_gpio.mode(PullUp);
 
     for(int i=0;i<10;i++) {
-        pc.printf("before mdot: %d (%d)\r\n",reed_gpio.read(),reed_has_changed);
+        //pc.printf("after int %d (%d)\r\n",reed_gpio.read(),reed_has_changed);
+        pc.printf("after int %d\r\n",reed_has_changed);
         Thread::wait(1000);
     }
         
     dot = mDot::getInstance();
     dot->setLogLevel(MTSLog::TRACE_LEVEL);
 
-    for(int i=0;i<10;i++) {
-        pc.printf("after mdot %d (%d)\r\n",reed_gpio.read(),reed_has_changed);
-        Thread::wait(1000);
-    }
-    
     InterruptIn *reed_sensor_change;
-    reed_sensor_change = new InterruptIn(REED_PORT);
+    reed_sensor_change = new InterruptIn(PA_0);
     reed_sensor_change->fall(&isr_reed_sensor_change);
     reed_sensor_change->rise(&isr_reed_sensor_change);
     reed_sensor_change->mode(PullUp);
      
     for(int i=0;i<10;i++) {
-        pc.printf("after int %d (%d)\r\n",reed_gpio.read(),reed_has_changed);
+        //pc.printf("after int %d (%d)\r\n",reed_gpio.read(),reed_has_changed);
+        pc.printf("after int %d\r\n",reed_has_changed);
         Thread::wait(1000);
     }
         
@@ -164,7 +161,7 @@
         
         Thread::wait(10);
         
-        dot->sleep(sleep_time, mDot::RTC_ALARM_OR_INTERRUPT, true);
+        dot->sleep(sleep_time, mDot::RTC_ALARM_OR_INTERRUPT, false);
         
         pc.printf("%d: Woke up\r\n",time(NULL));
     }