Fix some issues with mesh network code building

Author: multiplemonomials

connectivity/drivers/802.15.4_RF/CMakeLists.txt

@@ -9,6 +9,9 @@ macro(create_mbed_802_15_4_target)
 		# Nanostack drivers always require Mbed RTOS
 		target_link_libraries(mbed-802.15.4-rf PUBLIC mbed-core-flags mbed-rtos-flags)
 
+		# For NanostackRfPhy.h
+		target_link_libraries(mbed-802.15.4-rf PUBLIC mbed-nanostack)
+
 		target_link_libraries(mbed-nanostack
 		    INTERFACE
 		        mbed-802.15.4-rf

connectivity/nanostack/mbed-mesh-api/CMakeLists.txt

@@ -34,8 +34,13 @@ target_link_libraries(mbed-nanostack-mbed_mesh_api
     PUBLIC
         mbed-nanostack-hal_mbed_cmsis_rtos
         mbed-nanostack-sal_stack
+		mbed-nanostack
         mbed-netsocket-api
         mbed-core-flags
     PRIVATE
         mbed-rtos-flags
 )
+
+# Since there are a lot of circular references between this library and mbed-netsocket-api,
+# we have to have CMake repeat the libraries on the link line multiple times.
+set_property(TARGET mbed-nanostack-mbed_mesh_api PROPERTY LINK_INTERFACE_MULTIPLICITY 3)

connectivity/netsocket/CMakeLists.txt

@@ -69,6 +69,12 @@ if("MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE=CELLULAR" IN_LIST MBED_CONFI
     target_link_libraries(mbed-netsocket-api PUBLIC mbed-cellular)
 endif()
 
+# Similarly if mesh networking is used bring in that library
+if("MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE=MESH" IN_LIST MBED_CONFIG_DEFINITIONS)
+    target_link_libraries(mbed-netsocket-api PUBLIC mbed-nanostack-mbed_mesh_api)
+endif()
+
+
 if("DEVICE_EMAC=1" IN_LIST MBED_TARGET_DEFINITIONS)
     target_link_libraries(mbed-netsocket-api
         INTERFACE

connectivity/netsocket/tests/TESTS/netsocket/udp/main.cpp

@@ -73,7 +73,7 @@ static void _ifup()
 #if MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == MESH
     tr_info("Waiting for GLOBAL_UP\n");
     while (net->get_connection_status() != NSAPI_STATUS_GLOBAL_UP) {
-        ThisThread::sleep_for(500);
+        ThisThread::sleep_for(500ms);
     }
 #endif
     tr_info("MBED: UDPClient IP address is '%s'\n", address ? address.get_ip_address() : "null");

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW41Z/TARGET_FRDM/PinNames.h

@@ -64,55 +64,49 @@ typedef enum {
     LED_GREEN = PTA19,
     LED_BLUE  = PTA18,
 
-    // mbed original LED naming
-    LED1 = LED_RED,
-    LED2 = LED_GREEN,
-    LED3 = LED_BLUE,
-    LED4 = LED_RED,
-
-    //Push buttons
-    SW3 = PTC4,
-    SW4 = PTC5,
-    // Standardized button names
-    BUTTON1 = SW3,
-    BUTTON2 = SW4,
+    // LEDs and buttons
+#define LED1 PTC1
+#define LED2 PTA19
+#define LED3 PTA18
+
+#define BUTTON1 PTC4
+#define BUTTON2 PTC5
 
     // USB Pins
     CONSOLE_TX = PTC7,
     CONSOLE_RX = PTC6,
 
+    // Not connected
+    NC = (int)0xFFFFFFFF,
+
+#ifdef TARGET_FF_ARDUINO_UNO
     // Arduino Headers
-    D0 = PTC6,
-    D1 = PTC7,
-    D2 = PTC19,
-    D3 = PTC16,
-    D4 = PTC4,
-    D5 = PTC17,
-    D6 = PTC18,
-    D7 = PTA1,
-    D8 = PTA0,
-    D9 = PTC1,
-    D10 = PTA19,
-    D11 = PTA16,
-    D12 = PTA17,
-    D13 = PTA18,
-    D14 = PTC3,
-    D15 = PTC2,
-
-    I2C_SCL = D15,
-    I2C_SDA = D14,
-
-    DAC0_OUT = PTB18,
-
-    A0 = (int)0xFFFFFFFF,
-    A1 = DAC0_OUT,
-    A2 = PTB2,
-    A3 = PTB3,
-    A4 = PTB1,
-    A5 = PTB0,
+    ARDUINO_UNO_D0 = PTC6,
+    ARDUINO_UNO_D1 = PTC7,
+    ARDUINO_UNO_D2 = PTC19,
+    ARDUINO_UNO_D3 = PTC16,
+    ARDUINO_UNO_D4 = PTC4,
+    ARDUINO_UNO_D5 = PTC17,
+    ARDUINO_UNO_D6 = PTC18,
+    ARDUINO_UNO_D7 = PTA1,
+    ARDUINO_UNO_D8 = PTA0,
+    ARDUINO_UNO_D9 = PTC1,
+    ARDUINO_UNO_D10 = PTA19,
+    ARDUINO_UNO_D11 = PTA16,
+    ARDUINO_UNO_D12 = PTA17,
+    ARDUINO_UNO_D13 = PTA18,
+    ARDUINO_UNO_D14 = PTC3,
+    ARDUINO_UNO_D15 = PTC2,
+
+    ARDUINO_UNO_A0 = NC,
+    ARDUINO_UNO_A1 = PTB18,
+    ARDUINO_UNO_A2 = PTB2,
+    ARDUINO_UNO_A3 = PTB3,
+    ARDUINO_UNO_A4 = PTB1,
+    ARDUINO_UNO_A5 = PTB0,
+#endif
 
-    // Not connected
-    NC = (int)0xFFFFFFFF
+    DAC0_OUT = PTB18
 } PinName;
 
 

targets/targets.json5

@@ -768,7 +768,7 @@
     },
     "KW41Z": {
         "supported_form_factors": [
-            "ARDUINO"
+            "ARDUINO_UNO"
         ],
         "core": "Cortex-M0+",
         "supported_toolchains": [