Cameron/pico-examples
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make examples friendlier for non GCC compilers and fixed slave_mem_i2c.c to compile on boards without I2C pins (#336)

Browse Source
This commit is contained in:
Graham Sanderson
2023-03-10 15:41:40 -06:00
committed by GitHub
parent 9d3fea1419
commit 60829a134a
39 changed files with 89 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
usb/CMakeLists.txt
View File

@@ -9,8 +9,8 @@ else ()
message("Skipping TinyUSB host examples as TinyUSB is unavailable")
endif ()
if (TARGET tinyusb_pico_pio_usb)
if (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 11.3)
message("Skipping TinyUSB dual examples, as TinyUSB hw/mcu/raspberry_pi/Pico-PIO-USB does not currently compile on GCC 11.3 or greater")
if ((NOT CMAKE_C_COMPILER_ID STREQUAL "GNU") OR CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 11.3)
message("Skipping TinyUSB dual examples, as TinyUSB hw/mcu/raspberry_pi/Pico-PIO-USB does not currently compile on non GCC or GCC 11.3 or greater")
else()
add_subdirectory(dual)
endif()

2
usb/device/dev_hid_composite/main.c
View File

@@ -65,8 +65,6 @@ int main(void)
hid_task();
}
return 0;
}
//--------------------------------------------------------------------+

6
usb/device/dev_lowlevel/dev_lowlevel.c
View File

@@ -26,8 +26,8 @@
// Device descriptors
#include "dev_lowlevel.h"
#define usb_hw_set hw_set_alias(usb_hw)
#define usb_hw_clear hw_clear_alias(usb_hw)
#define usb_hw_set ((usb_hw_t *)hw_set_alias_untyped(usb_hw))
#define usb_hw_clear ((usb_hw_t *)hw_clear_alias_untyped(usb_hw))
// Function prototypes for our device specific endpoint handlers defined
// later on
@@ -575,6 +575,4 @@ int main(void) {
while (1) {
tight_loop_contents();
}
return 0;
}