(Legacy) develop_FW-866 OpenRadio interface by minarady1 · Pull Request #504 · openwsn-berkeley/openwsn-fw

minarady1 · 2020-03-10T17:15:54Z

Initial commit of code compiling and working and synching but not fully communicating

…ly communicating

…or debugging

- A hybrid transmitter for openmote-b which loops on all available modulations using openradio interface. - A receiver which sets the rx settings also using open radio interface

into develop_FW-866

cleaning radio header and c file

… indexes instead of slot durations

fjmolinas · 2020-04-17T09:05:48Z

Really like the struct based approach for slot information!

fjmolinas · 2020-04-17T09:51:05Z

+    // also implementation related (because the time to execute the Tx/Rx command is highly dependent on the radio AND the configuration)
+    uint8_t PORT_delayTx;                       
+    uint8_t PORT_delayRx;
+} slot_board_vars_t; //board specific slot vars


Does it make sense defining this in bsp/boards/board.h? you could have something
like this as a default config:

typedef struct { uint8_t SLOTDURATION; uint8_t PORT_TsSlotDuration; uint8_t PORT_maxTxDataPrepare; uint8_t PORT_maxRxAckPrepare; uint8_t PORT_maxRxDataPrepare; uint8_t PORT_maxTxAckPrepare; uint8_t PORT_delayTx; uint8_t PORT_delayRx; } slot_board_vars_t; /* This would be a default configuration */ #ifndef 10MS_SLOTDURATION #define 10MS_SLOTDURATION 20 /* in miliseconds */ #endif #ifndef 10MS_PORT_TsSlotDuration #define 10MS_PORT_TsSlotDuration 655 /* 655 ticks at @32768Hz */ #endif #ifndef 10MS_PORT_maxTxDataPrepare #define 10MS_PORT_maxTxDataPrepare 110 /* 3355us (not measured) */ #endif #ifndef 10MS_PORT_maxRxAckPrepare #define 10MS_PORT_maxRxAckPrepare 20 /* 610us (not measured) */ #endif #ifndef 10MS_PORT_maxRxDataPrepare #define 10MS_PORT_maxRxDataPrepare 33 /* 1000us (not measured) */ #endif #ifndef 10MS_PORT_maxTxAckPrepare #define 10MS_PORT_maxTxAckPrepare 50 /* 1525us (not measured) */ #endif #ifndef 10MS_PORT_delayTx #define 10MS_PORT_delayTx 10 /* 549us (not measured) */ #endif #ifndef 10MS_PORT_delayRx #define 10MS_PORT_delayRx 0 /* 0us (can not measure) */ #endif #define SLOT_10_MS_BOARD_CONFIG_DEFAULT { .SLOTDURATION = 10MS_SLOTDURATION, \ .PORT_TsSlotDuration = 10MS_PORT_TsSlotDuration, \ .PORT_maxTxDataPrepare = 10MS_PORT_maxTxDataPrepare, \ .PORT_maxRxAckPrepare = 10MS_PORT_maxRxAckPrepare, \ .PORT_maxRxDataPrepare = 10MS_PORT_maxRxDataPrepare, \ .PORT_maxTxAckPrepare = 10MS_PORT_maxTxAckPrepare, \ .PORT_delayTx = 10MS_PORT_delayTx, \ .PORT_delayRx = 10MS_PORT_delayRx, \ } static const slot_board_vars_t slot_10ms_board_vars[] = { #ifdef SLOT_10MS_BOARD_VARS SLOT_10MS_BOARD_VARS, #else SLOT_10MS_BOARD_VARS_DEFAULT, #endif ... /* that for all slots */ ... #ifdef SLOT_40MS_OFDM1MCS0_3_SUBGHZ_BOARD_VARS SLOT_40MS_OFDM1MCS0_3_SUBGHZ_BOARD_VARS, #else SLOT_40MS_OFDM1MCS0_3_SUBGHZ_BOARD_VARS_DEFAULT, #endif };

And then per board_info you would keep the original defines and do the following:

#define SLOT_10MS_BOARD_VARS { .SLOTDURATION = 10MS_SLOTDURATION, \ .PORT_TsSlotDuration =10MS_ PORT_TsSlotDuration, \ .PORT_maxTxDataPrepare = 10MS_PORT_maxTxDataPrepare, \ .PORT_maxRxAckPrepare =10MS_ PORT_maxRxAckPrepare, \ .PORT_maxRxDataPrepare = 10MS_PORT_maxRxDataPrepare, \ .PORT_maxTxAckPrepare = 10MS_PORT_maxTxAckPrepare, \ .PORT_delayTx = 10MS_PORT_delayTx, \ .PORT_delayRx = 10MS_PORT_delayRx, \ }

I think this would also make the migration easier and the init function could
simply be:

void board_init_slot_vars(const slot_board_config_t *slot_board_config) { slot_board_vars = *slot_board_config; }

The nice thing is this change could be split from this PR, and since currently only one SLOTDURATION is possible there would be no need to change any define per BOARD_INFO just add:

```c #define SLOT_BOARD_VARS { .SLOTDURATION = SLOTDURATION, \ .PORT_TsSlotDuration =PORT_TsSlotDuration, \ .PORT_maxTxDataPrepare = PORT_maxTxDataPrepare, \ .PORT_maxRxAckPrepare = PORT_maxRxAckPrepare, \ .PORT_maxRxDataPrepare = PORT_maxRxDataPrepare, \ .PORT_maxTxAckPrepare = PORT_maxTxAckPrepare, \ .PORT_delayTx = PORT_delayTx, \ .PORT_delayRx = PORT_delayRx, \ }

…w works correctly :) - moved time_type_t to board.h because this enum seems fundamental to the firmware (even lower than opentimers where it used to be define). It is currently used in a new function in board.c: board_getSlotDuration (time_type_t) - MACRO PRE_CALL_TIMER_WINDOW in opentimers.h now refers to function call keeping track of the current slot board_getSlotDuration(TIME_TICS) instead of the old constant PORT_TsSlotDuration - Added a double radio pin toggle in ri4 and ri5 to indicate the actual start and end of frame at LA for accurate measurement of synchronization offset - both sixtop.c and icmpv6rpl.c now refer to function call keeping track of the current slot board_getSlotDuration(TIME_MS) instead of the old constant: SLOTDURATION

…nore

…ant with the new radio.h interface Updated board-specific definitions to be compliant to the new 802.154.e dynamic slot/radio selection (and to the new board.h). This was completed and compiled locally (using armgcc scons compilers) with the following (travis) commands: - scons board=openmote-b-24ghz toolchain=armgcc oos_openwsn - scons board=openmote-cc2538 toolchain=armgcc oos_openwsn - scons board=openmote-cc2538 toolchain=armgcc oos_sniffer - scons board=openmote-cc2538 toolchain=armgcc oos_macpong - scons board=samr21_xpro toolchain=armgcc oos_openwsn - scons board=python toolchain=gcc oos_openwsn - scons board=iot-lab_A8-M3 toolchain=armgcc oos_macpong - scons board=iot-lab_A8-M3 toolchain=armgcc oos_openwsn - scons board=iot-lab_M3 toolchain=armgcc oos_macpong - scons board=iot-lab_M3 toolchain=armgcc oos_openwsn - scons board=openmotestm toolchain=armgcc oos_macpong - scons board=openmotestm toolchain=armgcc oos_openwsn - scons board=openmote-b toolchain=armgcc oos_openwsn

minarady1 · 2020-04-23T16:30:16Z

Hello @twatteyne , @changtengfei , and @TimothyClaeys The PR is now ready for review. To test it, you can use SCons or IAR. Make sure you set the following settings:

Use openmote-b board option
Used fixed channel (e.g. 11)
Set EB_PORTION to 4
Set SLOTFRAME_LENGTH to at least 19

select the desired slot template and radio setting to use, currently, the following slot template/radio setting combination in ieee802.15.4e init function are supported:

  SLOT_20ms_24GHZ              , RADIOSETTING_24GHZ --> Default
  SLOT_40ms_24GHZ              , RADIOSETTING_24GHZ -->Essential
  SLOT_40ms_FSK_SUBGHZ        ,RADIOSETTING_FSK_OPTION1_FEC -->Essential
  SLOT_40ms_OFDM1MCS0_3_SUBGHZ , RADIOSETTING_OFDM_OPTION_1_MCS0
  SLOT_40ms_OFDM1MCS0_3_SUBGHZ , RADIOSETTING_OFDM_OPTION_1_MCS1
  SLOT_40ms_OFDM1MCS0_3_SUBGHZ , RADIOSETTING_OFDM_OPTION_1_MCS2
  SLOT_40ms_OFDM1MCS0_3_SUBGHZ , RADIOSETTING_OFDM_OPTION_1_MCS3 -->Essential

twatteyne · 2020-04-24T06:57:48Z

General comments:

start all of your commit messages with the key of the issue ti addresses. "FW-866. poipoi"
have the name of the PR contain both the key and title of the issue it fixes "FW-866. OpenRadio interface"

twatteyne

I haven't reviewed every file, but the comments in the file I did review are important enough that they require you to rework the code, and restart a new review cycle.

twatteyne · 2020-04-24T06:58:23Z

 Debug
 settings
 *.dep
+*.ewd


twatteyne · 2020-04-24T06:59:59Z

+    // also implementation related (because the time to execute the Tx/Rx command is highly dependent on the radio AND the configuration)
+    uint16_t PORT_delayTx;                       
+    uint16_t PORT_delayRx;
+} slot_board_vars_t; //board specific slot vars


looks like this is the timeslot template. Suggest renaming to timeslot_template_t

oh no, the timelost template is defined in the ieee154e.h. This struct is strictly for board specific parameters (regardless of which 154e timeslot template is used)

twatteyne · 2020-04-24T07:04:43Z

+    SLOT_40ms_FSK_SUBGHZ,
+    SLOT_40ms_OFDM1MCS0_3_SUBGHZ,
+    MAX_SLOT_TYPES,
+} slotType_t;


I don't understand why the slot duration is in the name. Just have 3 timeslot templates, for the 3 radio settings we care about.

// available slot templates typedef enum{ TIMESLOT_TEMPLATE_OQPSK_24GHZ, TIMESLOT_TEMPLATE_2FSK_SUBGHZ, TIMESLOT_TEMPLATE_OFDM_SUBGHZ, TIMESLOT_TEMPLATE_MAX } timeslot_templates_t;

There is also a 10ms slot template and 20ms slot template. Thoe former is for python the latter has been classically used for 2.4GHz).
I didn't touch them because they are out of my scope (I can still rempve them, or give them different names if you wish?)

twatteyne · 2020-04-24T07:25:25Z

-#include <source/interrupt.h>
-#include <source/sys_ctrl.h>
-
+    \brief Definition of the Open Radio interface for openmote-b


You cannot remove authors, add you name at the bottom of the list.

In fact this a completely new file for the openradio interface, it is just named the same. The original radio.c file containing cc2538 radio implementation is now this file https://github.com/minarady1/openwsn-fw/blob/develop_FW-866/bsp/chips/cc2538rf/radio_cc2538rf.c

twatteyne · 2020-04-24T07:26:12Z

+typedef void                (*radio_txNow_cb_t)(void);
+typedef void                (*radio_rxEnable_cb_t)(void);
+typedef void                (*radio_rxNow_cb_t)(void);
+typedef void                (*radio_getReceivedFrame_cb_t)(


indentation

twatteyne · 2020-04-24T07:26:15Z

+typedef struct {
+    radio_reset_cb_t                    radio_reset;
+    radio_init_cb_t                     radio_init;
+    radio_setConfig_cb_t           radio_setConfig;


indentation

twatteyne · 2020-04-24T07:27:54Z

 #define FLASH_START_ADDR                0x00200000
-#define BOOTLOADER_BACKDOOR_ENABLE      0xF7FFFFFF // ENABLED: PORT A, PIN 6, LOW
 #define BOOTLOADER_BACKDOOR_DISABLE     0xEFFFFFFF
+#define BOOTLOADER_BACKDOOR_ENABLE      0xF6FFFFFF // ENABLED: PORT A, PIN 6, LOW


why this change?

PA6 is the pin controlling the bootloader backdoor. We probably hadn't figure out the correct configuration at the time we create the openmote-b port.

changtengfei

I left some comments. Some suggestions:

for the if/else condition, always use bracket even there is only one line
the .gitignore somehow doesn't work, some unnecessary files are still committed.

changtengfei · 2020-04-24T08:41:50Z

 #define FLASH_START_ADDR                0x00200000
-#define BOOTLOADER_BACKDOOR_ENABLE      0xF7FFFFFF // ENABLED: PORT A, PIN 6, LOW
 #define BOOTLOADER_BACKDOOR_DISABLE     0xEFFFFFFF
+#define BOOTLOADER_BACKDOOR_ENABLE      0xF6FFFFFF // ENABLED: PORT A, PIN 6, LOW


PA6 is the pin controlling the bootloader backdoor. We probably hadn't figure out the correct configuration at the time we create the openmote-b port.

changtengfei · 2020-04-24T08:55:17Z

@@ -1,119 +1,63 @@
 /**
-\brief This program shows the use of the "radio" bsp module.


why remove the description?

Is this file still for bsp_radio_rx project?

changtengfei · 2020-04-24T08:59:47Z

@@ -1,16 +1,13 @@
 /**
 \brief This program shows the use of the "radio" bsp module.
-


keep the newline between paragraphs

changtengfei · 2020-04-24T09:03:36Z

@@ -0,0 +1,2891 @@
+<?xml version="1.0" encoding="UTF-8"?>


somehow the .gitignore doesn't work. The file supposes to be not committed.

…d_getSlotTemplate() into slot_board_vars_t board_selectSlotTemplate(slotType)

…4ghz timing

- openqueue_stats - increased max neighbors to 45

- provided comments on at86rf215 register settings - updated uinject app with additional parameters - dynamic eb_portion - RPL DIO_PERIOD 20 secs

- custom ot bootloading capability - resetStats function rename in ieee154e - counting ticks for radio in tx and rx states (some inaccuracy in rx to be resolved) - used 41 slotframe legnth - disabled fragmentation

minarady1 added 30 commits March 10, 2020 18:12

Initial commit of code compiling and working and synching but not ful…

6ffee84

…ly communicating

wrote radio_set_modulation and radio_local_bootstrap

92a27e9

some updates

9035323

open radio working :)

9999fe1

some updates, mainly trying to debug

ff29667

updates

eebd083

radio at86rf files

133dc1c

Integrating cc2538rf into the open radio interface

984444a

using openradio in openwsn

9273ca3

open radio interface finally working and integrated into openwsn

a6468d7

full radio set added to openradio

1669b80

Complete open radio interface for openmote-b tested with 7 modulations.

999f50f

Restoring default configuration

917665d

restoring default config

64006b5

resorting default configurations and removing unnecessary code used f…

0de94cb

…or debugging

restoring bsp_radio_tx default code

185038e

restoring sniffer code

ecc3bd2

restoring sniffer code

56ed0cf

restoring sniffer code

480f1dc

restoring bsp_radio_rx code

9226da2

A project for demonstrating the open radio interface on openmote-b:

6dda3e9

- A hybrid transmitter for openmote-b which loops on all available modulations using openradio interface. - A receiver which sets the rx settings also using open radio interface

Merge branch 'develop_FW-866' of https://github.com/minarady1/openwsn-fw

39a1bdc

into develop_FW-866

openradio interface cleaning in progress

f0d59e5

modivided slot 40 for FSK and added slot 41 for ofdm1 mcs3

6bae185

introduced slot_template instead of slot duration

75b7eb1

cleaning radio header and c file

cleaneing openradio interface + adding comments + using slot template…

d2b9c40

… indexes instead of slot durations

comments+cleaning

0166d42

Merge branch 'develop' into develop_FW-866

aa7237b

minor fixes

2464d80

macpong

f23a799

fjmolinas reviewed Apr 17, 2020

View reviewed changes

minarady1 added 7 commits April 17, 2020 15:33

slot_duration struct update

e5fdab3

adding few helper functions to handle slot info

4e484f2

quick update

74ca322

fixed dynamic slot selection + code formatting

48f3080

cleaning up code for bsp, projacts, MAC, IAR project files and .gitig…

49d565f

…nore

changtengfei requested review from TimothyClaeys, changtengfei and twatteyne April 23, 2020 16:08

restoring defaults

6a8f446

twatteyne requested changes Apr 24, 2020

View reviewed changes

changtengfei requested changes Apr 24, 2020

View reviewed changes

minarady1 changed the title ~~develop_FW-866~~ develop_FW-866 OpenRadio interface Apr 24, 2020

minarady1 added 4 commits April 24, 2020 15:17

FW-866 fixed slot template timing references as per PR comments

5e6ca11

FW-866 merged board_setSlotType (slotType) and slot_board_vars_t boar…

ba85ad8

…d_getSlotTemplate() into slot_board_vars_t board_selectSlotTemplate(slotType)

FW-866 fixing indentation, variable names for openradio + adjusting 2…

c861218

…4ghz timing

FW-866 restoring tx/rx common project

5110952

minarady1 requested review from changtengfei and twatteyne April 25, 2020 12:31

fjmolinas mentioned this pull request May 4, 2020

bsp/boards: use const struct for slot_board_vars intialization minarady1/openwsn-fw#1

Closed

minarady1 added 4 commits May 6, 2020 15:05

increased testbed bootload timeout

5538db7

fw-866

1a1926b

- openqueue_stats - increased max neighbors to 45

fw-866

cdf2911

- provided comments on at86rf215 register settings - updated uinject app with additional parameters - dynamic eb_portion - RPL DIO_PERIOD 20 secs

fw-866

e5b34b3

- custom ot bootloading capability - resetStats function rename in ieee154e - counting ticks for radio in tx and rx states (some inaccuracy in rx to be resolved) - used 41 slotframe legnth - disabled fragmentation

minarady1 changed the title ~~develop_FW-866 OpenRadio interface~~ (Legacy) develop_FW-866 OpenRadio interface Aug 6, 2020

		@@ -1,119 +1,63 @@
		/**
		\brief This program shows the use of the "radio" bsp module.

		@@ -1,16 +1,13 @@
		/**
		\brief This program shows the use of the "radio" bsp module.

Uh oh!

Conversation

minarady1 commented Mar 10, 2020

Uh oh!

fjmolinas commented Apr 17, 2020

Uh oh!

fjmolinas Apr 17, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

minarady1 commented Apr 23, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

twatteyne commented Apr 24, 2020

Uh oh!

twatteyne left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

minarady1 Apr 24, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

minarady1 Apr 24, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

changtengfei left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

fjmolinas Apr 17, 2020 •

edited

Loading

minarady1 commented Apr 23, 2020 •

edited

Loading

minarady1 Apr 24, 2020 •

edited

Loading

minarady1 Apr 24, 2020 •

edited

Loading