Merge branch 'main' into main

Author: BenjaminDannegard

boards.txt

@@ -12,7 +12,7 @@ portenta_c33.build.fpu=-mfpu=fpv5-sp-d16
 portenta_c33.build.float-abi=-mfloat-abi=hard
 
 portenta_c33.build.board=PORTENTA_C33
-portenta_c33.build.defines=-DF_CPU=200000000
+portenta_c33.build.defines=-DF_CPU=200000000 -DPROVIDE_FREERTOS_HOOK
 portenta_c33.vid.0=0x2341
 portenta_c33.pid.0=0x0068
 portenta_c33.vid.1=0x2341

cores/arduino/Serial.cpp

@@ -58,12 +58,14 @@ void UART::WrapperCallback(uart_callback_args_t *p_args) {
       {
           break;
       }
-      case UART_EVENT_TX_COMPLETE:
-      case UART_EVENT_TX_DATA_EMPTY:
+      case UART_EVENT_TX_COMPLETE: // This is call when the transmission is complete
       {
-        //uint8_t to_enqueue = uart_ptr->txBuffer.available() < uart_ptr->uart_ctrl.fifo_depth ? uart_ptr->txBuffer.available() : uart_ptr->uart_ctrl.fifo_depth;
-        //while (to_enqueue) {
-        uart_ptr->tx_done = true;
+        uart_ptr->tx_complete = true;
+        break;
+      }
+      case UART_EVENT_TX_DATA_EMPTY: // This is called when the buffer is empty
+      {                              // Last byte is transmitting, but ready for more data
+        uart_ptr->tx_empty = true;
         break;
       }
       case UART_EVENT_RX_CHAR:
@@ -87,6 +89,8 @@ UART::UART(int _pin_tx, int _pin_rx, int _pin_rts, int _pin_cts):
   rx_pin(_pin_rx),
   rts_pin(_pin_rts),
   cts_pin(_pin_cts),
+  tx_empty(true),
+  tx_complete(true),
   init_ok(false) {
 /* -------------------------------------------------------------------------- */    
   uart_cfg.txi_irq = FSP_INVALID_VECTOR;
@@ -109,9 +113,10 @@ bool UART::setUpUartIrqs(uart_cfg_t &cfg) {
 size_t UART::write(uint8_t c) {
 /* -------------------------------------------------------------------------- */  
   if(init_ok) {
-    tx_done = false;
+    tx_empty = false;
+    tx_complete = false;
     R_SCI_UART_Write(&uart_ctrl, &c, 1);
-    while (!tx_done) {}
+    while (!tx_empty) {}
     return 1;
   }
   else {
@@ -121,9 +126,10 @@ size_t UART::write(uint8_t c) {
 
 size_t  UART::write(uint8_t* c, size_t len) {
   if(init_ok) {
-    tx_done = false;
+    tx_empty = false;
+    tx_complete = false;
     R_SCI_UART_Write(&uart_ctrl, c, len);
-    while (!tx_done) {}
+    while (!tx_empty) {}
     return len;
   }
   else {
@@ -322,7 +328,7 @@ int UART::read() {
 /* -------------------------------------------------------------------------- */
 void UART::flush() {
 /* -------------------------------------------------------------------------- */  
-  while(txBuffer.available());
+  while(!tx_complete);
 }
 
 /* -------------------------------------------------------------------------- */
@@ -335,4 +341,4 @@ size_t UART::write_raw(uint8_t* c, size_t len) {
     i++;
   }
   return len;
-}
+}

cores/arduino/Serial.h

@@ -78,7 +78,8 @@ class UART : public arduino::HardwareSerial {
     arduino::SafeRingBufferN<SERIAL_BUFFER_SIZE> rxBuffer;
     arduino::SafeRingBufferN<SERIAL_BUFFER_SIZE> txBuffer;
 
-    volatile bool tx_done;
+    volatile bool tx_empty;
+    volatile bool tx_complete;
 
     sci_uart_instance_ctrl_t  uart_ctrl;
     uart_cfg_t                uart_cfg;

cores/arduino/main.cpp

@@ -64,6 +64,7 @@ void unsecure_registers() {
 #define str(s) #s
 
 extern "C" void Stacktrace_Handler(void);
+extern "C" __attribute__((weak)) void start_freertos_on_header_inclusion() {}
 
 void arduino_main(void)
 {
@@ -112,6 +113,9 @@ void arduino_main(void)
 #endif
    startAgt();
    setup();
+#ifdef PROVIDE_FREERTOS_HOOK
+   start_freertos_on_header_inclusion();
+#endif
    while (1)
    {
       loop();

libraries/Arduino_FreeRTOS/src/portable/FSP/port.c

@@ -225,6 +225,29 @@ static void prvTaskExitError(void);
 
 #endif
 
+#ifdef PROVIDE_FREERTOS_HOOK
+void loop_thread_func(void* arg) {
+    while (1)
+    {
+        loop();
+    }
+}
+
+static TaskHandle_t loop_task;
+void start_freertos_on_header_inclusion() {
+    xTaskCreate(
+      (TaskFunction_t)loop_thread_func,
+      "Loop Thread",
+      4096 / 4,   /* usStackDepth in words */
+      NULL,   /* pvParameters */
+      4,         /* uxPriority */
+      &loop_task /* pxCreatedTask */
+    );
+
+    vTaskStartScheduler();
+}
+#endif
+
 /* Arduino specific overrides */
 void delay(uint32_t ms) {
     if (xTaskGetSchedulerState() == taskSCHEDULER_RUNNING) {

libraries/Arduino_LED_Matrix/examples/TextWithArduinoGraphics/TextWithArduinoGraphics.ino

@@ -1,3 +1,6 @@
+// TextAnimation works only when ArduinoGraphics is installed and used.
+// ArduinoGraphics is an external library and needs to be installed using
+// Library Manager.
 // To use ArduinoGraphics APIs, please include BEFORE Arduino_LED_Matrix
 #include "ArduinoGraphics.h"
 #include "Arduino_LED_Matrix.h"

libraries/Arduino_LED_Matrix/examples/TextWithArduinoGraphicsAsynchronous/TextWithArduinoGraphicsAsynchronous.ino

@@ -1,3 +1,6 @@
+// TextAnimation works only when ArduinoGraphics is installed and used.
+// ArduinoGraphics is an external library and needs to be installed using
+// Library Manager.
 // To use ArduinoGraphics APIs, please include BEFORE Arduino_LED_Matrix and TextAnimation
 #include "ArduinoGraphics.h"
 #include "Arduino_LED_Matrix.h"

libraries/ESPhost/examples/ESP32_TEST/ESP32_TEST.ino

@@ -297,7 +297,7 @@ void connectAccessPoint() {
     int i = stoi(ap_str);
 
     Serial.println(">>> [APP]: Connecting to Access Point");
-    WifiApCfg_t ap;
+    WifiApCfg_t ap{};
     memcpy(ap.ssid,access_point_list[i].ssid,SSID_LENGTH);
     memcpy(ap.pwd,pwd.c_str(),pwd.size());
     memcpy(ap.bssid,access_point_list[i].bssid,BSSID_LENGTH);

libraries/OTAUpdate/examples/OTANonBlocking/OTANonBlocking.ino

@@ -0,0 +1,139 @@
+/*
+  OTANonBlocking
+
+  This sketch demonstrates how to make an OTA Update on the UNO R4 WiFi.
+  Upload the sketch and wait for the invasion!
+
+  It requires at least version 0.5.0 of USB Wifi bridge firmware
+
+*/
+
+
+#include "WiFiS3.h"
+#include "OTAUpdate.h"
+#include "root_ca.h"
+#include "arduino_secrets.h"
+
+char ssid[] = SECRET_SSID;    // your network SSID (name)
+char pass[] = SECRET_PASS;    // your network password (use for WPA, or use as key for WEP)
+
+int status = WL_IDLE_STATUS;
+
+OTAUpdate ota;
+static char const OTA_FILE_LOCATION[] = "https://downloads.arduino.cc/ota/UNOR4WIFI_Animation.ota";
+
+/* -------------------------------------------------------------------------- */
+void setup() {
+/* -------------------------------------------------------------------------- */
+  //Initialize serial and wait for port to open:
+  Serial.begin(115200);
+  while (!Serial) {
+    ; // wait for serial port to connect. Needed for native USB port only
+  }
+
+  // check for the Wi-Fi module:
+  if (WiFi.status() == WL_NO_MODULE) {
+    Serial.println("Communication with Wi-Fi module failed!");
+    // don't continue
+    while (true);
+  }
+
+  String fv = WiFi.firmwareVersion();
+  if (fv < WIFI_FIRMWARE_LATEST_VERSION) {
+    Serial.println("Please upgrade the firmware");
+  }
+
+  // attempt to connect to Wi-Fi network:
+  while (status != WL_CONNECTED) {
+    Serial.print("Attempting to connect to SSID: ");
+    Serial.println(ssid);
+    // Connect to WPA/WPA2 network. Change this line if using open or WEP network:
+    status = WiFi.begin(ssid, pass);
+
+    // wait 1 seconds for connection:
+    delay(1000);
+  }
+
+  printWiFiStatus();
+
+  Serial.println("ota.begin()");
+  int ret = ota.begin("/update.bin");
+  if(ret != OTAUpdate::OTA_ERROR_NONE) {
+    Serial.println("ota.begin() error: ");
+    Serial.println((int)ret);
+    return;
+  }
+
+  Serial.println("ota.setCACert()");
+  ret = ota.setCACert(root_ca);
+  if(ret != OTAUpdate::OTA_ERROR_NONE) {
+    Serial.println("ota.setCACert() error: ");
+    Serial.println((int)ret);
+    return;
+  }
+
+  Serial.println("ota.startDownload()");
+  int ota_size = ota.startDownload(OTA_FILE_LOCATION, "/update.bin");
+  if(ota_size <= 0) {
+    Serial.println("ota.startDownload() error: ");
+    Serial.println(ota_size);
+    Serial.println("Make sure your WiFi firmware version is at least 0.5.0");
+    return;
+  }
+
+  Serial.println("ota.downloadProgress()");
+  while((ret = ota.downloadProgress()) < ota_size) {
+    Serial.print("Progress ");
+    Serial.print(ret);
+    Serial.print("/");
+    Serial.println(ota_size);
+    delay(100);
+  }
+
+  if(ret < 0){
+    Serial.println("ota.downloadProgress() error: ");
+    Serial.println((int)ret);
+    return;
+  }
+
+  Serial.println("ota.verify()");
+  ret = ota.verify();
+  if(ret != OTAUpdate::OTA_ERROR_NONE) {
+    Serial.println("ota.verify() error: ");
+    Serial.println((int)ret);
+    return;
+  }
+\
+  Serial.println("ota.update()");
+  ret = ota.update("/update.bin");
+  if(ret != OTAUpdate::OTA_ERROR_NONE) {
+    Serial.println("ota.update() error: ");
+    Serial.println((int)ret);
+    return;
+  }
+}
+
+/* -------------------------------------------------------------------------- */
+void loop() {
+/* -------------------------------------------------------------------------- */
+  delay(1000);
+}
+
+/* -------------------------------------------------------------------------- */
+void printWiFiStatus() {
+/* -------------------------------------------------------------------------- */
+  // print the SSID of the network you're attached to:
+  Serial.print("SSID: ");
+  Serial.println(WiFi.SSID());
+
+  // print your board's IP address:
+  IPAddress ip = WiFi.localIP();
+  Serial.print("IP Address: ");
+  Serial.println(ip);
+
+  // print the received signal strength:
+  long rssi = WiFi.RSSI();
+  Serial.print("signal strength (RSSI):");
+  Serial.print(rssi);
+  Serial.println(" dBm");
+}

libraries/OTAUpdate/examples/OTANonBlocking/arduino_secrets.h

@@ -0,0 +1,2 @@
+#define SECRET_SSID ""
+#define SECRET_PASS ""