Develop fw 708 2sfk50 40msTS by jmmunoz86 · Pull Request #444 · openwsn-berkeley/openwsn-fw

jmmunoz86 · 2018-10-17T16:15:33Z

this provides the timeslot timing constants for the 2-FSK 50 kbps PHY.
TS is 40 ms long.

changtengfei

I left comments in the PR, please revise them.

changtengfei · 2018-10-17T16:32:43Z


 port_INLINE void activity_ti2(void) {
-
+    debugpins_frame_toggle();


shouldn't toggle this pin here.

changtengfei · 2018-10-17T16:32:53Z

    ieee154e_vars.radioOnThisSlot=TRUE;
    // change state
    changeState(S_TXDATAREADY);
+    debugpins_frame_toggle();


changtengfei · 2018-10-17T16:39:15Z

+//    5,6,12,7,15,4,14,11,8,0,1,2,13,3,9,10
+//};
+
 static const uint8_t chTemplate_default[] = {


This channelhopping sequence should move to radio_24ghz/radio_subghz.c file

changtengfei · 2018-10-17T16:41:14Z

-#define NUM_CHANNELS                16 // number of channels to channel hop on
-#define DEFAULT_CH_SPACING           1200 // default channel spacing for subghz
-#define DEFAULT_FREQUENCY_CENTER     863625 // defualt freque
+#define NUM_CHANNELS                3 // number of channels to channel hop on


num of channels should move to radio part as well

changtengfei · 2018-10-17T16:43:48Z

-#define DEFAULT_CH_SPACING           1200 // default channel spacing for subghz
-#define DEFAULT_FREQUENCY_CENTER     863625 // defualt freque
+#define NUM_CHANNELS                3 // number of channels to channel hop on
+#define DEFAULT_CH_SPACING          200 // default channel spacing for subghz


this variable could be change if using different phy layers for subghz

changtengfei · 2018-10-17T16:49:41Z

   wdAckDuration             =   80,                  //  2400us (measured 1000us)
 #else
-   wdAckDuration             =   98,                  //  3000us (measured 1000us)
+   wdAckDuration             =  260,                  //  5400us using 50 kbps


This timing variable and above are related to the PHY layer used. So they are no longer belong to IEEE802.15.4E.h file. Define those variables in radio.h files, those variables will be set according which PHY layers are used.

By fixing the length of packet to transmit:

For wdDataDuration wdAckDuration, delayTx, delayRx timing variables, they are related to the sending rate of each PHY layer.

For other timing but slotDuration, they are related the speed to access radio chip

For slotduration, it's determined both sending rate and the speed to access radio chip. So decide it at last.

changtengfei · 2018-10-17T16:50:23Z

 The superframe reappears over time and can be arbitrarily long.
 */
-#define SLOTFRAME_LENGTH    101 //should be 101
+#define SLOTFRAME_LENGTH    31 //should be 101


Does it have to be 31?

changtengfei · 2018-10-17T16:52:06Z

@@ -9,9 +9,9 @@
        <debug>1</debug>
        <settings>
            <name>C-STAT</name>
-            <archiveVersion>260</archiveVersion>
+            <archiveVersion>261</archiveVersion>


ewt file is not needed to be committed, please delete it from repository.

changtengfei · 2018-10-17T17:03:08Z

 //    }

-    msg->l2_radioType = 0;
+    msg->l2_radioType = 1;


This is a hack for debugging purpose, you can do this for now., It's better to think what the right way to determine which radioType to use.

changtengfei · 2018-10-17T17:32:41Z

+    #endif
+    #define PORT_delayRx                         0    //    0us (can not measure)
+    // radio watchdog
+#else // 40 ms


The timing below depends on which radio is used by openmote-b, those timing should be moved to radio.h files can call dynamically.

I recommend to use a fixed timing for FSK modulation, and use the timing variable for 2.4GHz and OQPSK 800kb/s as well. Only delayTx timing need to be adjust to each three PHY layers. With this, the timing part would be much easier.

radiotype defines PHYs whereas modem either sub-ghz or 2.4 ghz.

changtengfei

Please don't add new changes after the review. I left some comments, please just fix them, no more new changes added.

changtengfei · 2018-10-19T08:25:14Z

+    #define PORT_maxRxDataPrepare               30    // 1007us (measured  84us)
+    #define PORT_maxTxAckPrepare                40    //  305us (measured 219us)
+    // radio speed related
+    #define delayTx_2FSK_50                     67


The delayTx , delayRx are defined in radio_2d4ghz / radio_subghz files

changtengfei · 2018-10-19T08:26:25Z

+   MODEM_2D4GHZ          = 0,
+   MODEM_SUBGHZ          = 1,
+   FREQBAND_ANY          = 2
+} modem_t;


why create a modem type here? what the difference betwen this and the radioType

changtengfei · 2018-10-19T08:28:08Z

    funcs->radio_rfOff_cb              = radio_2d4ghz_rfOff;
    funcs->radio_setFrequency_cb       = radio_2d4ghz_setFrequency;
    funcs->radio_change_modulation_cb  = radio_2d4ghz_change_modulation;
-    funcs->radio_change_size_cb        = radio_2d4ghz_change_size;


if this callback function is not used, you need remove it from the openradio.h file as well.

Also the radio_2d4ghz_change_size function should be removed

changtengfei · 2018-10-19T08:32:22Z

 //=========================== public ==========================================
 static void radio_subghz_read_isr(void);
 static void radio_subghz_clear_isr(void);
+void config_ofdm_1_800_subGHz(void);


function should start with name radio_subghz_

changtengfei · 2018-10-19T08:34:09Z


 radio_subghz_vars_t radio_subghz_vars;

+phy_tsch_config_t              phy_tsch_config_2fsk_50_subGHz;


are those variables used in this PR?

changtengfei · 2018-10-19T08:37:41Z

+    phy_tsch_config_ofdm_1_800_subGHz.num_channels    = 5;
+
+}
+


Here is initialize the variables, when are they being used?

changtengfei · 2018-10-19T08:39:36Z

-static const registerSetting_t basic_settings_fsk_option1 []={
+
+
+static const registerSetting_t basic_settings_fsk_option1_subghz []={


why rename it?

changtengfei · 2018-10-19T08:43:13Z

                <option>
                    <name>OCLastSavedByProductVersion</name>
-                    <state>8.11.1.13270</state>
+                    <state>8.20.1.14181</state>


the project file changes shouldn't commit

changtengfei · 2018-10-19T08:44:07Z

                <option>
                    <name>OGLastSavedByProductVersion</name>
-                    <state>8.11.1.13270</state>
+                    <state>8.20.1.14181</state>


the project file changes like version shouldn't commit.

Creates the addr_16b_t and addr_64b_t, containing the addresses and the radioType item.

# Conflicts: # bsp/boards/openmote-b/board_info.h

Same device with X radios is seen as X neighbors.

use a different radioType for consecutive EBs. If radioType is 0 (2.4ghz), make sure it is used radioType 1 (OFDM).

Consider the radioType when updating the rank in the neighbor table.

… radio.

AT86RF215 goes to TXPREP after receiving a frame. After receiving a frame, putting the radio back to listen.

radio keeps listening despite the RXFE ISR. No need to reload the RXFS and RXFE callbacks.

changtengfei · 2019-10-03T12:27:26Z

Can one of the admins verify this patch?

jmmunoz86 added 14 commits September 11, 2018 11:34

using 2fsk-50 kbps

fab04fd

update config 2-fsk 50kbps

40c3b58

def TS 40 ms

27c95f2

using 2-fsk 50 kbps

624449b

using only sub-GHz interface

79336db

TS 40 ms

ad8f24c

modif slotframe length to 31 TS

904fd34

using radiotype = 1 (sub-GHz)

edf69f9

update project 40 ms TS

8cfe8eb

timing for 2fsk50kbps.

51571fb

2fsk-50 CH with 2 ch

108e7f6

optimize timeslot 2fsk-50 kbps

2568331

timeslot of 40 ms. One PHY, subGHz.

48a0581

2fsk timing OK.

9313be0

jmmunoz86 requested a review from changtengfei October 17, 2018 16:15

changtengfei requested changes Oct 17, 2018

View reviewed changes

jmmunoz86 added 2 commits October 18, 2018 11:49

refactoring: changing radiotype for modem.

d4973c1

radiotype defines PHYs whereas modem either sub-ghz or 2.4 ghz.

refactoring and cleaning

d28132a

changtengfei requested changes Oct 19, 2018

View reviewed changes

jmmunoz86 added 11 commits October 21, 2018 23:47

adding timing for 3 PHYs

074bf13

corrected TsTxOffset. SPI config happens at the beginning of each TS.

55795d4

changed startup_iar.c, flashing with IAR and scons both working

d2f68d3

OpenWSN working with only OFDM1, TS 40 ms

98ed0f0

modifies the open_addr_t struct.

f6466bd

Creates the addr_16b_t and addr_64b_t, containing the addresses and the radioType item.

Merge branch 'develop_fw-708-2fsk_OFDM1' into develop_FW-708_2sfk50_40ms

db8a1cc

Slotframe of 33 TS. faster synch.

abb9737

Merge branch 'develop_FW-708_OFDM1_40ms' into develop_FW-708_2sfk50_40ms

d70cef5

# Conflicts: # bsp/boards/openmote-b/board_info.h

added radioType to neighbors.

58969b9

Same device with X radios is seen as X neighbors.

return parent address and radioType

15cc4cb

assign the radioType on which the 6p transaction will take place.

bb2ef57

use a different radioType for consecutive EBs. If radioType is 0 (2.4ghz), make sure it is used radioType 1 (OFDM).

jmmunoz86 added 12 commits November 2, 2018 11:14

Not nice workaround to use a different radioType for consecutive DIOs.

bca732e

Consider the radioType when updating the rank in the neighbor table.

send DAO on the correct radioType

685a029

Increase maxTxDataPrepare to allow long packets to be loaded into the…

d4837af

… radio.

casting to correct type (radioType)

3ea9a0c

MAX output power

407c2eb

EB sent on each PHY

504d4eb

send DIO on each radioType available

2706919

SLOTFRAME_LENGTH of 101 TS

5fb0705

adding radioType criterion to neighbors

ee08839

Configuring the front end radio at synch time.

1259f7b

function to read the state of the radio.

459b811

AT86RF215 goes to TXPREP after receiving a frame. After receiving a frame, putting the radio back to listen.

delayTX of OFDM (synch with this PHY).

ceb53fb

radio keeps listening despite the RXFE ISR. No need to reload the RXFS and RXFE callbacks.


		port_INLINE void activity_ti2(void) {

		debugpins_frame_toggle();


		radio_subghz_vars_t radio_subghz_vars;

		phy_tsch_config_t phy_tsch_config_2fsk_50_subGHz;

		static const registerSetting_t basic_settings_fsk_option1 []={


		static const registerSetting_t basic_settings_fsk_option1_subghz []={

Uh oh!

Conversation

jmmunoz86 commented Oct 17, 2018

Uh oh!

changtengfei left a comment

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!

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!

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!

changtengfei left a comment

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!

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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

changtengfei commented Oct 3, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants