Merge pull request #13444 from artokin/nanostack_release_12_4_0_fea_wisun

[feature-wisun] Nanostack release v12.4.0

Author: Arto Kinnunen

components/802.15.4_RF/atmel-rf-driver/source/AT86RF215Reg.h

@@ -97,6 +97,9 @@ extern "C" {
 // RF_PAC
 #define TXPWR                       0x1F
 #define TXPWR_11                    (11 << 0)
+#define TXPWR_0                     (0 << 0)
+#define TXPWR_31                    (31 << 0)
+
 
 // RF_PADFE
 #define PADFE                       0xC0
@@ -165,6 +168,9 @@ extern "C" {
 #define SR_2                        (2 << 0)
 #define SR_1                        (1 << 0)
 
+// BBC_FSKPHRTX
+#define DW                          (1 << 2)
+
 // BBC_OFDMPHRTX
 #define MCS                         0x07
 #define MCS_0                       (0 << 0)

components/802.15.4_RF/atmel-rf-driver/source/NanostackRfPhyAT86RF215.cpp

@@ -103,6 +103,7 @@ static int rf_set_fsk_symbol_rate_configuration(uint32_t symbol_rate, rf_modules
 static int rf_configure_by_ofdm_bandwidth_option(uint8_t option, uint32_t data_rate, rf_modules_e module);
 static void rf_calculate_symbol_rate(uint32_t baudrate, phy_modulation_e modulation);
 static void rf_conf_set_cca_threshold(uint8_t percent);
+static bool rf_conf_set_tx_power(uint8_t percent);
 // Defined register read/write functions
 #define rf_read_bbc_register(x, y) rf_read_rf_register(x, (rf_modules_e)(y + 2))
 #define rf_read_common_register(x) rf_read_rf_register(x, COMMON)
@@ -134,7 +135,10 @@ static uint8_t bbc0_irq_mask = 0;
 static uint8_t bbc1_irq_mask = 0;
 
 static bool rf_update_config = false;
+static bool rf_update_tx_power = false;
 static int8_t cca_threshold = -80;
+static uint8_t rf_tx_power = TXPWR_31;
+static bool data_whitening_enabled = true;
 static bool cca_enabled = true;
 static uint32_t rf_symbol_rate;
 
@@ -303,9 +307,25 @@ static int8_t rf_extension(phy_extension_type_e extension_type, uint8_t *data_pt
         case PHY_EXTENSION_SET_CCA_THRESHOLD:
             rf_conf_set_cca_threshold(*data_ptr);
             break;
+        case PHY_EXTENSION_SET_TX_POWER:
+            if (*data_ptr > 100) {
+                return -1;
+            }
+            rf_update_tx_power = rf_conf_set_tx_power(*data_ptr);
+            if (rf_update_tx_power && (rf_state == RF_IDLE)) {
+                rf_receive(rf_rx_channel, rf_module);
+            }
+            break;
         case PHY_EXTENSION_SET_CHANNEL_CCA_THRESHOLD:
             cca_threshold = (int8_t) *data_ptr; // *NOPAD*
             break;
+        case PHY_EXTENSION_SET_DATA_WHITENING:
+            data_whitening_enabled = (bool) *data_ptr; // *NOPAD*
+            rf_update_config = true;
+            if (rf_state == RF_IDLE) {
+                rf_receive(rf_rx_channel, rf_module);
+            }
+            break;
         case PHY_EXTENSION_SET_802_15_4_MODE:
             mac_mode = (phy_802_15_4_mode_t) *data_ptr; // *NOPAD*
             if (mac_mode == IEEE_802_15_4_2011) {
@@ -418,6 +438,12 @@ static void rf_init_registers(rf_modules_e module)
         rf_write_bbc_register_field(BBC_AFC0, module, AFEN0, 0);
         // Enable FSK
         if (phy_current_config.modulation == M_2FSK) {
+            // Enable or disable data whitening
+            if (data_whitening_enabled) {
+                rf_write_bbc_register_field(BBC_FSKPHRTX, module, DW, DW);
+            } else {
+                rf_write_bbc_register_field(BBC_FSKPHRTX, module, DW, 0);
+            }
             rf_write_bbc_register_field(BBC_PC, module, PT, BB_MRFSK);
             // Set bandwidth time product
             rf_write_bbc_register_field(BBC_FSKC0, module, BT, BT_20);
@@ -474,8 +500,10 @@ static void rf_init_registers(rf_modules_e module)
         // Enable external front end with configuration 3
         rf_write_rf_register_field(RF_PADFE, module, PADFE, RF_FEMODE3);
         // Output power at 900MHz: 0 dBm with FSK/QPSK, less than -5 dBm with OFDM
-        rf_write_rf_register_field(RF_PAC, module, TXPWR, TXPWR_11);
+        rf_tx_power = TXPWR_11;
     }
+    // Set TX output power
+    rf_write_rf_register_field(RF_PAC, module, TXPWR, rf_tx_power);
     // Enable analog voltage regulator
     rf_write_rf_register_field(RF_AUXS, module, AVEN, AVEN);
     // Disable filtering FCS
@@ -695,7 +723,7 @@ static void rf_handle_rx_start(void)
 
 static void rf_receive(uint16_t rx_channel, rf_modules_e module)
 {
-    if ((receiver_enabled == true) && (rf_update_config == false) && (rx_channel == rf_rx_channel)) {
+    if ((receiver_enabled == true) && (rf_update_config == false) && (rf_update_tx_power == false) && (rx_channel == rf_rx_channel)) {
         return;
     }
     TEST_RX_DONE
@@ -706,6 +734,12 @@ static void rf_receive(uint16_t rx_channel, rf_modules_e module)
         rf_init_registers(module);
         rf_change_state(RF_TXPREP, module);
     }
+    if (rf_update_tx_power == true) {
+        rf_update_tx_power = false;
+        rf_change_state(RF_TRX_OFF, module);
+        rf_write_rf_register_field(RF_PAC, module, TXPWR, rf_tx_power);
+        rf_change_state(RF_TXPREP, module);
+    }
     if (rx_channel != rf_rx_channel) {
         rf_change_state(RF_TXPREP, module);
         rf_set_channel(rx_channel, module);
@@ -1170,6 +1204,17 @@ static void rf_conf_set_cca_threshold(uint8_t percent)
     cca_threshold = MIN_CCA_THRESHOLD + (step * percent) / 100;
 }
 
+static bool rf_conf_set_tx_power(uint8_t percent)
+{
+    uint8_t step = (TXPWR_31 - TXPWR_0);
+    uint8_t new_value = TXPWR_0 + (step * percent) / 100;
+    if (rf_tx_power != new_value) {
+        rf_tx_power = new_value;
+        return true;
+    }
+    return false;
+}
+
 static void rf_calculate_symbol_rate(uint32_t baudrate, phy_modulation_e modulation)
 {
     uint8_t bits_in_symbols = 4;

components/802.15.4_RF/stm-s2lp-rf-driver/source/NanostackRfPhys2lp.cpp

@@ -1328,7 +1328,7 @@ NanostackRfPhys2lp::NanostackRfPhys2lp(PinName spi_sdi, PinName spi_sdo, PinName
 #ifdef AT24MAC
     _mac(i2c_sda, i2c_scl),
 #endif //AT24MAC
-    _mac_addr(), _rf(NULL), _mac_set(false),
+    _mac_addr(), _rf(NULL), _test_pins(NULL), _mac_set(false),
     _spi_sdi(spi_sdi), _spi_sdo(spi_sdo), _spi_sclk(spi_sclk), _spi_cs(spi_cs), _spi_sdn(spi_sdn),
     _spi_gpio0(spi_gpio0), _spi_gpio1(spi_gpio1), _spi_gpio2(spi_gpio2), _spi_gpio3(spi_gpio3)
 {

features/frameworks/mbed-trace/README.md

@@ -26,7 +26,7 @@ The purpose of the library is to provide a light, simple and general tracing sol
 * The trace function uses `stdout` as the default output target because it goes directly to serial port in mbed-os.
 * The trace function produces traces like: `[<levl>][grp ]: msg`. This provides an easy way to detect trace prints and separate traces from normal prints (for example with _regex_).
 * This approach requires a `sprintf` implementation (`stdio.h`). The memory consumption is pretty high, but it allows an efficient way to format traces.
-* The solution is not Interrupt safe. (PRs are more than welcome.)
+* The solution is not Interrupt safe. ([PRs](https://github.com/ARMmbed/mbed-trace/pulls) are more than welcome.)
 * The solution is not thread safe by default. Thread safety for the actual trace calls can be enabled by providing wait and release callback functions that use mutexes defined by the application.
 
 ## Examples of traces
@@ -43,7 +43,7 @@ The purpose of the library is to provide a light, simple and general tracing sol
 ### Prerequisites
 
 * Initialize the serial port so that `stdout` works. You can verify that the serial port works using the `printf()` function.
-    * if you want to redirect the traces somewhere else, see the [trace API](https://github.com/ARMmbed/mbed-trace/blob/master/mbed-trace/mbed_trace.h#L245).
+    * If you want to redirect the traces somewhere else, see the [trace API](https://github.com/ARMmbed/mbed-trace/blob/master/mbed-trace/mbed_trace.h#L245).
 * To enable the tracing API:
     * With yotta: set `YOTTA_CFG_MBED_TRACE` to 1 or true. Setting the flag to 0 or false disables tracing.
     * [With mbed OS 5](#enabling-the-tracing-api-in-mbed-os-5)
@@ -54,7 +54,7 @@ The purpose of the library is to provide a light, simple and general tracing sol
 * If thread safety is needed, configure the wait and release callback functions before initialization to enable the protection. Usually, this needs to be done only once in the application's lifetime.
     * If [helping functions](#helping-functions) are used the mutex must be **recursive** (counting) so it can be acquired from a single thread repeatedly.
 * Call the trace initialization (`mbed_trace_init`) once before using any other APIs. It allocates the trace buffer and initializes the internal variables.
-* Define `TRACE_GROUP` in your source code (not in the header!) to use traces. It is a 1-4 characters long char-array (for example `#define TRACE_GROUP "APPL"`). This will be printed on every trace line.
+* Define `TRACE_GROUP` in your **source code (not in the header)** to use traces. It is a 1-4 characters long char-array (for example `#define TRACE_GROUP "APPL"`). This will be printed on every trace line.
 
 ### Enabling the tracing API in mbed OS 5
 
@@ -72,7 +72,7 @@ To do so, add the following to your mbed_app.json:
 }
 ```
 
-Don't forget to fulfill the other [prerequisites](#prerequisites)!
+Do not forget to fulfill the other [prerequisites](#prerequisites)!
 
 ([Click here for more information on the configuration system](https://docs.mbed.com/docs/mbed-os-api/en/latest/config_system/))
 
@@ -204,6 +204,52 @@ int main(void){
 }
 ```
 
+## Run-time trace group filtering
+
+The trace groups you have defined using the `TRACE_GROUP` macro in your .c/.cpp files can be used to control tracing at run-time.
+
+| Function                          | Explanation                                                  |
+|-----------------------------------|--------------------------------------------------------------|
+|`mbed_trace_include_filters_get()` | Get the exclusion filter list string.                        |
+|`mbed_trace_include_filters_set()` | Set trace list to include only the traces matching the list. |
+|`mbed_trace_exclude_filters_get()` | Get the inclusion filter list string.                        |
+|`mbed_trace_exclude_filters_set()` | Set trace list to exclude the traces matching the list.      |
+
+The filter list is a null terminated string of comma (`,`) separated trace group names. The default maximum length of the string is 24 characters, including the terminating null. Length can be changed by defining the macro `DEFAULT_TRACE_FILTER_LENGTH`. Exclude and include filters can be combined freely as they both have their own filtering list.
+
+The matching is done simply using `strstr()` from  C standard libraries.
+
+### Examples of trace group filtering
+
+Assuming we have 4 modules called "MAIN", "HELP", "CALC" and "PRNT" we could use the filters in the following ways.
+
+#### Inclusion filter
+
+To include only "MAIN" and "CALC" traces to the trace prints, we can do:
+
+```
+    mbed_trace_include_filters_set("MAIN,CALC");
+```
+
+This would print out only the traces from "MAIN" and "CALC", since they are the trace groups matching the filter list. Trace groups "HELP" and "PRNT" would not be printed out at all.
+
+## Exclusion filter
+
+```
+    mbed_trace_exclude_filters_set("HELP,PRNT");
+```
+
+This would exclue trace groups "HELP" and "PRNT" out of trace printing, thus leaving only prints from "MAIN" and "CALC" visible in the tracing.
+
+### Reset filter
+
+```
+    mbed_trace_include_filters_set(NULL);
+```
+
+This would reset the inclusion filters back to nothing and assuming no exclusion filter is in place either, all trace groups prints would get printed.
+
+
 ## Unit tests
 
 To run unit tests:

features/frameworks/nanostack-libservice/mbed-client-libservice/ns_list.h

@@ -23,8 +23,18 @@
 extern "C" {
 #endif
 
+/** \defgroup ns_list Linked list support library.
+ *
+ * The ns_list.h file provides a doubly-linked list/queue, providing O(1)
+ * performance for all insertion/removal operations, and access to either
+ * end of the list.
+ *
+ * See \ref ns_list.h for documentation.
+ */
+
 /** \file
- * \brief Linked list support library
+ * \ingroup ns_list
+ * \brief Linked list support library.
  *
  * The ns_list.h file provides a doubly-linked list/queue, providing O(1)
  * performance for all insertion/removal operations, and access to either

features/nanostack/sal-stack-nanostack-eventloop/Makefile

@@ -1,3 +1,5 @@
+# Copyright (c) 2019 ARM Limited
+# SPDX-License-Identifier: Apache-2.0
 # Define compiler toolchain with CC or PLATFORM variables
 # Example (GCC toolchains)
 # make PLATFORM=arm-linux-gnueabi-