Diff: af_utils/af_attriburtes.cpp

Revision:

3:cac964851bb6

Parent:

2:778a4d4436ff

Child:

4:aa67eddf0ab1

--- a/af_utils/af_attriburtes.cpp	Sun Dec 03 23:58:11 2017 +0000
+++ b/af_utils/af_attriburtes.cpp	Mon Dec 04 02:47:38 2017 +0000
@@ -12,7 +12,7 @@
 #include "SO1602A.h"
 #include "pending.h"
 
-extern SO1602A *so1602a ;
+extern SO1602A *display ;
 extern pending_class *pending ;
 
 static const af_attribute_type af_attr[] = {
@@ -100,7 +100,7 @@
     { 65012, "Command",                  ATTRIBUTE_TYPE_BYTES,   8 }, /* ? */   
     { 65013, "ASR State",                ATTRIBUTE_TYPE_SINT8,   1 },
     { 65014, "Low Battery Warning",      ATTRIBUTE_TYPE_SINT8,   1 },
-    { 65015, "Linked Timestamp",         ATTRIBUTE_TYPE_SINT32,  4 },
+    { ATTR_LINKED_TIMESTAMP, "Linked Timestamp",         ATTRIBUTE_TYPE_SINT32,  4 },
     { 65018, "Attribute ACK",            ATTRIBUTE_TYPE_SINT16,  8 },
     { 65019, "Reboot Reason",            ATTRIBUTE_TYPE_UTF8S, 100 },
     { 65020, "BLE Comms",                ATTRIBUTE_TYPE_BYTES,  12 },
@@ -247,7 +247,7 @@
     printf(" %5d ASR requested [%d] : ", attributeId, requestId) ;
     af_print_values(requestId, attributeId, valueLen, value) ;
     switch(attributeId) {
-    case AF_SYSTEM_LINKED_TIMESTAMP: /* timestamp */
+    case ATTR_LINKED_TIMESTAMP: /* timestamp */
         set_time(valueLen, value) ;
         printf("timestampe = %d\n", timestamp) ;
 //        print_date(&current_time) ;
@@ -256,10 +256,10 @@
     case ATTR_SOFTWARE_RESET: /* software reset requested! */
         if (value[0]) {
             printf("Software Reset Requested!\n") ;
-            if (so1602a != 0) {
-                so1602a->clearDisplay() ;
-                so1602a->locate(0,0) ;
-                so1602a->putStr("System Rebooting!") ;
+            if (display != 0) {
+                display->clearDisplay() ;
+                display->locate(0,0) ;
+                display->putStr("System Rebooting!") ;
             }
             wait(1) ;
             software_reset() ;
@@ -471,7 +471,7 @@
     ts2time(timestamp, &current_time) ;
     print_time(&current_time) ;
     printf(" %5d ASR reported [%d]: ", attributeId, requestId) ;
-    if (attributeId == 65015) { /* timestamp! */
+    if (attributeId == ATTR_LINKED_TIMESTAMP) { /* timestamp! */
         set_time(valueLen, value) ;
         printf("timestampe = %d\n", timestamp) ;
         print_date(&current_time) ;
@@ -484,15 +484,19 @@
         printf("ASR state: ") ;
         switch(value[0]) {
         case MODULE_STATE_REBOOTED:
+            gLinkedState = false ;
             printf("Rebooted\n") ;
             break ;
         case MODULE_STATE_LINKED:
+            gLinkedState = true ;
             printf("Linked\n") ;
             break ;
         case MODULE_STATE_UPDATING:
+            gLinkedState = false ;
             printf("Updating\n") ;
             break ;
         case MOUDLE_STATE_UPDATE_READY:
+            gLinkedState = false ;
             printf("Update ready - rebooting\n") ;
             while(afero->setAttribute32(AF_SYSTEM_COMMAND, MODULE_COMMAND_REBOOT) != afSUCCESS) {
                 afero->loop() ;