Datarate bug fix in rx windows configs

Hasnain Virk · Hasnain Virk · commit ac6fb71c909c · 2018-05-08T16:45:26.000+03:00
While configuring RX parameters for the radio, we need to feed in
rx windows 1 and 2 parameters which are computed when we do the transmission.
We are actually setting the physical value of the data rate rather than
data rate table index and the expectation was to set the data rate index.
diff --git a/features/lorawan/lorastack/mac/LoRaMac.cpp b/features/lorawan/lorastack/mac/LoRaMac.cpp
@@ -872,8 +872,8 @@ void LoRaMac::open_rx1_window(void)
         _lora_phy.put_radio_to_standby();
     }
 
-    _lora_phy.rx_config(&_params.rx_window1_config,
-                        (int8_t*) &_mcps_indication.rx_datarate);
+    _mcps_indication.rx_datarate = _params.rx_window1_config.datarate;
+    _lora_phy.rx_config(&_params.rx_window1_config);
 
     _lora_phy.setup_rx_window(_params.rx_window1_config.is_rx_continuous,
                               _params.sys_params.max_rx_win_time);
@@ -892,8 +892,9 @@ void LoRaMac::open_rx2_window()
 
     _params.rx_window2_config.is_rx_continuous = get_device_class()==CLASS_C ? true : false;
 
-    if (_lora_phy.rx_config(&_params.rx_window2_config,
-                            (int8_t*) &_mcps_indication.rx_datarate) == true) {
+    _mcps_indication.rx_datarate = _params.rx_window2_config.datarate;
+
+    if (_lora_phy.rx_config(&_params.rx_window2_config)) {
 
         _lora_phy.setup_rx_window(_params.rx_window2_config.is_rx_continuous,
                                   _params.sys_params.max_rx_win_time);
diff --git a/features/lorawan/lorastack/phy/LoRaPHY.cpp b/features/lorawan/lorastack/phy/LoRaPHY.cpp
@@ -808,7 +808,7 @@ void LoRaPHY::compute_rx_win_params(int8_t datarate, uint8_t min_rx_symbols,
                          &rx_conf_params->window_timeout, &rx_conf_params->window_offset);
 }
 
-bool LoRaPHY::rx_config(rx_config_params_t* rx_conf, int8_t* datarate)
+bool LoRaPHY::rx_config(rx_config_params_t* rx_conf)
 {
     radio_modems_t modem;
     uint8_t dr = rx_conf->datarate;
@@ -868,8 +868,6 @@ bool LoRaPHY::rx_config(rx_config_params_t* rx_conf, int8_t* datarate)
 
     _radio->unlock();
 
-    *datarate = phy_dr;
-
     return true;
 }
 
diff --git a/features/lorawan/lorastack/phy/LoRaPHY.h b/features/lorawan/lorastack/phy/LoRaPHY.h
@@ -194,11 +194,9 @@ class LoRaPHY : private mbed::NonCopyable<LoRaPHY> {
      *
      * @param [in] config    A pointer to the RX configuration.
      *
-     * @param [out] datarate The datarate index set.
-     *
      * @return True, if the configuration was applied successfully.
      */
-    virtual bool rx_config(rx_config_params_t* config, int8_t* datarate);
+    virtual bool rx_config(rx_config_params_t* config);
 
     /** Computing Receive Windows
      *
diff --git a/features/lorawan/lorastack/phy/LoRaPHYAU915.cpp b/features/lorawan/lorastack/phy/LoRaPHYAU915.cpp
@@ -335,7 +335,7 @@ LoRaPHYAU915::~LoRaPHYAU915()
 {
 }
 
-bool LoRaPHYAU915::rx_config(rx_config_params_t* params, int8_t* datarate)
+bool LoRaPHYAU915::rx_config(rx_config_params_t* params)
 {
     int8_t dr = params->datarate;
     uint8_t max_payload = 0;
@@ -374,7 +374,6 @@ bool LoRaPHYAU915::rx_config(rx_config_params_t* params, int8_t* datarate)
 
     _radio->unlock();
 
-    *datarate = (uint8_t) dr;
     return true;
 }
 
diff --git a/features/lorawan/lorastack/phy/LoRaPHYAU915.h b/features/lorawan/lorastack/phy/LoRaPHYAU915.h
@@ -56,7 +56,7 @@ class LoRaPHYAU915 : public LoRaPHY{
     LoRaPHYAU915(LoRaWANTimeHandler &lora_time);
     virtual ~LoRaPHYAU915();
 
-    virtual bool rx_config(rx_config_params_t* config, int8_t* datarate);
+    virtual bool rx_config(rx_config_params_t* config);
 
     virtual bool tx_config(tx_config_params_t* config, int8_t* txPower,
                            lorawan_time_t* txTimeOnAir);
diff --git a/features/lorawan/lorastack/phy/LoRaPHYCN470.cpp b/features/lorawan/lorastack/phy/LoRaPHYCN470.cpp
@@ -303,7 +303,7 @@ LoRaPHYCN470::~LoRaPHYCN470()
 {
 }
 
-bool LoRaPHYCN470::rx_config(rx_config_params_t* config, int8_t* datarate)
+bool LoRaPHYCN470::rx_config(rx_config_params_t* config)
 {
     int8_t dr = config->datarate;
     uint8_t max_payload = 0;
@@ -349,7 +349,6 @@ bool LoRaPHYCN470::rx_config(rx_config_params_t* config, int8_t* datarate)
     _radio->set_max_payload_length(MODEM_LORA, max_payload + LORA_MAC_FRMPAYLOAD_OVERHEAD);
     _radio->unlock();
 
-    *datarate = (uint8_t) dr;
     return true;
 }
 
diff --git a/features/lorawan/lorastack/phy/LoRaPHYCN470.h b/features/lorawan/lorastack/phy/LoRaPHYCN470.h
@@ -56,7 +56,7 @@ class LoRaPHYCN470 : public LoRaPHY {
     LoRaPHYCN470(LoRaWANTimeHandler &lora_time);
     virtual ~LoRaPHYCN470();
 
-    virtual bool rx_config(rx_config_params_t* config, int8_t* datarate );
+    virtual bool rx_config(rx_config_params_t* config);
 
     virtual bool tx_config(tx_config_params_t* config, int8_t* tx_power,
                            lorawan_time_t* tx_toa);
diff --git a/features/lorawan/lorastack/phy/LoRaPHYUS915.cpp b/features/lorawan/lorastack/phy/LoRaPHYUS915.cpp
@@ -353,7 +353,7 @@ void LoRaPHYUS915::restore_default_channels()
     }
 }
 
-bool LoRaPHYUS915::rx_config(rx_config_params_t* config, int8_t* datarate)
+bool LoRaPHYUS915::rx_config(rx_config_params_t* config)
 {
     int8_t dr = config->datarate;
     uint8_t max_payload = 0;
@@ -409,7 +409,6 @@ bool LoRaPHYUS915::rx_config(rx_config_params_t* config, int8_t* datarate)
 
     _radio->unlock();
 
-    *datarate = (uint8_t) dr;
     return true;
 }
 
diff --git a/features/lorawan/lorastack/phy/LoRaPHYUS915.h b/features/lorawan/lorastack/phy/LoRaPHYUS915.h
@@ -56,7 +56,7 @@ class LoRaPHYUS915 : public LoRaPHY {
 
     virtual void restore_default_channels();
 
-    virtual bool rx_config(rx_config_params_t* config, int8_t* datarate);
+    virtual bool rx_config(rx_config_params_t* config);
 
     virtual bool tx_config(tx_config_params_t* config, int8_t* tx_power,
                            lorawan_time_t* tx_toa);
diff --git a/features/lorawan/lorastack/phy/LoRaPHYUS915Hybrid.cpp b/features/lorawan/lorastack/phy/LoRaPHYUS915Hybrid.cpp
@@ -369,7 +369,7 @@ bool LoRaPHYUS915Hybrid::get_next_ADR(bool restore_channel_mask, int8_t& dr_out,
     return adrAckReq;
 }
 
-bool LoRaPHYUS915Hybrid::rx_config(rx_config_params_t* config, int8_t* datarate)
+bool LoRaPHYUS915Hybrid::rx_config(rx_config_params_t* config)
 {
     int8_t dr = config->datarate;
     uint8_t max_payload = 0;
@@ -416,7 +416,6 @@ bool LoRaPHYUS915Hybrid::rx_config(rx_config_params_t* config, int8_t* datarate)
     _radio->set_max_payload_length(MODEM_LORA, max_payload + LORA_MAC_FRMPAYLOAD_OVERHEAD);
     _radio->unlock();
 
-    *datarate = (uint8_t) dr;
     return true;
 }
 
diff --git a/features/lorawan/lorastack/phy/LoRaPHYUS915Hybrid.h b/features/lorawan/lorastack/phy/LoRaPHYUS915Hybrid.h
@@ -59,7 +59,7 @@ class LoRaPHYUS915Hybrid : public LoRaPHY {
     virtual bool get_next_ADR(bool restore_channel_mask, int8_t& dr_out,
                               int8_t& tx_power_out, uint32_t& adr_ack_cnt);
 
-    virtual bool rx_config(rx_config_params_t* rxConfig, int8_t* datarate);
+    virtual bool rx_config(rx_config_params_t* rxConfig);
 
     virtual bool tx_config(tx_config_params_t* tx_config, int8_t* tx_power,
                                 lorawan_time_t* tx_toa);
diff --git a/features/lorawan/system/lorawan_data_structures.h b/features/lorawan/system/lorawan_data_structures.h
@@ -1005,7 +1005,7 @@ typedef struct {
      */
     uint8_t channel;
     /*!
-     * The RX datarate.
+     * The RX datarate index.
      */
     uint8_t datarate;
     /*!

Original file line number	Diff line number	Diff line change
`@@ -808,7 +808,7 @@ void LoRaPHY::compute_rx_win_params(int8_t datarate, uint8_t min_rx_symbols,`
`808`	`808`	`&rx_conf_params->window_timeout, &rx_conf_params->window_offset);`
`809`	`809`	`}`
`810`	`810`
`811`		`-bool LoRaPHY::rx_config(rx_config_params_t* rx_conf, int8_t* datarate)`
	`811`	`+bool LoRaPHY::rx_config(rx_config_params_t* rx_conf)`
`812`	`812`	`{`
`813`	`813`	`radio_modems_t modem;`
`814`	`814`	`uint8_t dr = rx_conf->datarate;`
`@@ -868,8 +868,6 @@ bool LoRaPHY::rx_config(rx_config_params_t* rx_conf, int8_t* datarate)`
`868`	`868`
`869`	`869`	`_radio->unlock();`
`870`	`870`
`871`		`- *datarate = phy_dr;`
`872`		`-`
`873`	`871`	`return true;`
`874`	`872`	`}`
`875`	`873`
Original file line number	Diff line number	Diff line change
`@@ -194,11 +194,9 @@ class LoRaPHY : private mbed::NonCopyable<LoRaPHY> {`
`194`	`194`	`*`
`195`	`195`	`* @param [in] config A pointer to the RX configuration.`
`196`	`196`	`*`
`197`		`- * @param [out] datarate The datarate index set.`
`198`		`- *`
`199`	`197`	`* @return True, if the configuration was applied successfully.`
`200`	`198`	`*/`
`201`		`- virtual bool rx_config(rx_config_params_t* config, int8_t* datarate);`
	`199`	`+ virtual bool rx_config(rx_config_params_t* config);`
`202`	`200`
`203`	`201`	`/** Computing Receive Windows`
`204`	`202`	`*`
Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ LoRaPHYAU915::~LoRaPHYAU915()`
`335`	`335`	`{`
`336`	`336`	`}`
`337`	`337`
`338`		`-bool LoRaPHYAU915::rx_config(rx_config_params_t* params, int8_t* datarate)`
	`338`	`+bool LoRaPHYAU915::rx_config(rx_config_params_t* params)`
`339`	`339`	`{`
`340`	`340`	`int8_t dr = params->datarate;`
`341`	`341`	`uint8_t max_payload = 0;`
`@@ -374,7 +374,6 @@ bool LoRaPHYAU915::rx_config(rx_config_params_t* params, int8_t* datarate)`
`374`	`374`
`375`	`375`	`_radio->unlock();`
`376`	`376`
`377`		`- *datarate = (uint8_t) dr;`
`378`	`377`	`return true;`
`379`	`378`	`}`
`380`	`379`
Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,7 @@ LoRaPHYCN470::~LoRaPHYCN470()`
`303`	`303`	`{`
`304`	`304`	`}`
`305`	`305`
`306`		`-bool LoRaPHYCN470::rx_config(rx_config_params_t* config, int8_t* datarate)`
	`306`	`+bool LoRaPHYCN470::rx_config(rx_config_params_t* config)`
`307`	`307`	`{`
`308`	`308`	`int8_t dr = config->datarate;`
`309`	`309`	`uint8_t max_payload = 0;`
`@@ -349,7 +349,6 @@ bool LoRaPHYCN470::rx_config(rx_config_params_t* config, int8_t* datarate)`
`349`	`349`	`_radio->set_max_payload_length(MODEM_LORA, max_payload + LORA_MAC_FRMPAYLOAD_OVERHEAD);`
`350`	`350`	`_radio->unlock();`
`351`	`351`
`352`		`- *datarate = (uint8_t) dr;`
`353`	`352`	`return true;`
`354`	`353`	`}`
`355`	`354`
Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,7 @@ void LoRaPHYUS915::restore_default_channels()`
`353`	`353`	`}`
`354`	`354`	`}`
`355`	`355`
`356`		`-bool LoRaPHYUS915::rx_config(rx_config_params_t* config, int8_t* datarate)`
	`356`	`+bool LoRaPHYUS915::rx_config(rx_config_params_t* config)`
`357`	`357`	`{`
`358`	`358`	`int8_t dr = config->datarate;`
`359`	`359`	`uint8_t max_payload = 0;`
`@@ -409,7 +409,6 @@ bool LoRaPHYUS915::rx_config(rx_config_params_t* config, int8_t* datarate)`
`409`	`409`
`410`	`410`	`_radio->unlock();`
`411`	`411`
`412`		`- *datarate = (uint8_t) dr;`
`413`	`412`	`return true;`
`414`	`413`	`}`
`415`	`414`
Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,7 @@ bool LoRaPHYUS915Hybrid::get_next_ADR(bool restore_channel_mask, int8_t& dr_out,`
`369`	`369`	`return adrAckReq;`
`370`	`370`	`}`
`371`	`371`
`372`		`-bool LoRaPHYUS915Hybrid::rx_config(rx_config_params_t* config, int8_t* datarate)`
	`372`	`+bool LoRaPHYUS915Hybrid::rx_config(rx_config_params_t* config)`
`373`	`373`	`{`
`374`	`374`	`int8_t dr = config->datarate;`
`375`	`375`	`uint8_t max_payload = 0;`
`@@ -416,7 +416,6 @@ bool LoRaPHYUS915Hybrid::rx_config(rx_config_params_t* config, int8_t* datarate)`
`416`	`416`	`_radio->set_max_payload_length(MODEM_LORA, max_payload + LORA_MAC_FRMPAYLOAD_OVERHEAD);`
`417`	`417`	`_radio->unlock();`
`418`	`418`
`419`		`- *datarate = (uint8_t) dr;`
`420`	`419`	`return true;`
`421`	`420`	`}`
`422`	`421`