Skip to content

Commit 3756096

Browse files
maidnlmaidnl
committed
Merge remote-tracking branch 'origin/main' into wifi_leven_dev
Former-commit-id: 096dd7e
2 parents 16e65fb + 3073c3e commit 3756096

File tree

692 files changed

+6411
-271
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

692 files changed

+6411
-271
lines changed

‎boards.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ portenta_c33.build.core=arduino
55
portenta_c33.build.crossprefix=arm-none-eabi-
66
portenta_c33.build.compiler_path={runtime.tools.arm-none-eabi-gcc-7-2017q4.path}/bin/
77

8-
portenta_c33.build.variant=PORTENTA_H33
8+
portenta_c33.build.variant=PORTENTA_C33
99
portenta_c33.build.mcu=cortex-m33
1010
portenta_c33.build.architecture=cortex-m33
1111
portenta_c33.build.fpu=-mfpu=fpv5-sp-d16
1212
portenta_c33.build.float-abi=-mfloat-abi=hard
1313

14-
portenta_c33.build.board=PORTENTA_H33
14+
portenta_c33.build.board=PORTENTA_C33
1515
portenta_c33.build.defines=-DF_CPU=200000000
1616
portenta_c33.vid.0=0x2341
1717
portenta_c33.pid.0=0x0068
@@ -53,13 +53,13 @@ minima.build.core=arduino
5353
minima.build.crossprefix=arm-none-eabi-
5454
minima.build.compiler_path={runtime.tools.arm-none-eabi-gcc-7-2017q4.path}/bin/
5555

56-
minima.build.variant=SANTIAGO
56+
minima.build.variant=MINIMA
5757
minima.build.mcu=cortex-m4
5858
minima.build.architecture=cortex-m4
5959
minima.build.fpu=-mfpu=fpv4-sp-d16
6060
minima.build.float-abi=-mfloat-abi=hard
6161

62-
minima.build.board=SANTIAGO
62+
minima.build.board=MINIMA
6363
minima.build.defines=-DF_CPU=48000000
6464
minima.vid.0=0x2341
6565
minima.pid.0=0x0069
@@ -101,13 +101,13 @@ unor4wifi.build.core=arduino
101101
unor4wifi.build.crossprefix=arm-none-eabi-
102102
unor4wifi.build.compiler_path={runtime.tools.arm-none-eabi-gcc-7-2017q4.path}/bin/
103103

104-
unor4wifi.build.variant=SANTIAGO_COMPOSTA
104+
unor4wifi.build.variant=UNOWIFIR4
105105
unor4wifi.build.mcu=cortex-m4
106106
unor4wifi.build.architecture=cortex-m4
107107
unor4wifi.build.fpu=-mfpu=fpv4-sp-d16
108108
unor4wifi.build.float-abi=-mfloat-abi=hard
109109

110-
unor4wifi.build.board=SANTIAGO_COMPOSTA
110+
unor4wifi.build.board=UNOWIFIR4
111111
unor4wifi.build.defines=-DF_CPU=48000000 -DNO_USB -DBACKTRACE_SUPPORT
112112
unor4wifi.vid.0=0x2341
113113
unor4wifi.pid.0=0x1002

‎cores/arduino/Arduino.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ using namespace arduino;
1919
#endif
2020

2121
#include <api/itoa.h>
22+
#include <api/deprecated-avr-comp/avr/dtostrf.h>
2223
#include <strings.h>
2324

2425
#if defined(__cplusplus)

‎cores/arduino/cm_backtrace/cmb_def.h

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -395,18 +395,25 @@ if (!(EXPR)) \
395395
}
396396
#pragma diag_default=Pe940
397397
#elif defined(__GNUC__)
398+
399+
#ifdef __cplusplus
400+
# define CMSREGISTER
401+
#else
402+
# define CMSREGISTER register
403+
#endif
404+
398405
__attribute__( ( always_inline ) ) static inline uint32_t cmb_get_msp(void) {
399-
register uint32_t result;
406+
CMSREGISTER uint32_t result;
400407
__asm volatile ("MRS %0, msp\n" : "=r" (result) );
401408
return(result);
402409
}
403410
__attribute__( ( always_inline ) ) static inline uint32_t cmb_get_psp(void) {
404-
register uint32_t result;
411+
CMSREGISTER uint32_t result;
405412
__asm volatile ("MRS %0, psp\n" : "=r" (result) );
406413
return(result);
407414
}
408415
__attribute__( ( always_inline ) ) static inline uint32_t cmb_get_sp(void) {
409-
register uint32_t result;
416+
CMSREGISTER uint32_t result;
410417
__asm volatile ("MOV %0, sp\n" : "=r" (result) );
411418
return(result);
412419
}

‎cores/arduino/main.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#include "Arduino.h"
2-
#include "cm_backtrace/cm_backtrace.h"
2+
extern "C" {
3+
#include "cm_backtrace/cm_backtrace.h"
4+
}
35

46
/* TODO: make me configurable by the variant */
57
extern const uint32_t __StackTop;
@@ -120,7 +122,7 @@ void arduino_main(void)
120122
/* for printf compatibility */
121123
extern "C" __attribute__((weak)) int _write (int fhdl, const void *buf, size_t count) {
122124
(void)fhdl;
123-
Serial.write_raw((uint8_t*)buf, count);
125+
return Serial.write_raw((uint8_t*)buf, count);
124126
}
125127
#endif
126128

‎cores/arduino/usb/USB.cpp

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -391,34 +391,50 @@ extern "C" __attribute((weak)) void tud_hid_set_report_cb(uint8_t instance, uint
391391

392392

393393
extern "C" __attribute((weak)) int32_t tud_msc_read10_cb (uint8_t lun, uint32_t lba, uint32_t offset, void* buffer, uint32_t bufsize) {
394-
394+
(void) lun;
395+
(void) lba;
396+
(void) offset;
397+
(void) buffer;
398+
(void) bufsize;
395399
return 0;
396400
}
397401

398402

399403
extern "C" __attribute((weak)) int32_t tud_msc_write10_cb (uint8_t lun, uint32_t lba, uint32_t offset, uint8_t* buffer, uint32_t bufsize) {
400-
404+
(void) lun;
405+
(void) lba;
406+
(void) offset;
407+
(void) buffer;
408+
(void) bufsize;
401409
return 0;
402410
}
403411

404412

405413
extern "C" __attribute((weak)) void tud_msc_inquiry_cb(uint8_t lun, uint8_t vendor_id[8], uint8_t product_id[16], uint8_t product_rev[4]) {
406-
414+
(void) lun;
415+
(void) vendor_id;
416+
(void) product_id;
417+
(void) product_rev;
407418
}
408419

409420

410421
extern "C" __attribute((weak)) bool tud_msc_test_unit_ready_cb(uint8_t lun) {
411-
422+
(void) lun;
412423
return false;
413424
}
414425

415426

416427
extern "C" __attribute((weak)) void tud_msc_capacity_cb(uint8_t lun, uint32_t* block_count, uint16_t* block_size) {
417-
428+
(void) lun;
429+
(void) block_count;
430+
(void) block_size;
418431
}
419432

420433

421434
extern "C" __attribute((weak)) int32_t tud_msc_scsi_cb (uint8_t lun, uint8_t const scsi_cmd[16], void* buffer, uint16_t bufsize) {
422-
435+
(void) lun;
436+
(void) scsi_cmd;
437+
(void) buffer;
438+
(void) bufsize;
423439
return -1;
424440
}

‎extras/e2studioProjects/Santiago/fsp_to_arduino.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
CORE_PATH=$(pwd -P)/../../../
4-
TARGET=SANTIAGO_COMPOSTA
4+
TARGET=UNOWIFIR4
55

66
# this part changes the makefile generated by e2studio (removing ra_gen from the build)
77
# then it cleans the build and re-build all again

‎extras/e2studioProjects/portenta_h33/fsp_to_arduino.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
CORE_PATH=$(pwd -P)/../../../
4-
TARGET=PORTENTA_H33
4+
TARGET=PORTENTA_C33
55

66
# this part changes the makefile generated by e2studio (removing ra_gen from the build)
77
# then it cleans the build and re-build all again

‎extras/e2studioProjects/portenta_h33_lib/fsp_to_arduino.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
CORE_PATH=$(pwd -P)/../../../
4-
TARGET=PORTENTA_H33
4+
TARGET=PORTENTA_C33
55

66
# this part changes the makefile generated by e2studio (removing ra_gen from the build)
77
# then it cleans the build and re-build all again

‎extras/tls/mbedtls_alt/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
*.o
2+
*.a
3+
*.d

‎libraries/Arduino_CAN/examples/CAN1Read/CAN1Read.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
* COMPILE TIME CHECKS
33
**************************************************************************************/
44

5-
#ifndef ARDUINO_PORTENTA_H33
5+
#ifndef ARDUINO_PORTENTA_C33
66
# error "CAN1 is only available on Portenta C33."
7-
#endif /* ARDUINO_PORTENTA_H33 */
7+
#endif /* ARDUINO_PORTENTA_C33 */
88

99
/**************************************************************************************
1010
* INCLUDE

0 commit comments

Comments
 (0)