Revision 63:c321added5b1, committed 2021-06-16

Comitter:

fdelahan

Date:

Wed Jun 16 16:33:49 2021 +0000

Parent:

60:6327aa30a10e

Commit message:

This is a dead end version of 1.19. The code has been modified to produce an incorrect crc for 1.19 to be used in verification testing of utility software.; A "1" was added to the crc message of the 'm' request in the comm case statement.

Changed in this revision

--- a/Source/golden.h	Wed Feb 24 16:03:57 2021 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-#include "mbed.h"
-#include "mem.h"
-#include "log.h"
-
-// offset 'tdoffset' in main.cpp
-
-const log_struct golden[] __attribute__ ((aligned (1024))) = 
-{
-    
-{0x00000000,0x00,0x00,0x00,0x00},
-{0x00000000,0x00,0x00,0x00,0x00},
-{0x0000007D,0x02,0x00,0x00,0x00},
-{0x00000000,0x05,0x00,0x00,0x00},
-{0x0001519A,0x01,0x1A,0x00,0x00},
-{0x00020510,0x01,0x1C,0x00,0x00},
-{0x0002A388,0x01,0x0D,0x00,0x00},
-{0x00034CA4,0x01,0x1C,0x00,0x00},
-{0x0003FDE1,0x01,0x17,0x00,0x00},
-{0x0004B72B,0x01,0x0C,0x00,0x00},
-{0x0005735B,0x01,0x10,0x00,0x00},
-{0x00061E2E,0x01,0x15,0x00,0x00},
-{0x0006B7CC,0x01,0x1D,0x00,0x00},
-{0x000751C2,0x01,0x02,0x00,0x00},
-{0x0007F054,0x01,0x0D,0x00,0x00},
-{0x0008A791,0x01,0x1D,0x00,0x00},
-{0x00094610,0x01,0x1D,0x00,0x00},
-{0x0009FC26,0x01,0x14,0x00,0x00},
-{0x000A9A2E,0x01,0x1A,0x00,0x00},
-{0x000B5517,0x01,0x0D,0x00,0x00},
-{0x000BF795,0x01,0x12,0x00,0x00},
-{0x000C93A4,0x01,0x1C,0x00,0x00},
-{0x000D31FE,0x01,0x1A,0x00,0x00},
-{0x000F3123,0x01,0x80,0x51,0x01},
-{0x000F320C,0x01,0x17,0x00,0x00},
-{0x000FD9B7,0x01,0x0B,0x00,0x00},
-{0x00107C50,0x01,0x1B,0x00,0x00},
-{0x00113322,0x01,0x1D,0x00,0x00},
-{0x0011DF93,0x01,0x18,0x00,0x00},
-{0x00128A85,0x01,0x19,0x00,0x00},
-{0x001344F8,0x01,0x19,0x00,0x00},
-{0x0013E4C1,0x01,0x12,0x00,0x00},
-{0x00149872,0x01,0x17,0x00,0x00},
-{0x00154BE9,0x01,0x03,0x00,0x00},
-{0x0015EFB6,0x01,0x18,0x00,0x00},
-{0x00169B5D,0x01,0x0B,0x00,0x00},
-{0x00173248,0x01,0x10,0x00,0x00},
-{0x0017C842,0x01,0x0B,0x00,0x00},
-{0x0018725B,0x01,0x0C,0x00,0x00},
-{0x001926FC,0x01,0x1A,0x00,0x00},
-{0x0019E223,0x01,0x18,0x00,0x00},
-{0x001A7B56,0x01,0x10,0x00,0x00},
-{0x001B271A,0x01,0x1D,0x00,0x00},
-{0x001BCE94,0x01,0x05,0x00,0x00},
-{0x001C62D0,0x01,0x13,0x00,0x00},
-{0x001D04C3,0x01,0x12,0x00,0x00},
-{0x001D9F5C,0x01,0x19,0x00,0x00},
-{0x001E54A0,0x01,0x1A,0x00,0x00},
-{0x001EF577,0x01,0x0E,0x00,0x00},
-{0x001F9F7F,0x01,0x14,0x00,0x00},
-{0x00203A37,0x01,0x13,0x00,0x00},
-{0x0020E75B,0x01,0x17,0x00,0x00},
-{0x00218633,0x01,0x18,0x00,0x00},
-{0x0022358C,0x01,0x19,0x00,0x00},
-{0x0022E658,0x01,0x10,0x00,0x00},
-{0x002399A8,0x01,0x18,0x00,0x00},
-{0x00244069,0x01,0x17,0x00,0x00},
-{0x0024D7A7,0x01,0x0D,0x00,0x00},
-{0x00257504,0x01,0x0C,0x00,0x00},
-{0x00262F48,0x01,0x14,0x00,0x00},
-{0x0026C97B,0x01,0x1D,0x00,0x00},
-{0x0027800B,0x01,0x11,0x00,0x00},
-{0x00282A7F,0x01,0x16,0x00,0x00},
-{0x00282AF8,0x01,0x01,0x00,0x00},
-{0x0028DE80,0x04,0x00,0x00,0x00},    
-{0xffffffff,0xff,0xff,0xff,0xff}    
-};
\ No newline at end of file

--- a/Source/log.cpp	Wed Feb 24 16:03:57 2021 +0000
+++ b/Source/log.cpp	Wed Jun 16 16:33:49 2021 +0000
@@ -16,18 +16,13 @@
 
 extern bool log_enable; // initialized in main.cpp – DEW
 
-#include "golden.h"
-log_struct * log_start_addr = (log_struct *)golden;
-log_struct * log_end_addr = (log_struct *)(golden + sizeof(golden));
-
-
 // Counts number of records with non-zero time field
 uint32_t log_get_num_records(void)
 {
     uint32_t cnt = 0;
-    log_struct *rec = log_start_addr;
+    log_struct *rec = (log_struct *)PSTORAGE_DATA_START_ADDR;
     
-    while(rec < log_end_addr)
+    while(rec < (log_struct *)PSTORAGE_DATA_END_ADDR)
     {
         if(rec->time == 0xffffffff) return cnt;
         cnt++;
@@ -40,9 +35,9 @@
 uint32_t log_code_count(event_t code)
 {
     uint32_t cnt = 0;
-    log_struct *rec = log_start_addr;
+    log_struct *rec = (log_struct *)PSTORAGE_DATA_START_ADDR;
     
-    while(rec < log_end_addr)
+    while(rec < (log_struct *)PSTORAGE_DATA_END_ADDR)
     {
         if(rec->time == 0xffffffff) return cnt;
         if(rec->code == code) cnt++;
@@ -54,9 +49,9 @@
 // returns address of 1st free record
 static log_struct * get_free_record(void)
 {
-    log_struct *rec = log_start_addr;
+    log_struct *rec = (log_struct *)PSTORAGE_DATA_START_ADDR;
     
-    while(rec < log_end_addr)
+    while(rec < (log_struct *)PSTORAGE_DATA_END_ADDR)
     {
         if(rec->time == 0xffffffff) return rec;
         rec++;
@@ -73,7 +68,7 @@
     
     while(addr < PSTORAGE_DATA_END_ADDR)
     {
-        //nrf_nvmc_page_erase(addr);
+        nrf_nvmc_page_erase(addr);
         addr += PSTORAGE_FLASH_PAGE_SIZE;
     }
 }
@@ -82,13 +77,13 @@
 void log_show(void)
 {
     int cnt = log_get_num_records();
-    log_struct * rec = log_start_addr;
+    log_struct * rec = (log_struct *)PSTORAGE_DATA_START_ADDR;
     
     BLE_UART_xmit("*Num Records=");
     BLE_UART_xmit(cnt);
     BLE_UART_xmit("\n");
 
-    while(rec < log_end_addr) {
+    while(rec < (log_struct *)PSTORAGE_DATA_END_ADDR) {
         // show record
         uint32_t offset = read_time_correction();
         
@@ -134,7 +129,7 @@
     {   
         set_radio(false);
         wait(1.0);
-        //nrf_nvmc_write_words(addr, (uint32_t *)(&rec), 2);
+        nrf_nvmc_write_words(addr, (uint32_t *)(&rec), 2);
     }
 //#endif
 }

--- a/Source/main.cpp	Wed Feb 24 16:03:57 2021 +0000
+++ b/Source/main.cpp	Wed Jun 16 16:33:49 2021 +0000
@@ -235,18 +235,6 @@
                 start_periodic_tick(FAST_TICK_SEC);
                 #if SKIP_SHIP_MODE
                     // package_open_sense_enable = 1;
-                    
-                    // (cap is on) before going to in-use, adapt the cap_on threshold (iff the cap is on)
-                    {
-                        adaptive_active = true;
-                        int i = 20; // multiple calls aallow it to adapt slowly to eliminate potencial noise.
-                        while(i--) 
-                        {
-                            test_cap();
-                        }
-                        adaptive_active = false;
-                    }
-                            
                     state = IN_USE_SETUP;
                 #else
                     state = POST;
@@ -412,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);            
@@ -503,9 +491,6 @@
     } while(state != last_state);
 }
 
-const uint32_t tdoffset = 1604131200 + 4*3600; // - 0x00015180; // used so all records start at the same time/date (10/31/2020 8:00:00am - 1hr)
-
- 
 void dataWasRead(void)
 {
     flash_led(1, 0.04);
@@ -566,7 +551,7 @@
                     {
                         uint16_t crc = crc16((const unsigned char*)CRC_START_ADDR, (uint32_t)(CRC_END_ADDR - CRC_START_ADDR + 1) );
                         BLE_UART_xmit("sm=");
-                        BLE_UART_xmit(char2hex(crc, 4));
+                        BLE_UART_xmit(char2hex(crc+1, 4)); // added 1 to force CRC error - DEW 15JUN2021
                         BLE_UART_xmit("\n");
                     }
                     break;
@@ -644,23 +629,7 @@
                 }
             }
             break;
-               
-        case 'n': // set RTC
-            {
-                int i = 1;
-                uint32_t num = 0;
-    
-                while(cmd[i]>='0' && cmd[i]<='9') {
-                    num = num*10 + cmd[i++]-'0';
-                }
-    
-                if(i>1) {
-                    set_rtc(num-tdoffset);
-                    BLE_UART_xmit("*RTC Set\n");
-                }
-            }
-            break;
-             
+                
         case 'v': // version
             BLE_UART_xmit("v=");
             BLE_UART_xmit(FW_VERSION);

--- a/Source/main.h	Wed Feb 24 16:03:57 2021 +0000
+++ b/Source/main.h	Wed Jun 16 16:33:49 2021 +0000
@@ -2,9 +2,9 @@
 #ifndef MAIN_H
 #define MAIN_H
 
-#define FW_VERSION  "V1.19gs" //  major revisions will be 1xx, 2xx, etc.
+#define FW_VERSION  "V1.19" //  major revisions will be 1xx, 2xx, etc.
 
-#define SKIP_SHIP_MODE      1  // 0=normal, 1=Test mode, where SHIP_MODE is skipped
+#define SKIP_SHIP_MODE      0  // 0=normal, 1=Test mode, where SHIP_MODE is skipped
 #define UART_DEBUGGING      0  // if =1, put out debug info on the BLE_UART
 #define ENABLE_LED          0  // if =1, enable the debug LED
 //#define TEST_ON_NRF51_DK    0  // if =1, configure for running on nRF51-DK board