FW-456. Fixed.

JRubis · Jan 17, 2016 · fd2434e · fd2434e
1 parent 9f05ff4
commit fd2434e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 deletions.
diff --git a/drivers/common/openserial.c b/drivers/common/openserial.c
@@ -532,9 +532,6 @@ void openserial_goldenImageCommands(void){
        case COMMAND_SET_DAOPERIOD: // two bytes, in mili-seconds
            icmpv6rpl_setDAOPeriod(comandParam_16);
            break;
-       case COMMAND_PING_MOTE:
-           // this should not happen
-           break;
        case COMMAND_SET_DAGRANK: // two bytes
            neighbors_setMyDAGrank(comandParam_16);
            break;
@@ -591,14 +588,14 @@ void openserial_goldenImageCommands(void){
                 ) 
             ){
                 // randommly select cell
-                sixtop_request(commandId-9,&neighbor,1);
+                sixtop_request(commandId-8,&neighbor,1);
             } else {
                 for (i=0;i<commandLen;i++){
                     cellList[i].tsNum           = openserial_vars.inputBuf[5+i];
                     cellList[i].choffset        = 0;
                     cellList[i].linkoptions     = CELLTYPE_TX;
                 }
-                sixtop_addORremoveCellByInfo(commandId-9,&neighbor,cellList);
+                sixtop_addORremoveCellByInfo(commandId-8,&neighbor,cellList);
             }
             break;
        default:

diff --git a/drivers/common/openserial.h b/drivers/common/openserial.h
@@ -64,17 +64,16 @@ enum {
    COMMAND_SET_KAPERIOD          =  2,
    COMMAND_SET_DIOPERIOD         =  3,
    COMMAND_SET_DAOPERIOD         =  4,
-   COMMAND_PING_MOTE             =  5,
-   COMMAND_SET_DAGRANK           =  6,
-   COMMAND_SET_SECURITY_STATUS   =  7,
-   COMMAND_SET_FRAMELENGTH       =  8,
-   COMMAND_SET_ACK_STATUS        =  9,
-   COMMAND_SET_6P_ADD            = 10,
-   COMMAND_SET_6P_DELETE         = 11,
-   COMMAND_SET_6P_COUNT          = 12,
-   COMMAND_SET_6P_LIST           = 13,
-   COMMAND_SET_6P_CLEAR          = 14,
-   COMMAND_MAX                   = 15,
+   COMMAND_SET_DAGRANK           =  5,
+   COMMAND_SET_SECURITY_STATUS   =  6,
+   COMMAND_SET_FRAMELENGTH       =  7,
+   COMMAND_SET_ACK_STATUS        =  8,
+   COMMAND_SET_6P_ADD            =  9,
+   COMMAND_SET_6P_DELETE         = 10,
+   COMMAND_SET_6P_COUNT          = 11,
+   COMMAND_SET_6P_LIST           = 12,
+   COMMAND_SET_6P_CLEAR          = 13,
+   COMMAND_MAX                   = 14,
 };
 
 //=========================== module variables ================================

diff --git a/openstack/02b-MAChigh/sixtop.c b/openstack/02b-MAChigh/sixtop.c
@@ -296,7 +296,7 @@ void sixtop_addORremoveCellByInfo(uint8_t code,open_addr_t* neighbor,cellInfo_ht
     // set cell list (only first one is to be removed)
     frameID        = SCHEDULE_MINIMAL_6TISCH_DEFAULT_SLOTFRAME_HANDLE;
     container      = frameID;
-    memcpy(&(cellList[0]),cellInfo,sizeof(cellInfo_ht));
+    memcpy(&(cellList[0]),cellInfo,sizeof(cellList));
 
 
     // get a free packet buffer