Merge branch 'master' into master

Author: jwestmoreland

.github/workflows/compile-examples.yml

@@ -0,0 +1,87 @@
+name: Compile Examples
+
+on: 
+  pull_request:
+    paths:
+      - ".github/workflows/compile-examples.yml"
+      - "cores/**"
+      - "libraries/**"
+      - "variants/**"
+      - "boards.txt"
+      - "platform.txt"
+  push:
+    paths:
+      - ".github/workflows/compile-examples.yml"
+      - "cores/**"
+      - "libraries/**"
+      - "variants/**"
+      - "boards.txt"
+      - "platform.txt"
+
+jobs:
+  compile-examples:
+    runs-on: ubuntu-latest
+
+    env:
+      # sketch paths to compile (recursive) compatible with all boards
+      UNIVERSAL_SKETCH_PATHS: '"libraries/Scheduler"'
+
+    strategy:
+      fail-fast: false
+
+      matrix:
+        board:
+          - fqbn: arduino-beta:mbed:nano33ble
+          - fqbn: arduino-beta:mbed:envie_m4
+          - fqbn: arduino-beta:mbed:envie_m7
+
+        # compile only the examples compatible with each board
+        include:
+          - board:
+              fqbn: arduino-beta:mbed:nano33ble
+            additional-sketch-paths: '"libraries/PDM" "libraries/ThreadDebug"'
+          - board:
+              fqbn: arduino-beta:mbed:envie_m4
+            additional-sketch-paths: '"libraries/doom" "libraries/KernelDebug" "libraries/Portenta_SDCARD" "libraries/Portenta_System" "libraries/Portenta_Video" '
+          - board:
+              fqbn: arduino-beta:mbed:envie_m7
+            additional-sketch-paths: '"libraries/doom" "libraries/KernelDebug" "libraries/Portenta_Audio" "libraries/Portenta_SDCARD" "libraries/Portenta_System" "libraries/Portenta_Video" "libraries/ThreadDebug" "libraries/USBHOST"'
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      # The source files are in a subfolder of the ArduinoCore-API repository, so it's not possible to clone it directly to the final destination in the core
+      - name: Checkout ArduinoCore-API
+        uses: actions/checkout@v2
+        with:
+          repository: arduino/ArduinoCore-API
+          ref: namespace_arduino
+          path: ArduinoCore-API
+
+      - name: Remove old symlink to api
+        run: rm "$GITHUB_WORKSPACE/cores/arduino/api"
+
+      - name: Install ArduinoCore-API
+        run: mv "$GITHUB_WORKSPACE/ArduinoCore-API/api" "$GITHUB_WORKSPACE/cores/arduino"   
+
+      - name: Compile examples
+        uses: arduino/actions/libraries/compile-examples@master
+        with:
+          fqbn: ${{ matrix.board.fqbn }}
+          platforms: |
+            # Use Board Manager to install the latest release of Arduino mbed Boards to get the toolchain
+            - name: "arduino-beta:mbed"
+            # Overwrite the Board Manager installation with the local platform
+            - source-path: "./"
+              name: "arduino-beta:mbed"
+          sketch-paths: "${{ env.UNIVERSAL_SKETCH_PATHS }} ${{ matrix.additional-sketch-paths }}"
+          verbose: 'false'
+          enable-size-deltas-report: true
+
+      - name: Save memory usage change report as artifact
+        if: github.event_name == 'pull_request'
+        uses: actions/upload-artifact@v1
+        with:
+          name: size-deltas-reports
+          path: size-deltas-reports

.github/workflows/report-size-deltas.yml

@@ -0,0 +1,11 @@
+on:
+  schedule:
+    - cron:  '*/5 * * * *'
+
+jobs:
+  report:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Comment size deltas reports to PRs
+        uses: arduino/actions/libraries/report-size-deltas@master

cores/arduino/Arduino.h

@@ -17,6 +17,9 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#if ARDUINO_LIBRARY_DISCOVERY_PHASE == 1
+#define ARDUINO_LIB_DISCOVERY_PHASE
+#endif
 #if !defined(Arduino_h) && !defined(ARDUINO_LIB_DISCOVERY_PHASE)
 #define Arduino_h
 

cores/arduino/mbed/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_PORTENTA_H7/COMPONENT_WHD/interface/cyhal_hw_types.h

@@ -81,11 +81,17 @@ typedef struct
     void *empty;
 } cyhal_spi_t;
 
+
+#include "whd_debug.h"
+
+#if defined(WPRINT_ENABLE_WHD_ERROR) || defined(WPRINT_ENABLE_WHD_INFO) || defined(WPRINT_ENABLE_WHD_DEBUG)
 /** \} group_hal_hw_types_data_structures */
 #define PRINTF(...)   do { \
                       (void) printf(__VA_ARGS__); \
                       } while (0)
-
+#else
+#define PRINTF(...)
+#endif
 
 #include "whd_config.h"
 

cores/arduino/mbed/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_PORTENTA_H7/COMPONENT_WHD/src/include/whd_debug.h

@@ -36,7 +36,7 @@ extern "C"
 #define WPRINT_ENABLE_WHD_DEBUG
 
 #define WHD_ENABLE_STATS
-/*#define WHD_LOGGING_BUFFER_ENABLE*/
+#define WHD_LOGGING_BUFFER_ENABLE
 
 #if defined (__GNUC__)
 #define WHD_TRIGGER_BREAKPOINT( ) do { __asm__ ("bkpt"); } while (0)

libraries/WiFi/src/WiFi.cpp

@@ -1,6 +1,6 @@
 #include "WiFi.h"
 
-bool arduino::WiFiClass::isVisible(char* ssid) {
+bool arduino::WiFiClass::isVisible(const char* ssid) {
     for (int i=0; i<10; i++) {
         if (strncmp(ap_list[i].get_ssid(), ssid, 32) == 0) {
             connected_ap = i;
@@ -10,7 +10,12 @@ bool arduino::WiFiClass::isVisible(char* ssid) {
     return false;
 }
 
-int arduino::WiFiClass::begin(char* ssid, const char *passphrase) {
+arduino::IPAddress arduino::WiFiClass::ipAddressFromSocketAddress(SocketAddress socketAddress) {
+    nsapi_addr_t address = socketAddress.get_addr();
+    return IPAddress(address.bytes[0], address.bytes[1], address.bytes[2], address.bytes[3]);    
+}
+
+int arduino::WiFiClass::begin(const char* ssid, const char *passphrase) {
     if (_ssid) free(_ssid);
 
     _ssid = (char*)malloc(33);
@@ -19,51 +24,109 @@ int arduino::WiFiClass::begin(char* ssid, const char *passphrase) {
         return WL_CONNECT_FAILED;
     }
 
-    if (wifi_if == NULL) {
-       wifi_if = (WiFiInterface*)cb();
+    if (wifi_if == nullptr) {
+        //Q: What is the callback for?
+        _initializerCallback();
+        if(wifi_if == nullptr) return WL_CONNECT_FAILED;
     }
 
-    // too long? break it off
-    if (strlen(ssid) > 32) ssid[32] = 0;
     memcpy(_ssid, ssid, 33);
+    // too long? break it off
+    if (strlen(ssid) > 32) _ssid[32] = 0;
 
     scanNetworks();
     // use scan result to populate security field
-    if (!isVisible(ssid)) {
-        return WL_CONNECT_FAILED;
+    if (!isVisible(_ssid)) {
+        _currentNetworkStatus = WL_CONNECT_FAILED;
+        return _currentNetworkStatus;
     }
 
-    nsapi_error_t ret = wifi_if->connect(ssid, passphrase, ap_list[connected_ap].get_security());
+    nsapi_error_t ret = wifi_if->connect(_ssid, passphrase, ap_list[connected_ap].get_security());
 
-    return ret == NSAPI_ERROR_OK ? WL_CONNECTED : WL_CONNECT_FAILED;
+    _currentNetworkStatus = ret == NSAPI_ERROR_OK ? WL_CONNECTED : WL_CONNECT_FAILED;
+    return _currentNetworkStatus;
 }
 
 int arduino::WiFiClass::beginAP(const char* ssid, const char *passphrase, uint8_t channel) {
 
 #if defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_PORTENTA_H7_M4)
-    softap = WhdSoftAPInterface::get_default_instance();
+    _softAP = WhdSoftAPInterface::get_default_instance();
 #endif
 
-    if (softap == NULL) {
+    if (_softAP == NULL) {
         return WL_CONNECT_FAILED;
     }
 
-    //Set ap ssid, password and channel
-    SocketAddress ip("192.168.3.1");
-    SocketAddress gw("192.168.3.1");
-    SocketAddress netmask("255.255.255.0");
-    ((WhdSoftAPInterface*)softap)->set_network(ip, gw, netmask);
-    nsapi_error_t ret = ((WhdSoftAPInterface*)softap)->start(ssid, passphrase, NSAPI_SECURITY_WPA2, channel, true /* dhcp server */, NULL, true /* cohexistance */);
+    ensureDefaultAPNetworkConfiguration();
+
+    //Set ap ssid, password and channel    
+    static_cast<WhdSoftAPInterface*>(_softAP)->set_network(_ip, _netmask, _gateway);
+    nsapi_error_t ret = static_cast<WhdSoftAPInterface*>(_softAP)->start(ssid, passphrase, NSAPI_SECURITY_WPA2, channel, true /* dhcp server */, NULL, true /* cohexistance */);
 
     return ret == NSAPI_ERROR_OK ? WL_AP_LISTENING : WL_CONNECT_FAILED;
 }
 
+void arduino::WiFiClass::ensureDefaultAPNetworkConfiguration() {
+    if(_ip == nullptr){
+        _ip = SocketAddress(DEFAULT_IP_ADDRESS);
+    }
+    if(_gateway == nullptr){
+        _gateway = _ip;
+    }
+    if(_netmask == nullptr){
+        _netmask = SocketAddress(DEFAULT_NETMASK);
+    }
+}
+
 void arduino::WiFiClass::end() {
-    if (softap != NULL) {
-        ((WhdSoftAPInterface*)softap)->stop();
+    disconnect();
+}
+
+int arduino::WiFiClass::disconnect() {
+    if (_softAP != nullptr) {
+        return static_cast<WhdSoftAPInterface*>(_softAP)->stop();        
+    } else {
+        return wifi_if->disconnect();
     }
 }
 
+void arduino::WiFiClass::config(arduino::IPAddress local_ip){    
+    nsapi_addr_t convertedIP = {NSAPI_IPv4, {local_ip[0], local_ip[1], local_ip[2], local_ip[3]}};    
+    _ip = SocketAddress(convertedIP);    
+}
+
+void arduino::WiFiClass::config(const char *local_ip){
+    _ip = SocketAddress(local_ip);    
+}
+
+void arduino::WiFiClass::config(IPAddress local_ip, IPAddress dns_server){
+    config(local_ip);
+    setDNS(dns_server);    
+}
+
+void arduino::WiFiClass::config(IPAddress local_ip, IPAddress dns_server, IPAddress gateway){
+    config(local_ip, dns_server);
+    nsapi_addr_t convertedGatewayIP = {NSAPI_IPv4, {gateway[0], gateway[1], gateway[2], gateway[3]}};    
+    _gateway = SocketAddress(convertedGatewayIP);
+}
+
+void arduino::WiFiClass::config(IPAddress local_ip, IPAddress dns_server, IPAddress gateway, IPAddress subnet){    
+    config(local_ip, dns_server, gateway);
+    nsapi_addr_t convertedSubnetMask = {NSAPI_IPv4, {subnet[0], subnet[1], subnet[2], subnet[3]}};    
+    _netmask = SocketAddress(convertedSubnetMask);
+}
+
+void arduino::WiFiClass::setDNS(IPAddress dns_server1){
+    nsapi_addr_t convertedDNSServer = {NSAPI_IPv4, {dns_server1[0], dns_server1[1], dns_server1[2], dns_server1[3]}};    
+    _dnsServer1 = SocketAddress(convertedDNSServer);
+}
+
+void arduino::WiFiClass::setDNS(IPAddress dns_server1, IPAddress dns_server2){
+    setDNS(dns_server1);
+    nsapi_addr_t convertedDNSServer2 = {NSAPI_IPv4, {dns_server2[0], dns_server2[1], dns_server2[2], dns_server2[3]}};    
+    _dnsServer2 = SocketAddress(convertedDNSServer2);    
+}
+
 char* arduino::WiFiClass::SSID() {
     return _ssid;
 }
@@ -108,7 +171,7 @@ static uint8_t sec2enum(nsapi_security_t sec)
 
 int8_t arduino::WiFiClass::scanNetworks() {
     uint8_t count = 10;
-    if (ap_list == NULL) {
+    if (ap_list == nullptr) {
         ap_list = new WiFiAccessPoint[count];
     }
     return wifi_if->scan(ap_list, count);
@@ -130,9 +193,8 @@ int32_t arduino::WiFiClass::RSSI() {
     return wifi_if->get_rssi();
 }
 
-uint8_t arduino::WiFiClass::status() {
-    // @todo: fix
-    return WL_CONNECTED;
+uint8_t arduino::WiFiClass::status() {    
+    return _currentNetworkStatus;
 }
 
 uint8_t arduino::WiFiClass::encryptionType() {
@@ -148,7 +210,7 @@ uint8_t* arduino::WiFiClass::BSSID(unsigned char* bssid) {
 }
 
 uint8_t* arduino::WiFiClass::macAddress(uint8_t* mac) {
-    const char *mac_str = wifi_if->get_mac_address();
+    const char *mac_str = getNetwork()->get_mac_address();
     for( int b = 0; b < 6; b++ )
     {
         uint32_t tmp;
@@ -159,28 +221,46 @@ uint8_t* arduino::WiFiClass::macAddress(uint8_t* mac) {
     return mac;
 }
 
-arduino::IPAddress arduino::WiFiClass::localIP() {
-    arduino::IPAddress addr;
+arduino::IPAddress arduino::WiFiClass::localIP() {    
+    SocketAddress ip;
+    NetworkInterface *interface = getNetwork();
+    interface->get_ip_address(&ip);
+    return ipAddressFromSocketAddress(ip);    
+}
+
+arduino::IPAddress arduino::WiFiClass::subnetMask() {    
+    SocketAddress ip;
+    NetworkInterface *interface = getNetwork();
+    interface->get_netmask(&ip);
+    return ipAddressFromSocketAddress(ip);    
+}
 
+arduino::IPAddress arduino::WiFiClass::gatewayIP() {    
     SocketAddress ip;
-    if (softap != NULL) {
-        softap->get_ip_address(&ip);
-    } else {
-        wifi_if->get_ip_address(&ip);
-    }
-    addr.fromString(ip.get_ip_address()); // @todo: the IP we get from Mbed is correct, but is parsed incorrectly by Arduino
-    return addr;
+    NetworkInterface *interface = getNetwork();
+    interface->get_gateway(&ip);
+    return ipAddressFromSocketAddress(ip);    
 }
 
 NetworkInterface *arduino::WiFiClass::getNetwork() {
-    if (softap != NULL) {
-        return softap;
+    if (_softAP != nullptr) {
+        return _softAP;
     } else {
         return wifi_if;
     }
 }
 
+unsigned long arduino::WiFiClass::getTime() {
+    return 0;
+}
+
 #if defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_PORTENTA_H7_M4)
+
+#include "whd_version.h"
+char* arduino::WiFiClass::firmwareVersion() {
+    return WHD_VERSION;
+}
+
 arduino::WiFiClass WiFi(WiFiInterface::get_default_instance());
 #endif