attempt to report company_code, version, battery

simplelink/ble_sdk_2_02_02_25/src/examples/simple_central/cc26xx/app/mem_board_central.h

@@ -146,6 +146,9 @@ static void mem_recv_ins(){
         }
 
         case INS_RESET:{
+            state = BLE_STATE_IDLE;
+            connHandle = GAP_CONNHANDLE_INIT;
+            discState = BLE_DISC_STATE_IDLE;
             break;
         }
 
@@ -164,6 +167,7 @@ static void mem_recv_ins(){
         case INS_SCAN:{
 //            flag_notify(EVT_MEM_SCAN_DEVICE);
             SimpleBLECentral_discoverDevices();
+            state = BLE_STATE_BROWSING;
             break;
         }
 
@@ -190,6 +194,10 @@ static void mem_recv_ins(){
             // report a certain device information
             else{
                 device_number = UART_rxBuf[1] - 1;
+                if(device_number >= scanRes){
+                    char illegal_id[20] = "illegal device id";
+                    UART_write(uart_handle, illegal_id, 20);
+                }
 
                 if(UART_rxBuf[2] == 0){
                     UART_write(uart_handle, attr_length, 5);
@@ -212,16 +220,22 @@ static void mem_recv_ins(){
                 else if(UART_rxBuf[2] == 5){
                     UART_write(uart_handle, devList[device_number].battery_info, attr_length[4]);
                 }
+                else if((UART_rxBuf[2] == 6){
+                    // TODO: send all device_info
+//                    UART_write(uart_handle, devList[device_number].battery_info, attr_length[4]);
+                }
             }
             break;
         }
 
         case INS_CONNECT:{
-            scanIdx = UART_rxBuf[1];
-            state = BLE_STATE_BROWSING;
-            mem_connect_device();
-
-//            flag_notify(EVT_MEM_CONNECT);
+            if(state != BLE_STATE_BROWSING;){
+                break;
+            }
+            else{
+                scanIdx = UART_rxBuf[1] - 1;
+                mem_connect_device();
+            }
             break;
         }
 
@@ -251,10 +265,7 @@ static void mem_connect_device() {
         GAPCentralRole_EstablishLink(DEFAULT_LINK_HIGH_DUTY_CYCLE,
                                      DEFAULT_LINK_WHITE_LIST,
                                      addrType, peerAddr);
-
-//						Display_clearLines(dispHandle, ROW_FOUR, ROW_SEVEN);
-//						Display_print0(dispHandle, ROW_TWO, 0, Util_convertBdAddr2Str(peerAddr));
-//						Display_print0(dispHandle, ROW_FOUR, 0, "Connecting");
+#ifndef BOOSTXL_CC2650MA
         mem_UART_clear_screen();
         mem_UART_display(Util_convertBdAddr2Str(peerAddr));
         mem_UART_display("Connecting");
@@ -263,6 +274,7 @@ static void mem_connect_device() {
         mem_UART_display("scanIdx = ");
         mem_UART_display(debug);
         mem_UART_newline();
+#endif
     }
 }
 

simplelink/ble_sdk_2_02_02_25/src/examples/simple_central/cc26xx/app/simple_central.c

@@ -952,6 +952,9 @@ static void SimpleBLECentral_processRoleEvent(gapCentralRoleEvent_t *pEvent)
 
             mem_UART_display("Connected");
             mem_UART_newline();
+#else
+            // send MAC if device is connected
+            UART_write(uart_handle, Util_convertBdAddr2Str(pEvent->linkCmpl.devAddr), 14);
 #endif
 //          Display_print0(dispHandle, ROW_THREE, 0, "Connected");
           selectedMenuItem = MENU_ITEM_CONN_PARAM_UPDATE;
@@ -997,6 +1000,7 @@ static void SimpleBLECentral_processRoleEvent(gapCentralRoleEvent_t *pEvent)
     	  {
     		  if (pEvent->linkUpdate.status == SUCCESS)
     		  {
+    		  // get connection interval here
 //    			  Display_print1(dispHandle, ROW_FOUR, 0, "ParUpd: %d ms", pEvent->linkUpdate.connInterval * 1.25);
     		  }
     		  else

simplelink/ble_sdk_2_02_02_25/src/examples/simple_peripheral/cc26xx/app/headstage/headstage_version.h

@@ -4,13 +4,13 @@
 
 #define VERSION_DATE_YEAR      20
 #define VERSION_DATE_MONTH     6
-#define VERSION_DATE_DAY       29
-#define VERSION_DATE_HOUR      13
-#define VERSION_DATE_MINUTE    1
+#define VERSION_DATE_DAY       30
+#define VERSION_DATE_HOUR      18
+#define VERSION_DATE_MINUTE    0
 
 // this is NOT the version hash !!
 // it's the last version hash
-#define VERSION_HASH           1c2a9bfc1118187dce7632fad39e3b8d2bdf7bc4
+#define VERSION_HASH           ca3cc2c79261d65b0febf1929c89391def25b9e7
 #define VERSION_GIT_BRANCH     simple_central_ma_pin
 
 #endif