Merge remote-tracking branch 'origin/main' into debug_ide2

Former-commit-id: 36919ad

Author: facchinm

.github/workflows/compile-examples.yml

@@ -26,8 +26,8 @@ jobs:
       # sketch paths to compile (recursive) for all boards
       UNIVERSAL_SKETCH_PATHS: |
         - libraries/AnalogWave
-        - libraries/Arduino_CAN/CANRead
-        - libraries/Arduino_CAN/CANWrite
+        - libraries/Arduino_CAN/examples/CANRead
+        - libraries/Arduino_CAN/examples/CANWrite
         - libraries/Arduino_FreeRTOS
         - libraries/EEPROM
         - libraries/RTC
@@ -38,15 +38,15 @@ jobs:
 
       matrix:
         board: [
-          {"fqbn": "arduino:renesas:portenta_c33"},
-          {"fqbn": "arduino:renesas:minima"},
-          {"fqbn": "arduino:renesas:unor4wifi"},
+          {"fqbn": "arduino-git:renesas:portenta_c33"},
+          {"fqbn": "arduino-git:renesas:minima"},
+          {"fqbn": "arduino-git:renesas:unor4wifi"},
         ]
 
         # make board type-specific customizations to the matrix jobs
         include:
           - board:
-              fqbn: "arduino:renesas:portenta_c33"
+              fqbn: "arduino-git:renesas:portenta_c33"
             additional-sketch-paths: |
               - libraries/WiFi
               - libraries/UsbMsd
@@ -55,17 +55,21 @@ jobs:
               - libraries/SSLClient
               - libraries/SE05X
               - libraries/Ethernet
-              - libraries/Arduino_CAN/CAN1Read
-              - libraries/Arduino_CAN/CAN1Write
+              - libraries/Arduino_CAN/examples/CAN1Read
+              - libraries/Arduino_CAN/examples/CAN1Write
           - board:
-              fqbn: "arduino:renesas:unor4wifi"
+              fqbn: "arduino-git:renesas:unor4wifi"
             additional-sketch-paths: |
               - libraries/WiFiS3
               - libraries/Arduino_LED_Matrix
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
+        with:
+          submodules: recursive
+          token: ${{ secrets.PRIVATE_SUBMODULES_CLONE }}
+          fetch-depth: 0
 
       # 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
@@ -120,7 +124,7 @@ jobs:
               source-url: "https://downloads.arduino.cc/packages/package_renesas_secret_index.json"
             # Overwrite the Board Manager installation with the local platform
             - source-path: "./"
-              name: "arduino:renesas"
+              name: "arduino-git:renesas"
           sketch-paths: |
             ${{ env.UNIVERSAL_SKETCH_PATHS }}
             ${{ matrix.additional-sketch-paths }}

boards.txt

@@ -77,7 +77,7 @@ minima.compiler.fsp.cxxflags=-mthumb "@{compiler.fsp.defines}"
 minima.compiler.tinyusb.cflags=-DCFG_TUSB_MCU=OPT_MCU_RAXXX
 minima.compiler.tinyusb.cxxflags=-DCFG_TUSB_MCU=OPT_MCU_RAXXX
 minima.compiler.fsp.includes={build.variant.path}/includes.txt
-minima.compiler.fsp.extra_ldflags=-lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
+minima.compiler.fsp.extra_ldflags=--specs=nano.specs -lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
 minima.compiler.fsp="{build.variant.path}/libs/libfsp.a"
 
 minima.upload.tool=dfu-util
@@ -125,7 +125,7 @@ unor4wifi.compiler.fsp.cxxflags=-mthumb "@{compiler.fsp.defines}"
 unor4wifi.compiler.tinyusb.cflags=-DCFG_TUSB_MCU=OPT_MCU_RAXXX
 unor4wifi.compiler.tinyusb.cxxflags=-DCFG_TUSB_MCU=OPT_MCU_RAXXX
 unor4wifi.compiler.fsp.includes={build.variant.path}/includes.txt
-unor4wifi.compiler.fsp.extra_ldflags=-lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
+unor4wifi.compiler.fsp.extra_ldflags=--specs=nano.specs -lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
 unor4wifi.compiler.fsp="{build.variant.path}/libs/libfsp.a"
 
 unor4wifi.upload.tool=bossac
@@ -171,7 +171,7 @@ muxto.compiler.fsp.cxxflags=-mthumb -D_RA_CORE=CM23 -D_RENESAS_RA_
 muxto.compiler.tinyusb.cflags=-DCFG_TUSB_MCU=OPT_MCU_RAXXX
 muxto.compiler.tinyusb.cxxflags=-DCFG_TUSB_MCU=OPT_MCU_RAXXX
 muxto.compiler.fsp.includes={build.variant.path}/includes.txt
-muxto.compiler.fsp.extra_ldflags=-lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
+muxto.compiler.fsp.extra_ldflags=--specs=nano.specs -lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
 muxto.compiler.fsp="{build.variant.path}/libs/libfsp.a"
 
 muxto.upload.tool=dfu-util

cores/arduino/Serial.cpp

@@ -82,10 +82,11 @@ void UART::WrapperCallback(uart_callback_args_t *p_args) {
 }
 
 
-/* -------------------------------------------------------------------------- */
-UART::UART(int _pin_tx, int _pin_rx) :
+UART::UART(int _pin_tx, int _pin_rx, int _pin_rts, int _pin_cts):
   tx_pin(_pin_tx),
   rx_pin(_pin_rx),
+  rts_pin(_pin_rts),
+  cts_pin(_pin_cts),
   init_ok(false) {
 /* -------------------------------------------------------------------------- */    
   uart_cfg.txi_irq = FSP_INVALID_VECTOR;
@@ -94,9 +95,6 @@ UART::UART(int _pin_tx, int _pin_rx) :
   uart_cfg.eri_irq = FSP_INVALID_VECTOR;
 }
 
-
-
-
 /* -------------------------------------------------------------------------- */
 bool UART::setUpUartIrqs(uart_cfg_t &cfg) {
 /* -------------------------------------------------------------------------- */  
@@ -181,9 +179,14 @@ bool  UART::cfg_pins(int max_index) {
   /* actually configuring PIN function */
   ioport_peripheral_t ioport_tx = USE_SCI_EVEN_CFG(cfg_tx) ? IOPORT_PERIPHERAL_SCI0_2_4_6_8 : IOPORT_PERIPHERAL_SCI1_3_5_7_9;
   ioport_peripheral_t ioport_rx = USE_SCI_EVEN_CFG(cfg_rx) ? IOPORT_PERIPHERAL_SCI0_2_4_6_8 : IOPORT_PERIPHERAL_SCI1_3_5_7_9;
-  
+
   R_IOPORT_PinCfg(&g_ioport_ctrl, g_pin_cfg[tx_pin].pin, (uint32_t) (IOPORT_CFG_PERIPHERAL_PIN | ioport_tx));
   R_IOPORT_PinCfg(&g_ioport_ctrl, g_pin_cfg[rx_pin].pin, (uint32_t) (IOPORT_CFG_PERIPHERAL_PIN | ioport_rx));
+  if (rts_pin != -1 && cts_pin != -1) {
+    // hopefully people using flow control have read the datasheet so let's avoid the double check
+    R_IOPORT_PinCfg(&g_ioport_ctrl, g_pin_cfg[rts_pin].pin, (uint32_t) (IOPORT_CFG_PERIPHERAL_PIN | ioport_rx));
+    R_IOPORT_PinCfg(&g_ioport_ctrl, g_pin_cfg[cts_pin].pin, (uint32_t) (IOPORT_CFG_PERIPHERAL_PIN | ioport_rx));
+  }
 
   return true;
 }
@@ -213,6 +216,9 @@ void UART::begin(unsigned long baudrate, uint16_t config) {
     uart_cfg_extend.p_baud_setting                = &uart_baud;
     uart_cfg_extend.flow_control                  = SCI_UART_FLOW_CONTROL_RTS;
     uart_cfg_extend.flow_control_pin              = (bsp_io_port_pin_t) UINT16_MAX;
+    if (rts_pin != -1 && cts_pin != -1) {
+      uart_cfg_extend.flow_control                  = SCI_UART_FLOW_CONTROL_HARDWARE_CTSRTS;
+    }
     uart_cfg_extend.rs485_setting.enable          = SCI_UART_RS485_DISABLE;
     uart_cfg_extend.rs485_setting.polarity        = SCI_UART_RS485_DE_POLARITY_HIGH;
     uart_cfg_extend.rs485_setting.de_control_pin  = (bsp_io_port_pin_t) UINT16_MAX;

cores/arduino/Serial.h

@@ -52,8 +52,8 @@ class UART : public arduino::HardwareSerial {
   public:
     static UART *g_uarts[MAX_UARTS]; 
     static void WrapperCallback(uart_callback_args_t *p_args);
-    
-    UART(int _pin_tx, int _pin_rx);
+
+    UART(int _pin_tx, int _pin_rx, int pin_rts = -1, int pin_cts = -1);
     void begin(unsigned long);
     void begin(unsigned long, uint16_t config);
     void end();
@@ -70,6 +70,8 @@ class UART : public arduino::HardwareSerial {
   private:          
     int                       tx_pin;
     int                       rx_pin;
+    int                       rts_pin = -1;
+    int                       cts_pin = -1;
     bool                      cfg_pins(int max_index);
 
     int                       channel;

cores/arduino/SerialObj3.cpp

@@ -9,5 +9,5 @@ UART _UART4_(UART4_TX_PIN, UART4_RX_PIN);
 #endif
 
 #if SERIAL_HOWMANY > 4
-UART _UART5_(UART5_TX_PIN, UART5_RX_PIN);
+UART _UART5_(UART5_TX_PIN, UART5_RX_PIN, UART5_RTS_PIN, UART5_CTS_PIN);
 #endif

cores/arduino/main.cpp

@@ -134,3 +134,12 @@ extern "C" {
 
 //Declared weak in Arduino.h to allow user redefinitions.
 int atexit(void (*func)()) { return 0; }
+
+namespace __gnu_cxx {
+   void __verbose_terminate_handler() { }
+}
+extern "C" __attribute__((weak)) void __cxa_pure_virtual(void);
+extern "C" __attribute__((weak)) void __cxa_pure_virtual(void)
+{
+   exit(1);
+}

extras/e2studioProjects/portenta_h33_lib/configuration.xml

@@ -900,7 +900,7 @@
     </config>
     <config id="config.driver.flash_hp">
       <property id="config.driver.flash_hp.param_checking_enable" value="config.flash_hp.param_checking_enable.bsp"/>
-      <property id="config.driver.flash_hp.param_code_flash_programming_enable" value="config.driver.flash_hp.param_code_flash_programming_enable.disabled"/>
+      <property id="config.driver.flash_hp.param_code_flash_programming_enable" value="config.driver.flash_hp.param_code_flash_programming_enable.enabled"/>
       <property id="config.driver.flash_hp.param_data_flash_programming_enable" value="config.driver.flash_hp.param_data_flash_programming_enable.enabled"/>
     </config>
     <config id="config.driver.lpm">

extras/net/README.md

@@ -17,5 +17,5 @@ make
 
 ### Move libraries inside SSLClient 
 ```bash
-cp liblwIP.a ../../libraries/Ethernet/src/cortex-m33/
+cp liblwIP.a ../../libraries/lwIpWrapper/src/cortex-m33/
 ```

extras/net/lwipopts.h

@@ -111,7 +111,7 @@
  * already use it.
  */
 #ifndef MEM_LIBC_MALLOC
-#define MEM_LIBC_MALLOC                 1
+#define MEM_LIBC_MALLOC                 0
 #endif
 
 /**

extras/package.sh

@@ -3,16 +3,26 @@
 if [ ! -f platform.txt ]; then
   echo Launch this script from the root core folder as ./extras/package.sh
   exit 2
-fi 
+fi
 
 VERSION=`cat platform.txt | grep "version=" | cut -f2 -d"="`
 echo $VERSION
 
-FILENAME=ArduinoCore-renesas-$VERSION.tar.bz2
+#portenta
+
+VARIANT=portenta
+EXCLUDE_TAGS=--exclude-tag-all=.unor4_only
+
+FILENAME=ArduinoCore-renesas_$VARIANT-$VERSION.tar.bz2
+
+git checkout boards.txt
+echo minima.hide=true >> boards.txt
+echo unor4wifi.hide=true >> boards.txt
+echo muxto.hide=true >> boards.txt
 
 CORE_BASE=`basename $PWD`
 cd ..
-tar --exclude='*.vscode*' --exclude='*.git*' --exclude='*e2studio*' --exclude='*extras*' -cjhvf $FILENAME $CORE_BASE
+tar $EXCLUDE_TAGS --exclude='*.vscode*' --exclude='*.tar.*' --exclude='*.json*' --exclude='*.git*' --exclude='*e2studio*' --exclude='*extras*' -cjhvf $FILENAME $CORE_BASE
 cd -
 
 mv ../$FILENAME .
@@ -24,8 +34,37 @@ cat extras/package_index.json.template |
 # sed "s/%%BUILD_NUMBER%%/${BUILD_NUMBER}/" |
 # sed "s/%%CURR_TIME%%/${CURR_TIME_SED}/" |
 sed "s/%%VERSION%%/${VERSION}/" |
-sed "s/%%FILENAME%%/${FILENAME}/" |
-sed "s/%%CHECKSUM%%/${CHKSUM}/" |
-sed "s/%%SIZE%%/${SIZE}/" > package_renesas_${VERSION}_index.json
+sed "s/%%FILENAME_PORTENTA%%/${FILENAME}/" |
+sed "s/%%CHECKSUM_PORTENTA%%/${CHKSUM}/" |
+sed "s/%%SIZE_PORTENTA%%/${SIZE}/" > package_renesas_${VERSION}_index.json.tmp
+
+#uno r4
+
+VARIANT=uno
+EXCLUDE_TAGS=--exclude-tag-all=.portenta_only
+
+FILENAME=ArduinoCore-renesas_$VARIANT-$VERSION.tar.bz2
+
+git checkout boards.txt
+echo portenta_c33.hide=true >> boards.txt
+echo muxto.hide=true >> boards.txt
+
+CORE_BASE=`basename $PWD`
+cd ..
+tar $EXCLUDE_TAGS --exclude='*.vscode*' --exclude='*.tar.*' --exclude='*.json*' --exclude='*.git*' --exclude='*e2studio*' --exclude='*extras*' -cjhvf $FILENAME $CORE_BASE
+cd -
+
+mv ../$FILENAME .
+
+CHKSUM=`sha256sum $FILENAME | awk '{ print $1 }'`
+SIZE=`wc -c $FILENAME | awk '{ print $1 }'`
+
+cat package_renesas_${VERSION}_index.json.tmp |
+# sed "s/%%BUILD_NUMBER%%/${BUILD_NUMBER}/" |
+# sed "s/%%CURR_TIME%%/${CURR_TIME_SED}/" |
+sed "s/%%VERSION%%/${VERSION}/" |
+sed "s/%%FILENAME_UNO%%/${FILENAME}/" |
+sed "s/%%CHECKSUM_UNO%%/${CHKSUM}/" |
+sed "s/%%SIZE_UNO%%/${SIZE}/" > package_renesas_${VERSION}_index.json
 
-cat package_renesas_${VERSION}_index.json
+cat package_renesas_${VERSION}_index.json