sync with master

updating implementation

Author: hathach

cores/rp2040/RP2040USB.cpp

@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#ifndef USE_TINYUSB
+
 #include <Arduino.h>
 #include "CoreMutex.h"
 #include "RP2040USB.h"
@@ -317,3 +319,5 @@ void tud_hid_set_report_cb(uint8_t report_id, hid_report_type_t report_type, uin
   (void) bufsize;
 }
 
+#endif
+

cores/rp2040/delay.cpp

@@ -29,8 +29,10 @@ extern "C"
 {
 
 void yield(void) {
+#ifdef USE_TINYUSB
     TinyUSB_Device_Task();
     TinyUSB_Device_FlushCDC();
+#endif
 }
 
 void delay( unsigned long ms ) {
@@ -43,7 +45,7 @@ void delay( unsigned long ms ) {
     // TODO better implementation later
     // More detail https://github.com/adafruit/circuitpython/pull/2956
     while (ms--) {
-      yield();
+//      yield();
       sleep_ms(1);
     }
 }

cores/rp2040/main.cpp

@@ -59,11 +59,11 @@ extern "C" int main() {
 
     mutex_init(&_pioMutex);
     initVariant();
-    __USBStart();
 
 #ifdef USE_TINYUSB
     TinyUSB_Device_Init(0);
 #else
+    __USBStart();
 #ifndef DISABLE_USB_SERIAL
     // Enable serial port for reset/upload always
     Serial.begin();

libraries/Adafruit_TinyUSB_Arduino

@@ -110,7 +110,7 @@ recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compil
 
 ## Combine gc-sections, archives, and objects
 recipe.hooks.linking.prelink.1.pattern="{runtime.tools.pqt-python3.path}/python3" "{runtime.platform.path}/tools/simplesub.py" --input "{runtime.platform.path}/lib/memmap_default.ld" --out "{build.path}/memmap_default.ld" --sub __FLASH_LENGTH__ {build.flash_length} --sub __EEPROM_START__ {build.eeprom_start} --sub __FS_START__ {build.fs_start} --sub __FS_END__ {build.fs_end}
-recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" "-L{build.path}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} "-Wl,--script={build.path}/memmap_default.ld" "-Wl,-Map,{build.path}/{build.project_name}.map" --specs=nosys.specs -Wl,--as-needed -Wl,--start-group {compiler.ldflags} -o "{build.path}/{build.project_name}.elf" {object_files} "{build.path}/{archive_file}" -Wl,--whole-archive "{runtime.platform.path}/lib/libpico.a" -Wl,--no-whole-archive -lm "-I{runtime.platform.path}/pico-sdk/src/rp2040/hardware_regs/include/" "-I{runtime.platform.path}/pico-sdk/src/common/pico_binary_info/include" "{runtime.platform.path}/assembly/{build.boot2}.S" -lc -lstdc++ -Wl,--end-group
+recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" "-L{build.path}" {compiler.c.elf.flags} {compiler.c.elf.extra_flags} "-Wl,--script={build.path}/memmap_default.ld" "-Wl,-Map,{build.path}/{build.project_name}.map" --specs=nosys.specs -Wl,--as-needed -Wl,--start-group {compiler.ldflags} -o "{build.path}/{build.project_name}.elf" {object_files} "{build.path}/{archive_file}" "{runtime.platform.path}/lib/libpico.a" -lm "-I{runtime.platform.path}/pico-sdk/src/rp2040/hardware_regs/include/" "-I{runtime.platform.path}/pico-sdk/src/common/pico_binary_info/include" "{runtime.platform.path}/assembly/{build.boot2}.S" -lc -lstdc++ -Wl,--end-group
 
 ## Create output (UF2 file)
 recipe.objcopy.uf2.pattern="{runtime.tools.pqt-elf2uf2.path}/elf2uf2" "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.uf2"