Skip to content

Commit 25a5789

Browse files
henrygabhenrygab
authored
Merge branch 'master' into fix_compile_warnings3
2 parents 00dd2e0 + ea9f1a5 commit 25a5789

File tree

40 files changed

+191
-63
lines changed

40 files changed

+191
-63
lines changed

‎boards.txt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ adafruit_metro_m4.build.vid=0x239A
448448
adafruit_metro_m4.build.pid=0x8020
449449
adafruit_metro_m4.bootloader.tool=openocd
450450
adafruit_metro_m4.bootloader.file=metroM4/bootloader-metro_m4-v2.0.0-adafruit.5.bin
451-
adafruit_metro_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
451+
adafruit_metro_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
452452
adafruit_metro_m4.menu.cache.on=Enabled
453453
adafruit_metro_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
454454
adafruit_metro_m4.menu.cache.off=Disabled
@@ -514,7 +514,7 @@ adafruit_grandcentral_m4.build.vid=0x239A
514514
adafruit_grandcentral_m4.build.pid=0x8031
515515
adafruit_grandcentral_m4.bootloader.tool=openocd
516516
adafruit_grandcentral_m4.bootloader.file=grand_central_m4/bootloader-grandcentralM4-v2.0.0-adafruit.5.bin
517-
adafruit_grandcentral_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
517+
adafruit_grandcentral_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
518518
adafruit_grandcentral_m4.menu.cache.on=Enabled
519519
adafruit_grandcentral_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
520520
adafruit_grandcentral_m4.menu.cache.off=Disabled
@@ -577,7 +577,7 @@ adafruit_itsybitsy_m4.build.vid=0x239A
577577
adafruit_itsybitsy_m4.build.pid=0x802B
578578
adafruit_itsybitsy_m4.bootloader.tool=openocd
579579
adafruit_itsybitsy_m4.bootloader.file=itsybitsyM4/bootloader-itsybitsy_m4-v2.0.0-adafruit.5.bin
580-
adafruit_itsybitsy_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
580+
adafruit_itsybitsy_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
581581
adafruit_itsybitsy_m4.menu.cache.on=Enabled
582582
adafruit_itsybitsy_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
583583
adafruit_itsybitsy_m4.menu.cache.off=Disabled
@@ -640,7 +640,7 @@ adafruit_feather_m4.build.vid=0x239A
640640
adafruit_feather_m4.build.pid=0x8022
641641
adafruit_feather_m4.bootloader.tool=openocd
642642
adafruit_feather_m4.bootloader.file=featherM4/bootloader-feather_m4-v2.0.0-adafruit.5.bin
643-
adafruit_feather_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
643+
adafruit_feather_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
644644
adafruit_feather_m4.menu.cache.on=Enabled
645645
adafruit_feather_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
646646
adafruit_feather_m4.menu.cache.off=Disabled
@@ -705,7 +705,7 @@ adafruit_trellis_m4.build.vid=0x239A
705705
adafruit_trellis_m4.build.pid=0x802F
706706
adafruit_trellis_m4.bootloader.tool=openocd
707707
adafruit_trellis_m4.bootloader.file=trellisM4/bootloader-trellis_m4-v2.0.0-adafruit.5.bin
708-
adafruit_trellis_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
708+
adafruit_trellis_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
709709
adafruit_trellis_m4.menu.cache.on=Enabled
710710
adafruit_trellis_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
711711
adafruit_trellis_m4.menu.cache.off=Disabled
@@ -768,7 +768,7 @@ adafruit_pyportal_m4.build.vid=0x239A
768768
adafruit_pyportal_m4.build.pid=0x8035
769769
adafruit_pyportal_m4.bootloader.tool=openocd
770770
adafruit_pyportal_m4.bootloader.file=metroM4/bootloader-metro_m4-v2.0.0-adafruit.5.bin
771-
adafruit_pyportal_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
771+
adafruit_pyportal_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
772772
adafruit_pyportal_m4.menu.cache.on=Enabled
773773
adafruit_pyportal_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
774774
adafruit_pyportal_m4.menu.cache.off=Disabled
@@ -831,7 +831,7 @@ adafruit_pyportal_m4_titano.build.vid=0x239A
831831
adafruit_pyportal_m4_titano.build.pid=0x8035
832832
adafruit_pyportal_m4_titano.bootloader.tool=openocd
833833
adafruit_pyportal_m4_titano.bootloader.file=metroM4/bootloader-metro_m4-v2.0.0-adafruit.5.bin
834-
adafruit_pyportal_m4_titano.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
834+
adafruit_pyportal_m4_titano.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
835835
adafruit_pyportal_m4_titano.menu.cache.on=Enabled
836836
adafruit_pyportal_m4_titano.menu.cache.on.build.cache_flags=-DENABLE_CACHE
837837
adafruit_pyportal_m4_titano.menu.cache.off=Disabled
@@ -896,7 +896,7 @@ adafruit_pybadge_m4.build.vid=0x239A
896896
adafruit_pybadge_m4.build.pid=0x8033
897897
adafruit_pybadge_m4.bootloader.tool=openocd
898898
adafruit_pybadge_m4.bootloader.file=featherM4/bootloader-feather_m4-v2.0.0-adafruit.5.bin
899-
adafruit_pybadge_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
899+
adafruit_pybadge_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
900900
adafruit_pybadge_m4.menu.cache.on=Enabled
901901
adafruit_pybadge_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
902902
adafruit_pybadge_m4.menu.cache.off=Disabled
@@ -960,7 +960,7 @@ adafruit_metro_m4_airliftlite.build.vid=0x239A
960960
adafruit_metro_m4_airliftlite.build.pid=0x8037
961961
adafruit_metro_m4_airliftlite.bootloader.tool=openocd
962962
adafruit_metro_m4_airliftlite.bootloader.file=metroM4/bootloader-metro_m4-v2.0.0-adafruit.5.bin
963-
adafruit_metro_m4_airliftlite.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
963+
adafruit_metro_m4_airliftlite.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
964964
adafruit_metro_m4_airliftlite.menu.cache.on=Enabled
965965
adafruit_metro_m4_airliftlite.menu.cache.on.build.cache_flags=-DENABLE_CACHE
966966
adafruit_metro_m4_airliftlite.menu.cache.off=Disabled
@@ -1025,7 +1025,7 @@ adafruit_pygamer_m4.build.vid=0x239A
10251025
adafruit_pygamer_m4.build.pid=0x803D
10261026
adafruit_pygamer_m4.bootloader.tool=openocd
10271027
adafruit_pygamer_m4.bootloader.file=featherM4/bootloader-feather_m4-v2.0.0-adafruit.5.bin
1028-
adafruit_pygamer_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
1028+
adafruit_pygamer_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
10291029
adafruit_pygamer_m4.menu.cache.on=Enabled
10301030
adafruit_pygamer_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
10311031
adafruit_pygamer_m4.menu.cache.off=Disabled
@@ -1089,7 +1089,7 @@ adafruit_pygamer_advance_m4.build.vid=0x239A
10891089
adafruit_pygamer_advance_m4.build.pid=0x8041
10901090
adafruit_pygamer_advance_m4.bootloader.tool=openocd
10911091
adafruit_pygamer_advance_m4.bootloader.file=featherM4/bootloader-feather_m4-v2.0.0-adafruit.5.bin
1092-
adafruit_pygamer_advance_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
1092+
adafruit_pygamer_advance_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
10931093
adafruit_pygamer_advance_m4.menu.cache.on=Enabled
10941094
adafruit_pygamer_advance_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
10951095
adafruit_pygamer_advance_m4.menu.cache.off=Disabled
@@ -1155,7 +1155,7 @@ adafruit_pybadge_airlift_m4.build.vid=0x239A
11551155
adafruit_pybadge_airlift_m4.build.pid=0x8043
11561156
adafruit_pybadge_airlift_m4.bootloader.tool=openocd
11571157
adafruit_pybadge_airlift_m4.bootloader.file=featherM4/bootloader-feather_m4-v2.0.0-adafruit.5.bin
1158-
adafruit_pybadge_airlift_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
1158+
adafruit_pybadge_airlift_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
11591159
adafruit_pybadge_airlift_m4.menu.cache.on=Enabled
11601160
adafruit_pybadge_airlift_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
11611161
adafruit_pybadge_airlift_m4.menu.cache.off=Disabled
@@ -1221,7 +1221,7 @@ adafruit_monster_m4sk.build.vid=0x239A
12211221
adafruit_monster_m4sk.build.pid=0x8047
12221222
adafruit_monster_m4sk.bootloader.tool=openocd
12231223
adafruit_monster_m4sk.bootloader.file=featherM4/bootloader-feather_m4-v2.0.0-adafruit.5.bin
1224-
adafruit_monster_m4sk.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
1224+
adafruit_monster_m4sk.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
12251225
adafruit_monster_m4sk.menu.cache.on=Enabled
12261226
adafruit_monster_m4sk.menu.cache.on.build.cache_flags=-DENABLE_CACHE
12271227
adafruit_monster_m4sk.menu.cache.off=Disabled
@@ -1287,7 +1287,7 @@ adafruit_hallowing_m4.build.vid=0x239A
12871287
adafruit_hallowing_m4.build.pid=0x8049
12881288
adafruit_hallowing_m4.bootloader.tool=openocd
12891289
adafruit_hallowing_m4.bootloader.file=featherM4/bootloader-feather_m4-v2.0.0-adafruit.5.bin
1290-
adafruit_hallowing_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-4.5.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
1290+
adafruit_hallowing_m4.compiler.arm.cmsis.ldflags="-L{runtime.tools.CMSIS-5.4.0.path}/CMSIS/Lib/GCC/" "-L{build.variant.path}" -larm_cortexM4lf_math -mfloat-abi=hard -mfpu=fpv4-sp-d16
12911291
adafruit_hallowing_m4.menu.cache.on=Enabled
12921292
adafruit_hallowing_m4.menu.cache.on.build.cache_flags=-DENABLE_CACHE
12931293
adafruit_hallowing_m4.menu.cache.off=Disabled

‎cores/arduino/SERCOM.cpp

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -537,8 +537,18 @@ bool SERCOM::startTransmissionWIRE(uint8_t address, SercomWireReadWriteFlag flag
537537
// 7-bits address + 1-bits R/W
538538
address = (address << 0x1ul) | flag;
539539

540-
// Wait idle or owner bus mode
541-
while ( !isBusIdleWIRE() && !isBusOwnerWIRE() );
540+
// If another master owns the bus or the last bus owner has not properly
541+
// sent a stop, return failure early. This will prevent some misbehaved
542+
// devices from deadlocking here at the cost of the caller being responsible
543+
// for retrying the failed transmission. See SercomWireBusState for the
544+
// possible bus states.
545+
if(!isBusOwnerWIRE())
546+
{
547+
if( isBusBusyWIRE() || (isArbLostWIRE() && !isBusIdleWIRE()) || isBusUnknownWIRE() )
548+
{
549+
return false;
550+
}
551+
}
542552

543553
// Send start and address
544554
sercom->I2CM.ADDR.bit.ADDR = address;
@@ -634,6 +644,21 @@ bool SERCOM::isBusOwnerWIRE( void )
634644
return sercom->I2CM.STATUS.bit.BUSSTATE == WIRE_OWNER_STATE;
635645
}
636646

647+
bool SERCOM::isBusUnknownWIRE( void )
648+
{
649+
return sercom->I2CM.STATUS.bit.BUSSTATE == WIRE_UNKNOWN_STATE;
650+
}
651+
652+
bool SERCOM::isArbLostWIRE( void )
653+
{
654+
return sercom->I2CM.STATUS.bit.ARBLOST == 1;
655+
}
656+
657+
bool SERCOM::isBusBusyWIRE( void )
658+
{
659+
return sercom->I2CM.STATUS.bit.BUSSTATE == WIRE_BUSY_STATE;
660+
}
661+
637662
bool SERCOM::isDataReadyWIRE( void )
638663
{
639664
return sercom->I2CS.INTFLAG.bit.DRDY;

‎cores/arduino/SERCOM.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,9 @@ class SERCOM
225225
bool isSlaveWIRE( void ) ;
226226
bool isBusIdleWIRE( void ) ;
227227
bool isBusOwnerWIRE( void ) ;
228+
bool isBusUnknownWIRE( void ) ;
229+
bool isArbLostWIRE( void );
230+
bool isBusBusyWIRE( void );
228231
bool isDataReadyWIRE( void ) ;
229232
bool isStopDetectedWIRE( void ) ;
230233
bool isRestartDetectedWIRE( void ) ;

‎cores/arduino/TinyUSB/Adafruit_TinyUSB_ArduinoCore

Submodule Adafruit_TinyUSB_ArduinoCore updated 63 files

‎cores/arduino/TinyUSB/Adafruit_TinyUSB_SAMD.cpp

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,27 @@
2828
#include "Adafruit_TinyUSB_Core.h"
2929
#include <Reset.h> // Needed for auto-reset with 1200bps port touch
3030

31+
//--------------------------------------------------------------------+
32+
// Forward USB interrupt events to TinyUSB IRQ Handler
33+
//--------------------------------------------------------------------+
34+
extern "C"
35+
{
36+
#if defined(__SAMD51__)
37+
38+
void USB_0_Handler (void) { tud_int_handler(0); }
39+
void USB_1_Handler (void) { tud_int_handler(0); }
40+
void USB_2_Handler (void) { tud_int_handler(0); }
41+
void USB_3_Handler (void) { tud_int_handler(0); }
42+
43+
#else
44+
45+
void USB_Handler(void) { tud_int_handler(0); }
46+
47+
#endif
48+
} // extern C
49+
50+
51+
3152
//--------------------------------------------------------------------+
3253
// MACRO TYPEDEF CONSTANT ENUM DECLARATION
3354
//--------------------------------------------------------------------+
@@ -74,15 +95,6 @@ void Adafruit_TinyUSB_Core_touch1200(void)
7495
//--------------------------------------------------------------------+
7596
// Adafruit_USBD_Device platform dependent
7697
//--------------------------------------------------------------------+
77-
void Adafruit_USBD_Device::detach(void)
78-
{
79-
USB->DEVICE.CTRLB.reg |= USB_DEVICE_CTRLB_DETACH;
80-
}
81-
82-
void Adafruit_USBD_Device::attach(void)
83-
{
84-
USB->DEVICE.CTRLB.reg &= ~USB_DEVICE_CTRLB_DETACH;
85-
}
8698

8799
uint8_t Adafruit_USBD_Device::getSerialDescriptor(uint16_t* serial_str)
88100
{
@@ -152,6 +164,11 @@ static void usb_hardware_init(void)
152164

153165

154166
GCLK->PCHCTRL[USB_GCLK_ID].reg = GCLK_PCHCTRL_GEN_GCLK1_Val | (1 << GCLK_PCHCTRL_CHEN_Pos);
167+
168+
NVIC_SetPriority(USB_0_IRQn, 0UL);
169+
NVIC_SetPriority(USB_1_IRQn, 0UL);
170+
NVIC_SetPriority(USB_2_IRQn, 0UL);
171+
NVIC_SetPriority(USB_3_IRQn, 0UL);
155172
#else
156173
PM->APBBMASK.reg |= PM_APBBMASK_USB;
157174

@@ -169,6 +186,8 @@ static void usb_hardware_init(void)
169186
GCLK_CLKCTRL_CLKEN;
170187
while (GCLK->STATUS.bit.SYNCBUSY)
171188
;
189+
190+
NVIC_SetPriority((IRQn_Type) USB_IRQn, 0UL);
172191
#endif
173192
}
174193

‎cores/arduino/TinyUSB/tusb_config.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@
7979
#define CFG_TUD_HID_BUFSIZE 64
8080

8181
// MIDI FIFO size of TX and RX
82-
#define CFG_TUD_MIDI_RX_BUFSIZE 64
83-
#define CFG_TUD_MIDI_TX_BUFSIZE 64
82+
#define CFG_TUD_MIDI_RX_BUFSIZE 128
83+
#define CFG_TUD_MIDI_TX_BUFSIZE 128
8484

8585
// Vendor FIFO size of TX and RX
8686
#define CFG_TUD_VENDOR_RX_BUFSIZE 64

‎cores/arduino/WInterrupts.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ extern "C" {
3131
#define FALLING 3
3232
#define RISING 4
3333

34-
#define DEFAULT 1
34+
//#define DEFAULT 1
3535
#define EXTERNAL 0
3636

3737
typedef void (*voidFuncPtr)(void);

‎cores/arduino/wiring_analog.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ static int _writeResolution = 12;
3232
static int _dacResolution = 12;
3333
#else
3434
static int _writeResolution = 8;
35-
static int _dacResolution = 10;
35+
//static int _dacResolution = 10;
3636
#endif
3737

3838

‎libraries/CI_Tests/CI_Tests.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// fake empty header file to make Arduino IDE happy

‎libraries/CI_Tests/examples/test_cmsis_fast_rfft.ino renamed to ‎libraries/CI_Tests/examples/test_cmsis_fast_rfft/test_cmsis_fast_rfft.ino

File renamed without changes.

0 commit comments

Comments
 (0)