Diff: Bob.cpp

Revision:

4:9c3c8eb56a2b

Parent:

3:68c005d410e1

Child:

5:c2468a69aacb

--- a/Bob.cpp	Mon Jan 18 15:41:23 2016 +0000
+++ b/Bob.cpp	Wed Mar 30 12:00:43 2016 +0000
@@ -10,6 +10,7 @@
 
 #include "Bob.h"
 #include "mbed.h"
+#include "mbed_debug.h"
 #include "WakeUp.h"
 
 
@@ -37,28 +38,23 @@
     return !_sd_card_detect->read();
 }
 
-void Bob::sleep(int s)
+void Bob::wakeup(void)
 {
-     _sd_enable.write(0);  // unpower SD-card + unpower sensor
-     WakeUp::calibrate();
-     WakeUp::set( s );
-     deepsleep();
+    _sd_enable.write(1);   // power SD-card + power sensor
+    // wait(0.3);          // this shouldn't be necessary because loading the LDC library already takes 0.81 s
 }
 
-void Bob::wakeup(void)
-{
-    _sd_enable.write(1);   // power SD-card + unpower sensor
-    wait(0.3);
-}
-
-void Bob::SDoff(void)
+void Bob::beforesleep(void)
 {
     _sd_enable.write(0);
 }
 
-void Bob::SDon(void)
+void Bob::sleep(uint32_t ms)
 {
-    _sd_enable.write(1);
+     _sd_enable.write(0);           // unpower SD-card + unpower sensor
+     WakeUp::calibrate();           // calibration takes 100 ms
+     WakeUp::set_ms( ms - 100 );    // substract this from the total sleep time
+     deepsleep();
 }
 
 // battery voltage should be 3.1V (min) < 3.7V (typ) < 4.22V (max)
@@ -98,3 +94,9 @@
 void Bob::redoff(void)   { _red   = 0; }
 void Bob::greenoff(void) { _green = 0; }
 
+
+
+
+
+
+