FW-877 Heterogeneous radio settings in the Mesh

.gitignore

@@ -1,6 +1,9 @@
 Debug
 settings
 *.dep
+*.ewd
+*.ewt
+*.bak
 *.sfr
 *.o
 *.exe
@@ -24,3 +27,5 @@ settings
 /projects/telosb/01bsp_uart/path.txt
 /projects/telosb/03oos_macpong/path.txt
 /projects/telosb/02drv_opentimers/path.txt
+/projects/openmote-b/01bsp_openradio_rx/log.txt
+/projects/openmote-b/01bsp_radio_tx/asm.s

bootloader/openmote-cc2538/ot_program.py

@@ -18,7 +18,7 @@ class program_over_testbed(object):
     CMD                     = 'program'
 
     # in seconds, should be larger than the time starting from publishing message until receiving the response
-    MESSAGE_RESP_TIMEOUT    = 30
+    MESSAGE_RESP_TIMEOUT    = 60
 
     def __init__(self, mote, image_path):
 

bsp/boards/board.h

@@ -16,25 +16,55 @@
 #include "toolchain_defs.h"
 
 //=========================== define ==========================================
+#define SLOTDURATION_MS     board_getSlotDuration()/PORT_TICS_PER_MS
 
 typedef enum {
    DO_NOT_KICK_SCHEDULER = 0,
    KICK_SCHEDULER        = 1,
 } kick_scheduler_t;
 
+
+
 //=========================== typedef =========================================
+typedef struct {
+    uint16_t slotDuration;
+
+    // execution speed related
+    // also implementation related (e.g. SoC radio or spi-connected radio because of the time to load a packet to/from radio)
+    uint16_t maxTxDataPrepare;
+    uint16_t maxRxAckPrepare;
+    uint16_t maxRxDataPrepare;
+    uint16_t maxTxAckPrepare;
+
+    // radio speed related
+    // also implementation related (because the time to execute the Tx/Rx command is highly dependent on the radio AND the configuration)
+    uint16_t delayTx;                       
+    uint16_t delayRx;
+} slot_board_vars_t; //board specific slot vars
+
+// available slot templates
+typedef enum{
+    SLOT_10ms,
+    SLOT_20ms_24GHZ,
+    SLOT_40ms_24GHZ,
+    SLOT_40ms_FSK_SUBGHZ,
+    SLOT_40ms_OFDM1MCS0_3_SUBGHZ,
+    MAX_SLOT_TYPES,
+} slotType_t;
 
 //=========================== variables =======================================
 
 //=========================== prototypes ======================================
 
-void board_init(void);
-void board_sleep(void);
-void board_reset(void);
-
+void              board_init(void);
+void              board_sleep(void);
+void              board_reset(void);
+uint16_t          board_getSlotDuration (void);
+slot_board_vars_t board_selectSlotTemplate(slotType_t slot_type);
 /**
 \}
 \}
 */
-
+//=========================== private =========================================
+void              board_init_slot_vars(void);
 #endif

bsp/boards/iot-lab_A8-M3/board.c

@@ -16,7 +16,10 @@
 #include "nvic.h"
 #include "debugpins.h"
 
-//=========================== variable ========================================
+//=========================== variables =======================================
+
+slot_board_vars_t slot_board_vars [MAX_SLOT_TYPES];
+slotType_t selected_slot_type;
 
 //=========================== private =========================================
 
@@ -25,6 +28,8 @@ void GPIO_Config_ALL_AIN(void);
 // configure the hard fault exception
 void board_enableHardFaultExceptionHandler(void);
 
+
+
 //=========================== main ============================================
 
 extern int mote_main(void);
@@ -96,6 +101,35 @@ void board_init(void){
     debugpins_init();
     //enable nvic for the radio
     NVIC_radio();
+    board_init_slot_vars();
+}
+
+
+//==== bootstrapping slot info lookup table
+void board_init_slot_vars(void){
+
+    // 20ms slot
+    slot_board_vars [SLOT_20ms_24GHZ].slotDuration                   =  655   ; // ms  
+    slot_board_vars [SLOT_20ms_24GHZ].maxTxDataPrepare               =  110  ; //  3355us (not measured)
+    slot_board_vars [SLOT_20ms_24GHZ].maxRxAckPrepare                =  20   ; //   610us (not measured)
+    slot_board_vars [SLOT_20ms_24GHZ].maxRxDataPrepare               =  33   ; //  1000us (not measured)
+    slot_board_vars [SLOT_20ms_24GHZ].maxTxAckPrepare                =  50   ; //  1525us (not measured)
+    slot_board_vars [SLOT_20ms_24GHZ].delayTx                        =  18   ; //   549us (not measured)
+    slot_board_vars [SLOT_20ms_24GHZ].delayRx                        =  0    ; //     0us (can not measure)
+}
+
+// To get the current slotDuration at any time
+// used during initialization by sixtop to fire the first sixtop EB
+uint16_t board_getSlotDuration (void)
+{
+    return slot_board_vars [selected_slot_type].slotDuration;
+}
+
+// Setter/Getter function for slot_board_vars
+slot_board_vars_t board_selectSlotTemplate (slotType_t slot_type)
+{
+  selected_slot_type = slot_type;
+  return slot_board_vars [selected_slot_type];
 }
 
 void board_sleep(void) {

bsp/boards/iot-lab_A8-M3/board_info.h

@@ -50,23 +50,6 @@ to return the board's description.
 #define PORT_PIN_RADIO_RESET_HIGH()       //GPIOC->ODR |= 0X0040;// nothing
 #define PORT_PIN_RADIO_RESET_LOW()        //GPIOC->ODR &= ~0X0040;// nothing
 
-//===== IEEE802154E timing
-
-#define SLOTDURATION 20 // in miliseconds
-
-// time-slot related
-#define PORT_TsSlotDuration                 655   //    20ms
-
-// execution speed related
-#define PORT_maxTxDataPrepare               110   //  3355us (not measured)
-#define PORT_maxRxAckPrepare                20    //   610us (not measured)
-#define PORT_maxRxDataPrepare               33    //  1000us (not measured)
-#define PORT_maxTxAckPrepare                50    //  1525us (not measured)
-
-// radio speed related
-#define PORT_delayTx                        18    //   549us (not measured)
-#define PORT_delayRx                        0     //     0us (can not measure)
-// radio watchdog
 
 //===== adaptive_sync accuracy
 

bsp/boards/iot-lab_M3/board.c

@@ -19,6 +19,11 @@
 #include "gpio.h"
 #include "cryptoengine.h"
 
+
+//=========================== variables =======================================
+slot_board_vars_t slot_board_vars [MAX_SLOT_TYPES];
+slotType_t selected_slot_type;
+
 //=========================== main ============================================
 
 extern int mote_main(void);
@@ -93,6 +98,35 @@ void board_init(void)
     //enable nvic for the radio
     NVIC_radio();
     cryptoengine_init();
+    board_init_slot_vars();
+}
+
+
+//==== bootstrapping slot info lookup table
+void board_init_slot_vars(void){
+
+    // 20ms slot
+    slot_board_vars [SLOT_20ms_24GHZ].slotDuration                   =  655   ; // ms  
+    slot_board_vars [SLOT_20ms_24GHZ].maxTxDataPrepare               =  110  ; //  3355us (not measured)
+    slot_board_vars [SLOT_20ms_24GHZ].maxRxAckPrepare                =  20   ; //   610us (not measured)
+    slot_board_vars [SLOT_20ms_24GHZ].maxRxDataPrepare               =  33   ; //  1000us (not measured)
+    slot_board_vars [SLOT_20ms_24GHZ].maxTxAckPrepare                =  50   ; //  1525us (not measured)
+    slot_board_vars [SLOT_20ms_24GHZ].delayTx                        =  18   ; //   549us (not measured)
+    slot_board_vars [SLOT_20ms_24GHZ].delayRx                        =  0    ; //     0us (can not measure)
+}
+
+// To get the current slotDuration at any time
+// used during initialization by sixtop to fire the first sixtop EB
+uint16_t board_getSlotDuration (void)
+{
+    return slot_board_vars [selected_slot_type].slotDuration;
+}
+
+// Setter/Getter function for slot_board_vars
+slot_board_vars_t board_selectSlotTemplate (slotType_t slot_type)
+{
+  selected_slot_type = slot_type;
+  return slot_board_vars [selected_slot_type];
 }
 
 void board_sleep(void) {

bsp/boards/iot-lab_M3/board_info.h

@@ -49,23 +49,6 @@ to return the board's description.
 #define PORT_PIN_RADIO_RESET_LOW()        //GPIOC->ODR &= ~0X0040;// nothing
 //#define PORT_PIN_RADIO_RESET_LOW()            GPIOC->ODR &= ~(1<<1);
 
-//===== IEEE802154E timing
-
-#define SLOTDURATION 20 // in miliseconds
-
-// time-slot related
-#define PORT_TsSlotDuration                 655   //    20ms
-
-// execution speed related
-#define PORT_maxTxDataPrepare               110   //  3355us (not measured)
-#define PORT_maxRxAckPrepare                20    //   610us (not measured)
-#define PORT_maxRxDataPrepare               33    //  1000us (not measured)
-#define PORT_maxTxAckPrepare                50    //  1525us (not measured)
-
-// radio speed related
-#define PORT_delayTx                        18    //   549us (not measured)
-#define PORT_delayRx                        0     //     0us (can not measure)
-// radio watchdog
 
 //===== adaptive_sync accuracy
 

bsp/boards/openmote-b-24ghz/board.c

@@ -34,6 +34,11 @@
 #define BSP_BUTTON_BASE                 ( GPIO_D_BASE )
 #define BSP_BUTTON_USER                 ( GPIO_PIN_5 )
 
+//=========================== variables ============================================
+slot_board_vars_t slot_board_vars [MAX_SLOT_TYPES];
+slotType_t selected_slot_type;
+
+
 //=========================== prototypes ======================================
 
 void board_timer_init(void);
@@ -73,11 +78,50 @@ void board_init(void) {
     uart_init();
     radio_init();
     i2c_init();
-
+    board_init_slot_vars();
     // sensors_init();
     cryptoengine_init();
 }
 
+//==== bootstrapping slot info lookup table
+void board_init_slot_vars(void){
+    //10ms slot
+    slot_board_vars [SLOT_10ms].slotDuration                         = 328 ;  // 10ms 
+    slot_board_vars [SLOT_10ms].maxTxDataPrepare                     = 10  ;  // 305us (measured  82us)
+    slot_board_vars [SLOT_10ms].maxRxAckPrepare                      = 10  ;  // 305us (measured  83us)
+    slot_board_vars [SLOT_10ms].maxRxDataPrepare                     =  4  ;  // 122us (measured  22us)
+    slot_board_vars [SLOT_10ms].maxTxAckPrepare                      = 10  ;  // 122us (measured  94us)
+    #ifdef L2_SECURITY_ACTIVE                                             
+    slot_board_vars [SLOT_10ms].delayTx                              = 14  ;  // 366us (measured xxxus)
+    #else                                                                 
+    slot_board_vars [SLOT_10ms].delayTx                              = 12  ;  // 366us (measured xxxus)
+    #endif                                                                
+    slot_board_vars [SLOT_10ms].delayRx                              =  0  ;  // 0us (can not measure)
+
+    // 20ms slot
+    slot_board_vars [SLOT_20ms_24GHZ].slotDuration                   =  655  ; // 20ms  
+    slot_board_vars [SLOT_20ms_24GHZ].maxTxDataPrepare               =  15   ; // 457us (based on measurement)
+    slot_board_vars [SLOT_20ms_24GHZ].maxRxAckPrepare                =  10   ; // 305us (based on measurement)
+    slot_board_vars [SLOT_20ms_24GHZ].maxRxDataPrepare               =  10   ; // 305us (based on measurement)
+    slot_board_vars [SLOT_20ms_24GHZ].maxTxAckPrepare                =  15   ; // 457us (based on measurement)
+    slot_board_vars [SLOT_20ms_24GHZ].delayTx                        =  13   ; // 396us (based on measurement)
+    slot_board_vars [SLOT_20ms_24GHZ].delayRx                        =  0    ; // 0us (can not measure)  
+}
+
+// To get the current slotDuration at any time
+// used during initialization by sixtop to fire the first sixtop EB
+uint16_t board_getSlotDuration (void)
+{
+    return slot_board_vars [selected_slot_type].slotDuration;
+}
+
+// Setter/Getter function for slot_board_vars
+slot_board_vars_t board_selectSlotTemplate (slotType_t slot_type)
+{
+  selected_slot_type = slot_type;
+  return slot_board_vars [selected_slot_type];
+}
+
 void antenna_init(void) {
   /* Configure GPIO as output */
   GPIOPinTypeGPIOOutput(BSP_ANTENNA_BASE, BSP_ANTENNA_CC2538_24GHZ);

bsp/boards/openmote-b-24ghz/board_info.h

@@ -58,42 +58,6 @@
 #define PORT_PIN_RADIO_RESET_HIGH()    // nothing
 #define PORT_PIN_RADIO_RESET_LOW()     // nothing
 
-#define SLOTDURATION 20                // in miliseconds
-
-//===== IEEE802154E timing
-
-#if SLOTDURATION==10
-    // time-slot related
-    #define PORT_TsSlotDuration                 328   // counter counts one extra count, see datasheet
-    // execution speed related
-    #define PORT_maxTxDataPrepare               10    //  305us (measured  82us)
-    #define PORT_maxRxAckPrepare                10    //  305us (measured  83us)
-    #define PORT_maxRxDataPrepare                4    //  122us (measured  22us)
-    #define PORT_maxTxAckPrepare                10    //  122us (measured  94us)
-    // radio speed related
-    #ifdef L2_SECURITY_ACTIVE
-    #define PORT_delayTx                        14    //  366us (measured xxxus)
-    #else
-    #define PORT_delayTx                        12    //  366us (measured xxxus)
-    #endif
-    #define PORT_delayRx                         0    //    0us (can not measure)
-    // radio watchdog
-#endif
-
-#if SLOTDURATION==20
-    #define PORT_TsSlotDuration                 655   //    20ms
-
-    // execution speed related
-    #define PORT_maxTxDataPrepare                15   //   458us (measured  213us)
-    #define PORT_maxRxAckPrepare                 10   //   305us (measured   86us)
-    #define PORT_maxRxDataPrepare                10   //   305us (measured   88us)
-    #define PORT_maxTxAckPrepare                 15   //   458us (measured  211us)
-
-    // radio speed related
-    #define PORT_delayTx                        13    //   397us (measured  388us)
-    #define PORT_delayRx                        0     //     0us (can not measure)
-#endif
-
 //===== adaptive_sync accuracy
 
 #define SYNC_ACCURACY                       1     // ticks

bsp/boards/openmote-b-24ghz/radio.c

@@ -45,6 +45,8 @@ typedef struct {
 
 radio_vars_t radio_vars;
 
+// global radio selection, will use RADIOSETTING_24GHZ by default at initialization. 
+uint8_t selected_radioSetting      =       RADIOSETTING_24GHZ;
 //=========================== prototypes ======================================
 
 void     enable_radio_interrupts(void);
@@ -181,7 +183,13 @@ void radio_reset(void) {
 
 //===== RF admin
 
-void radio_setFrequency(uint8_t frequency, radio_freq_t tx_or_rx) {
+void radio_setConfig (radioSetting_t radioSetting){
+    selected_radioSetting = radioSetting;
+    //do nothing
+}
+
+
+void radio_setFrequency(uint16_t frequency, radio_freq_t tx_or_rx) {
 
    // change state
    radio_vars.state = RADIOSTATE_SETTING_FREQUENCY;

bsp/boards/openmote-b-subghz/board_info.h

@@ -114,10 +114,12 @@
 
 #define NUMSENSORS      7
 
-//====== Antenna options ====
+
+//=========================== Antenna options ================================
+
 #define BSP_ANTENNA_BASE            GPIO_D_BASE
 #define BSP_ANTENNA_CC2538_24GHZ    GPIO_PIN_4      //!< PD4 -- 2.4ghz
-#define BSP_ANTENNA_AT215_24GHZ     GPIO_PIN_3      //!< PD3 -- subghz
+#define BSP_ANTENNA_AT215_24GHZ     GPIO_PIN_3      //!< PD3 -- subghz   
 //#define DAGROOT
 
 //=========================== typedef  ========================================