v1.19 Release

Dependencies:   nRF51822

Revision:
59:1dd53bfb012d
Parent:
58:9b94a7caadba
Child:
60:6327aa30a10e
--- a/Source/main.cpp	Fri Dec 18 19:17:26 2020 +0000
+++ b/Source/main.cpp	Mon Feb 01 18:05:29 2021 +0000
@@ -266,7 +266,7 @@
                 
             case TEST_MODE:
                 test_cap();
-                led = is_cap_off;
+                //led = is_cap_off;
                 if(last_cap != is_cap_off)
                 {
                     last_cap = is_cap_off;
@@ -280,7 +280,7 @@
                     led = 0;
                     state = SHIP_MODE_WAIT_DARK;
                     ambient_debounce = 0;
-                    log_add(SMWD, is_cap_off, is_package_open, package_open_detected);
+                    //log_add(SMWD, is_cap_off, is_package_open, package_open_detected);
                 }
                 break;
                 
@@ -290,14 +290,14 @@
                 { // its dark
                     test_cap();
                     state = SHIP_MODE_WAIT_LIGHT;
-                    log_add(SMWL, is_cap_off, is_package_open, package_open_detected);
+                    //log_add(SMWL, is_cap_off, is_package_open, package_open_detected);
                 }
             break;           
             
             case SHIP_MODE_WAIT_LIGHT: 
                 // set up and enable the Light Sense Interrupt
                 // go to lowest power state
-                
+/*  The calibration routine is moved to SHIP_MODE_CHECK_CAP for v1.19                
                 // before going to sleep, adapt the cap_on threshold (iff the cap is on)
                 {
                     adaptive_active = true;
@@ -308,7 +308,7 @@
                     }
                     adaptive_active = false;
                 }
-                
+*/                
                 // now go to sleep
                 debug("Going SHIP MODE\n");
                 is_package_open.disable_irq();
@@ -321,7 +321,7 @@
                 state = SHIP_MODE_CHECK_CAP;
                 back_to_sleep_delay = 0;
                 ambient_debounce = 0;
-                log_add(SMCC, is_cap_off, is_package_open, package_open_detected);
+                //log_add(SMCC, is_cap_off, is_package_open, package_open_detected);
 
             break;
             
@@ -342,7 +342,7 @@
                         if(back_to_sleep_delay > GO_BACK_TO_SLEEP_DELAY && ambient_debounce > AMBIENT_DEBOUNCE)
                         { // only go back to sleep if its dark for a GO_BACK_TO_SLEEP_DELAY and the ambient sensor is debounced signalling dark.
                             state = SHIP_MODE_WAIT_LIGHT;
-                            log_add(SMWL,  is_cap_off, is_package_open, package_open_detected);
+                            //log_add(SMWL,  is_cap_off, is_package_open, package_open_detected);
                         }
                     }
                     else
@@ -400,7 +400,7 @@
                 break;
                 
             case IN_USE_SETUP:
-                flash_led(3, .25);
+                //flash_led(3, .25);
                 start_periodic_tick(PERIODIC_TICK_SEC);
                 debug("In Use\n"); 
                 if(NV_NOT_IN_USE) nv_clear(NV_NOT_IN_USE_ADDR);