support RP235x, rename RP2040 to RP2xxx because of RP235x, small fixe…

…s, firmwares built with develop
j1rie · Sep 12, 2024 · f42711b · f42711b
1 parent 21dd775
commit f42711b
Show file tree

Hide file tree

Showing 69 changed files with 73 additions and 61 deletions.
diff --git a/PROTOCOLS b/PROTOCOLS
@@ -43,7 +43,7 @@ Query the fourth (slot 4) IR data of the third (slot 2) macro:
 PC->�C: STAT_CMD ACC_GET CMD_MACRO 0x02 0x04
 �C->PC: STAT_SUCCESS ACC_GET CMD_MACRO 0x77 0x88 0x99 0xAA 0xBB 0xCC
 
-Neopixel (RP2040 only): byte 4 = total length of payload = (length of strip) * 3, the total length is divided into chunks of 57, byte 5 = chunk number, byte 6 set only one led: number of data start byte + 1, byte 7 ... 63 rgb data
+Neopixel (RP2xxx only): byte 4 = total length of payload = (length of strip) * 3, the total length is divided into chunks of 57, byte 5 = chunk number, byte 6 set only one led: number of data start byte + 1, byte 7 ... 63 rgb data
 Set eight neopixels to red, green, blue, red, green, blue, red, green (length = 8 * 3, chunk = 0, unused, rgb, rgb, rgb, ...):
 PC->�C: STAT_CMD ACC_SET CMD_NEOPIXEL 0x18 0x00 0x00 0xff 0x00 0x00 0x00 0xff 0x00 0x00 0x00 0xff 0xff 0x00 0x00 0x00 0xff 0x00 0x00 0x00 0xff 0xff 0x00 0x00 0x00 0xff 0x00
 �C->PC: STAT_SUCCESS ACC_SET CMD_NEOPIXEL

diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ For 2 € you can buy on ebay a ST-Link emulator or a STM32F103 development boar
 A macro makes it possible to send a sequence of IR commands via the send diode on reception of a trigger.
 macroslot0 is the trigger, macroslot1 … macroslot7 are the commands to be sent.  
 
-(*) only RP2040
+(*) only RP2xxx
 
 ## Software Linux
 * GUI config-tool stm32kbdIRconfig_gui for configuration: set, get and reset wakeups, irdata, keys, alarm time, repeat. It is possible to program wakeups and irdata via remote control. Create the eeprom map with remote control and mouse. Comprehensive debug messages. Firmware update.

diff --git a/RP2040/CMakeLists.txt → RP2xxx/CMakeLists.txt b/RP2040/CMakeLists.txt → RP2xxx/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.12)
+cmake_minimum_required(VERSION 3.13)
 
 include(../pico-sdk/pico_sdk_init.cmake)
 
@@ -21,7 +21,6 @@ add_executable(${PROJECT_NAME}
 
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/generated)
 
-# generate the header file into the source tree as it is included in the RP2040 datasheet
 pico_generate_pio_header(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/src/ws2812.pio OUTPUT_DIR ${CMAKE_CURRENT_LIST_DIR}/generated)
 
 target_include_directories(${PROJECT_NAME} PUBLIC
@@ -32,8 +31,6 @@ target_include_directories(${PROJECT_NAME} PUBLIC
         ${CMAKE_CURRENT_SOURCE_DIR}/timestamp
 )
 
-# In addition to pico_stdlib required for common PicoSDK functionality, add dependency on tinyusb_device
-# for TinyUSB device support and tinyusb_board for the additional board support library used by the example
 target_link_libraries(${PROJECT_NAME} pico_stdlib tinyusb_device tinyusb_board hardware_pwm hardware_flash hardware_exception timestamp hardware_pio)
 
 # Uncomment this line to enable fix for Errata RP2040-E5 (the fix requires use of GPIO 15)
@@ -48,16 +45,16 @@ execute_process (COMMAND bash -c "grep -e 'Version IRMP' ${CMAKE_CURRENT_SOURCE_
 
 string(STRIP ${IRMP_VERSION} IRMP_VERSION)
 
-target_compile_definitions(timestamp PRIVATE FW_STR="${BUILD_TIME}_${PICO_BOARD}_kbd   IRMP-Version: ${IRMP_VERSION}*RP2040")
+target_compile_definitions(timestamp PRIVATE FW_STR="${BUILD_TIME}_${PICO_BOARD}_kbd   IRMP-Version: ${IRMP_VERSION}*RP2xxx")
 
-set(FW_STR "${BUILD_TIME}_${PICO_BOARD}_kbd   IRMP-Version: ${IRMP_VERSION}*RP2040")
+set(FW_STR "${BUILD_TIME}_${PICO_BOARD}_kbd   IRMP-Version: ${IRMP_VERSION}*RP2xxx")
 
 target_include_directories(timestamp PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
 
 add_custom_target(clear_cache COMMAND ${CMAKE_COMMAND} -U BUILD_TIME ${CMAKE_BINARY_DIR})
 
 add_dependencies(timestamp clear_cache)
 
-message(STATUS "BUILD_TIME=${BUILD_TIME}")
-message(STATUS "IRMP_VERSION=${IRMP_VERSION}")
+#message(STATUS "BUILD_TIME=${BUILD_TIME}")
+#message(STATUS "IRMP_VERSION=${IRMP_VERSION}")
 message(STATUS "FW_STR=${FW_STR}")
diff --git a/RP2040/README.md → RP2xxx/README.md b/RP2040/README.md → RP2xxx/README.md
@@ -1,10 +1,10 @@
-## IRMP on RP2040
+## IRMP on RP2xxx
 
 <img src="https://www.vdr-portal.de/index.php?attachment/48154-20230825-130009-jpg" width="33%"> [1]  
 [Receiver inside thin client](https://www.vdr-portal.de/index.php?attachment/49235-ir-sensor-1-jpg) [2]  
 [Receiver inside thin client](https://www.vdr-portal.de/index.php?attachment/49236-ir-sensor-2-jpg) [2]
 
-For boards with the RP2040, e.g. the Raspberry Pi Pico and many others.  
+For boards with the RP2xxx, e.g. the Raspberry Pi Pico, Pico2 and many others.  
 This is additional information, basic information in https://github.com/j1rie/IRMP_STM32#readme.
 
 ## Flashing the firmware

diff --git a/.../2023-07-04_23-53_RP2040_hid_irmp_kbd.bin → .../2023-07-04_23-53_RP2040_hid_irmp_kbd.bin b/.../2023-07-04_23-53_RP2040_hid_irmp_kbd.bin → .../2023-07-04_23-53_RP2040_hid_irmp_kbd.bin
diff --git a/.../2023-07-04_23-53_RP2040_hid_irmp_kbd.uf2 → .../2023-07-04_23-53_RP2040_hid_irmp_kbd.uf2 b/.../2023-07-04_23-53_RP2040_hid_irmp_kbd.uf2 → .../2023-07-04_23-53_RP2040_hid_irmp_kbd.uf2
diff --git a/.../2023-07-07_17-25_RP2040_hid_irmp_kbd.bin → .../2023-07-07_17-25_RP2040_hid_irmp_kbd.bin b/.../2023-07-07_17-25_RP2040_hid_irmp_kbd.bin → .../2023-07-07_17-25_RP2040_hid_irmp_kbd.bin
diff --git a/.../2023-07-07_17-25_RP2040_hid_irmp_kbd.uf2 → .../2023-07-07_17-25_RP2040_hid_irmp_kbd.uf2 b/.../2023-07-07_17-25_RP2040_hid_irmp_kbd.uf2 → .../2023-07-07_17-25_RP2040_hid_irmp_kbd.uf2
diff --git a/.../2024-03-22_14-44_RP2040_hid_irmp_kbd.bin → .../2024-03-22_14-44_RP2040_hid_irmp_kbd.bin b/.../2024-03-22_14-44_RP2040_hid_irmp_kbd.bin → .../2024-03-22_14-44_RP2040_hid_irmp_kbd.bin
diff --git a/.../2024-03-22_14-44_RP2040_hid_irmp_kbd.uf2 → .../2024-03-22_14-44_RP2040_hid_irmp_kbd.uf2 b/.../2024-03-22_14-44_RP2040_hid_irmp_kbd.uf2 → .../2024-03-22_14-44_RP2040_hid_irmp_kbd.uf2
diff --git a/...ld/2024-04-17_14-08_pico_hid_irmp_kbd.uf2 → ...ld/2024-04-17_14-08_pico_hid_irmp_kbd.uf2 b/...ld/2024-04-17_14-08_pico_hid_irmp_kbd.uf2 → ...ld/2024-04-17_14-08_pico_hid_irmp_kbd.uf2
diff --git a/...ld/2024-06-18_00-11_pico_hid_irmp_kbd.bin → ...ld/2024-06-18_00-11_pico_hid_irmp_kbd.bin b/...ld/2024-06-18_00-11_pico_hid_irmp_kbd.bin → ...ld/2024-06-18_00-11_pico_hid_irmp_kbd.bin
diff --git a/...ld/2024-06-18_00-11_pico_hid_irmp_kbd.uf2 → ...ld/2024-06-18_00-11_pico_hid_irmp_kbd.uf2 b/...ld/2024-06-18_00-11_pico_hid_irmp_kbd.uf2 → ...ld/2024-06-18_00-11_pico_hid_irmp_kbd.uf2
diff --git a/...-11_waveshare_rp2040_one_hid_irmp_kbd.bin → ...-11_waveshare_rp2040_one_hid_irmp_kbd.bin b/...-11_waveshare_rp2040_one_hid_irmp_kbd.bin → ...-11_waveshare_rp2040_one_hid_irmp_kbd.bin
diff --git a/...-11_waveshare_rp2040_one_hid_irmp_kbd.uf2 → ...-11_waveshare_rp2040_one_hid_irmp_kbd.uf2 b/...-11_waveshare_rp2040_one_hid_irmp_kbd.uf2 → ...-11_waveshare_rp2040_one_hid_irmp_kbd.uf2
diff --git a/...11_waveshare_rp2040_zero_hid_irmp_kbd.bin → ...11_waveshare_rp2040_zero_hid_irmp_kbd.bin b/...11_waveshare_rp2040_zero_hid_irmp_kbd.bin → ...11_waveshare_rp2040_zero_hid_irmp_kbd.bin
diff --git a/...11_waveshare_rp2040_zero_hid_irmp_kbd.uf2 → ...11_waveshare_rp2040_zero_hid_irmp_kbd.uf2 b/...11_waveshare_rp2040_zero_hid_irmp_kbd.uf2 → ...11_waveshare_rp2040_zero_hid_irmp_kbd.uf2
diff --git a/RP2xxx/build/2024-09-12_14-21_pico_hid_irmp_kbd.bin b/RP2xxx/build/2024-09-12_14-21_pico_hid_irmp_kbd.bin
diff --git a/RP2xxx/build/2024-09-12_14-21_pico_hid_irmp_kbd.uf2 b/RP2xxx/build/2024-09-12_14-21_pico_hid_irmp_kbd.uf2
diff --git a/RP2xxx/build/2024-09-12_14-22_pico2_hid_irmp_kbd.bin b/RP2xxx/build/2024-09-12_14-22_pico2_hid_irmp_kbd.bin
diff --git a/RP2xxx/build/2024-09-12_14-22_pico2_hid_irmp_kbd.uf2 b/RP2xxx/build/2024-09-12_14-22_pico2_hid_irmp_kbd.uf2
diff --git a/RP2xxx/build/2024-09-12_14-22_waveshare_rp2040_one_hid_irmp_kbd.bin b/RP2xxx/build/2024-09-12_14-22_waveshare_rp2040_one_hid_irmp_kbd.bin
diff --git a/RP2xxx/build/2024-09-12_14-22_waveshare_rp2040_one_hid_irmp_kbd.uf2 b/RP2xxx/build/2024-09-12_14-22_waveshare_rp2040_one_hid_irmp_kbd.uf2
diff --git a/RP2xxx/build/2024-09-12_14-22_waveshare_rp2040_zero_hid_irmp_kbd.bin b/RP2xxx/build/2024-09-12_14-22_waveshare_rp2040_zero_hid_irmp_kbd.bin
diff --git a/RP2xxx/build/2024-09-12_14-22_waveshare_rp2040_zero_hid_irmp_kbd.uf2 b/RP2xxx/build/2024-09-12_14-22_waveshare_rp2040_zero_hid_irmp_kbd.uf2
diff --git a/RP2040/eeprom/eeprom.c → RP2xxx/eeprom/eeprom.c b/RP2040/eeprom/eeprom.c → RP2xxx/eeprom/eeprom.c
diff --git a/RP2040/eeprom/eeprom.h → RP2xxx/eeprom/eeprom.h b/RP2040/eeprom/eeprom.h → RP2xxx/eeprom/eeprom.h
@@ -1,5 +1,5 @@
 /*
-    RPI2040 EEPROM emulation
+    RP2xxx EEPROM emulation
 
     Based on ESP8266 EEPROM library, which is
     Copyright (c) 2014 Ivan Grokhotkov. All rights reserved.

diff --git a/RP2040/irmp/README.txt → RP2xxx/irmp/README.txt b/RP2040/irmp/README.txt → RP2xxx/irmp/README.txt
diff --git a/RP2040/irmp/irmp.c → RP2xxx/irmp/irmp.c b/RP2040/irmp/irmp.c → RP2xxx/irmp/irmp.c
@@ -2549,7 +2549,7 @@ irmp_init (void)
     IRMP_GPIO_STRUCT->DDR &= ~(1<<IRMP_BIT);                            // pin is input
     IRMP_GPIO_STRUCT->CR1 |= (1<<IRMP_BIT);                             // activate pullup
 
-#elif defined (ARM_RP2040)                                              // ARM_RP2040
+#elif defined (ARM_RP2xxx)                                              // ARM_RP2xxx
     /* GPIO Configuration */
     gpio_init(IRMP_BIT);
     gpio_disable_pulls(IRMP_BIT);

diff --git a/RP2040/irmp/irmp.h → RP2xxx/irmp/irmp.h b/RP2040/irmp/irmp.h → RP2xxx/irmp/irmp.h
@@ -103,7 +103,7 @@
 #  define IRMP_PIN                              IRMP_GPIO_STRUCT->IDR
 #  define input(x)                              ((x) & (1 << IRMP_BIT))
 
-#elif defined (ARM_RP2040)                       
+#elif defined (ARM_RP2xxx)
 #  define IRMP_BIT                              IRMP_BIT_NUMBER
 #  define IRMP_PIN                              IRMP_BIT_NUMBER // for use with input(x) below
 #  define input(x)                              (gpio_get(x))

diff --git a/RP2040/irmp/irmpconfig.h → RP2xxx/irmp/irmpconfig.h b/RP2040/irmp/irmpconfig.h → RP2xxx/irmp/irmpconfig.h
@@ -188,10 +188,10 @@
 #  define IRMP_BIT_NUMBER                       1                       // change here
 
 /*---------------------------------------------------------------------------------------------------------------------------------------------------
- * Change hardware pin here for ARM RP2040
+ * Change hardware pin here for ARM RP2xxx
  *---------------------------------------------------------------------------------------------------------------------------------------------------
  */
-#elif defined (ARM_RP2040)                                               // use IR_IN_GPIO as IR input on RP2040
+#elif defined (ARM_RP2xxx)                                               // use IR_IN_GPIO as IR input on RP2xxx
 #  define IRMP_BIT_NUMBER                       IR_IN_GPIO
 
 /*---------------------------------------------------------------------------------------------------------------------------------------------------

diff --git a/RP2040/irmp/irmpprotocols.h → RP2xxx/irmp/irmpprotocols.h b/RP2040/irmp/irmpprotocols.h → RP2xxx/irmp/irmpprotocols.h
diff --git a/RP2040/irmp/irmpsystem.h → RP2xxx/irmp/irmpsystem.h b/RP2040/irmp/irmpsystem.h → RP2xxx/irmp/irmpsystem.h
@@ -67,12 +67,12 @@
 #  define F_CPU SystemCoreClock
 #elif defined(__SDCC_stm8)                                                          // STM8
 #  define SDCC_STM8
-#elif defined(PICO_BOARD)                                                           // ARM RP2040
+#elif defined(PICO_BOARD)                                                           // ARM RP2xxx
 #  include "hardware/clocks.h"
 #  include "hardware/pwm.h"
 #  include "pico/stdlib.h"
 #  include "../src/config.h"
-#  define ARM_RP2040
+#  define ARM_RP2xxx
 #  define F_CPU (clock_get_hz(clk_sys))
 #elif defined(TARGET_IS_BLIZZARD_RA2)                                               // TI Stellaris (tested on Stellaris Launchpad with Code Composer Studio)
 #  define STELLARIS_ARM_CORTEX_M4

diff --git a/RP2040/irmp/irsnd.c → RP2xxx/irmp/irsnd.c b/RP2040/irmp/irsnd.c → RP2xxx/irmp/irsnd.c
@@ -185,7 +185,7 @@
     //Nothing here to do here -> See irsndconfig.h
 #elif defined (ARM_STM32_HAL)                                           // STM32 with Hal Library
     //Nothing here to do here -> See irsndconfig.h
-#elif defined (ARM_RP2040)                                              // ARM_RP2040
+#elif defined (ARM_RP2xxx)                                              // ARM_RP2xxx
     uint slice_num;
 #elif defined (__xtensa__)                                              // ESP8266
     //Nothing here to do here -> See irsndconfig.h
@@ -526,7 +526,7 @@
 #  define IRSND_FREQ_40_KHZ                     (IRSND_FREQ_TYPE) (40000)
 #  define IRSND_FREQ_56_KHZ                     (IRSND_FREQ_TYPE) (56000)
 #  define IRSND_FREQ_455_KHZ                    (IRSND_FREQ_TYPE) (455000)
-#elif defined (ARM_RP2040)                      // ARM_RP2040
+#elif defined (ARM_RP2xxx)                      // ARM_RP2xxx
 #  define IRSND_FREQ_TYPE                       uint32_t
 #  define IRSND_FREQ_30_KHZ                     (IRSND_FREQ_TYPE) (30000)
 #  define IRSND_FREQ_32_KHZ                     (IRSND_FREQ_TYPE) (32000)
@@ -613,7 +613,7 @@ irsnd_on (void)
         IRSND_TIMER->EGR = TIM_EGR_UG;                  // Generate an update event to reload the Prescaler and the Repetition counter values immediately
         HAL_TIM_PWM_Start(&IRSND_TIMER_HANDLER, IRSND_TIMER_CHANNEL_NUMBER);
 
-#  elif defined (ARM_RP2040)                            // ARM_RP2040
+#  elif defined (ARM_RP2xxx)                            // ARM_RP2xxx
         pwm_set_counter(slice_num, 0);                  // reset counter
         pwm_set_enabled(slice_num, true);               // enable counter
         gpio_set_outover(IRSND_BIT, GPIO_OVERRIDE_NORMAL);
@@ -699,7 +699,7 @@ irsnd_off (void)
 #  elif defined (ARM_STM32_HAL)                                                         // STM32
         HAL_TIM_PWM_Stop(&IRSND_TIMER_HANDLER, IRSND_TIMER_CHANNEL_NUMBER);
 
-#  elif defined (ARM_RP2040)                                                            // ARM_RP2040
+#  elif defined (ARM_RP2xxx)                                                            // ARM_RP2xxx
         pwm_set_enabled(slice_num, false);                                              // disable counter
         gpio_set_outover(IRSND_BIT, GPIO_OVERRIDE_LOW);                                 // set IRSND_BIT to low
 
@@ -897,7 +897,7 @@ irsnd_set_freq (IRSND_FREQ_TYPE freq)
             _Error_Handler(__FILE__, __LINE__);
         }
 
-#  elif defined (ARM_RP2040)                                                               // ARM_RP2040
+#  elif defined (ARM_RP2xxx)                                                               // ARM_RP2xxx
         static uint32_t      TimeBaseFreq = 0;
 
         if (TimeBaseFreq == 0)
@@ -1078,7 +1078,7 @@ irsnd_init (void)
 #  elif defined (ARM_STM32_HAL)
         irsnd_set_freq (IRSND_FREQ_36_KHZ);                                         // default frequency
 
-#  elif defined (ARM_RP2040)                                                        // ARM_RP2040
+#  elif defined (ARM_RP2xxx)                                                        // ARM_RP2xxx
         /* GPIO Configuration */
         gpio_set_function(IRSND_BIT, GPIO_FUNC_PWM);
         slice_num = pwm_gpio_to_slice_num(IRSND_BIT);

diff --git a/RP2040/irmp/irsnd.h → RP2xxx/irmp/irsnd.h b/RP2040/irmp/irsnd.h → RP2xxx/irmp/irsnd.h
@@ -76,7 +76,7 @@
 #    error IRSND_TIMER_NUMBER not valid.
 #  endif
 
-#elif defined (ARM_RP2040)                        // ARM_RP2040
+#elif defined (ARM_RP2xxx)                        // ARM_RP2xxx
 #  define IRSND_BIT                             IRSND_BIT_NUMBER
 
 #elif defined(PIC_C18)

diff --git a/RP2040/irmp/irsndconfig.h → RP2xxx/irmp/irsndconfig.h b/RP2040/irmp/irsndconfig.h → RP2xxx/irmp/irsndconfig.h
@@ -164,10 +164,10 @@
 #  define IRSND_TIMER_SPEED_APBX                64000000                //Speed of the corresponding APBx. (see STM32CubeMX: Clock Configuration)
 
 /*---------------------------------------------------------------------------------------------------------------------------------------------------
- * ARM RP2040 section
+ * ARM RP2xxx section
  *---------------------------------------------------------------------------------------------------------------------------------------------------
  */
-#elif defined (ARM_RP2040)                                              // use IR_OUT_GPIO as IR output on RP2040
+#elif defined (ARM_RP2xxx)                                              // use IR_OUT_GPIO as IR output on RP2xxx
 #  define IRSND_BIT_NUMBER                      IR_OUT_GPIO
 
 /*---------------------------------------------------------------------------------------------------------------------------------------------------

diff --git a/RP2040/make_all.sh → RP2xxx/make_all.sh b/RP2040/make_all.sh → RP2xxx/make_all.sh
@@ -13,3 +13,8 @@ cd build_zero
 cmake  -D"PICO_BOARD=waveshare_rp2040_zero" ..
 make -j5
 cd ..
+mkdir build_pico_2
+cd build_pico_2
+cmake -D"PICO_BOARD=pico2" ..
+make -j5
+cd ..
diff --git a/RP2040/make_one.sh → RP2xxx/make_one.sh b/RP2040/make_one.sh → RP2xxx/make_one.sh
diff --git a/RP2040/make_pico.sh → RP2xxx/make_pico.sh b/RP2040/make_pico.sh → RP2xxx/make_pico.sh
diff --git a/RP2xxx/make_pico_2.sh b/RP2xxx/make_pico_2.sh
@@ -0,0 +1,4 @@
+mkdir build_pico_2
+cd build_pico_2
+cmake -D"PICO_BOARD=pico2" ..
+make -j5
diff --git a/RP2040/make_zero.sh → RP2xxx/make_zero.sh b/RP2040/make_zero.sh → RP2xxx/make_zero.sh
diff --git a/RP2040/src/config.h → RP2xxx/src/config.h b/RP2040/src/config.h → RP2xxx/src/config.h
diff --git a/RP2040/src/irmpmain.c → RP2xxx/src/irmpmain.c b/RP2040/src/irmpmain.c → RP2xxx/src/irmpmain.c
diff --git a/RP2040/src/irmpmain.h → RP2xxx/src/irmpmain.h b/RP2040/src/irmpmain.h → RP2xxx/src/irmpmain.h
diff --git a/RP2040/src/main.c → RP2xxx/src/main.c b/RP2040/src/main.c → RP2xxx/src/main.c
@@ -268,7 +268,7 @@ void LED_Switch_init(void)
 	gpio_set_drive_strength(EXTLED_GPIO, GPIO_DRIVE_STRENGTH_12MA);
 	gpio_set_drive_strength(STATUSLED_GPIO, GPIO_DRIVE_STRENGTH_12MA);
 	//gpio_set_drive_strength(WAKEUP_GPIO, GPIO_DRIVE_STRENGTH_12MA); // TODO: once enough?!
-	gpio_set_dir(WAKEUP_GPIO, GPIO_IN); // no open drain on RP2040
+	gpio_set_dir(WAKEUP_GPIO, GPIO_IN); // no open drain on RP2xxx
 	gpio_set_dir(EXTLED_GPIO, GPIO_OUT);
 	gpio_set_dir(STATUSLED_GPIO, GPIO_OUT);
 }
@@ -471,7 +471,13 @@ void SysTick_Handler(void)
 void Systick_Init(void)
 {
 	exception_set_exclusive_handler(SYSTICK_EXCEPTION, SysTick_Handler);
+#if PICO_RP2040
 	systick_hw->csr = M0PLUS_SYST_CSR_ENABLE_BITS | M0PLUS_SYST_CSR_TICKINT_BITS | M0PLUS_SYST_CSR_CLKSOURCE_BITS;
+#elif PICO_RP2350
+	systick_hw->csr = M33_SYST_CSR_ENABLE_BITS | M33_SYST_CSR_TICKINT_BITS | M33_SYST_CSR_CLKSOURCE_BITS;
+#else
+	#error unknown PICO_BOARD
+#endif
 	/* 1ms */
 	systick_hw->rvr = 124999UL;
 }

diff --git a/RP2040/src/usb_hid.c → RP2xxx/src/usb_hid.c b/RP2040/src/usb_hid.c → RP2xxx/src/usb_hid.c
diff --git a/RP2040/src/usb_hid.h → RP2xxx/src/usb_hid.h b/RP2040/src/usb_hid.h → RP2xxx/src/usb_hid.h
diff --git a/RP2040/src/ws2812.c → RP2xxx/src/ws2812.c b/RP2040/src/ws2812.c → RP2xxx/src/ws2812.c
diff --git a/RP2040/src/ws2812.h → RP2xxx/src/ws2812.h b/RP2040/src/ws2812.h → RP2xxx/src/ws2812.h
diff --git a/RP2040/src/ws2812.pio → RP2xxx/src/ws2812.pio b/RP2040/src/ws2812.pio → RP2xxx/src/ws2812.pio
diff --git a/RP2040/timestamp/CMakeLists.txt → RP2xxx/timestamp/CMakeLists.txt b/RP2040/timestamp/CMakeLists.txt → RP2xxx/timestamp/CMakeLists.txt
diff --git a/RP2040/timestamp/license.txt → RP2xxx/timestamp/license.txt b/RP2040/timestamp/license.txt → RP2xxx/timestamp/license.txt
diff --git a/RP2040/timestamp/readme.txt → RP2xxx/timestamp/readme.txt b/RP2040/timestamp/readme.txt → RP2xxx/timestamp/readme.txt
diff --git a/RP2040/timestamp/timestamp.c → RP2xxx/timestamp/timestamp.c b/RP2040/timestamp/timestamp.c → RP2xxx/timestamp/timestamp.c
diff --git a/RP2040/timestamp/timestamp.h → RP2xxx/timestamp/timestamp.h b/RP2040/timestamp/timestamp.h → RP2xxx/timestamp/timestamp.h
diff --git a/RP2040/usb/tusb_config.h → RP2xxx/usb/tusb_config.h b/RP2040/usb/tusb_config.h → RP2xxx/usb/tusb_config.h
diff --git a/RP2040/usb/usb_descriptors.c → RP2xxx/usb/usb_descriptors.c b/RP2040/usb/usb_descriptors.c → RP2xxx/usb/usb_descriptors.c
@@ -70,8 +70,8 @@ uint8_t const * tud_descriptor_device_cb(void)
 // HID Report Descriptor
 //--------------------------------------------------------------------+
 
-#define HID_IN_REPORT_COUNT     64 /* RP2040->PC */
-#define HID_OUT_REPORT_COUNT    64 /* PC->RP2040 */
+#define HID_IN_REPORT_COUNT     64 /* RP2xxx->PC */
+#define HID_OUT_REPORT_COUNT    64 /* PC->RP2xxx */
 
 #define REPORT_ID_KBD           0x01
 #define REPORT_ID_CONFIG_IN     0x02
@@ -93,22 +93,22 @@ uint8_t const * tud_descriptor_device_cb(void)
       HID_LOGICAL_MAX_N ( 0xff, 2                              ),\
       HID_REPORT_SIZE   ( 8                                    ),\
 \
-      /* RP2040->PC */ \
+      /* RP2xxx->PC */ \
       /*HID_REPORT_ID   ( REPORT_ID_CONFIG_IN                ),*/\
       0x85, REPORT_ID_CONFIG_IN, /* HID_REPORT_ID              */\
       HID_USAGE       ( 0x03                                   ),\
       HID_REPORT_COUNT( HID_IN_REPORT_COUNT-1                  ),\
       HID_INPUT       ( HID_DATA | HID_VARIABLE | HID_ABSOLUTE ),\
 \
-      /* PC->RP2040 */ \
+      /* PC->RP2xxx */ \
       /*HID_REPORT_ID     ( REPORT_ID_CONFIG_OUT             ),*/\
       0x85, REPORT_ID_CONFIG_OUT, /* HID_REPORT_ID             */\
       HID_USAGE       ( 0x04                                   ),\
       HID_REPORT_COUNT( HID_OUT_REPORT_COUNT-1                 ),\
       HID_OUTPUT      ( HID_DATA | HID_VARIABLE | HID_ABSOLUTE ),\
     HID_COLLECTION_END, \
 \
-      /* RP2040->PC, HID Keyboard */ \
+      /* RP2xxx->PC, HID Keyboard */ \
     HID_USAGE_PAGE_N ( HID_USAGE_PAGE_DESKTOP, 2                ),\
     HID_USAGE        (  HID_USAGE_DESKTOP_KEYBOARD              ),\
     HID_COLLECTION   ( HID_COLLECTION_APPLICATION               ),\

diff --git a/STM32F103x8/patches/irmp.patch b/STM32F103x8/patches/irmp.patch
@@ -1,7 +1,7 @@
 diff -Nrup A/irmpconfig.h B/irmpconfig.h
 --- A/irmpconfig.h	2022-01-22 17:30:00.000000000 +0100
 +++ B/irmpconfig.h	2022-01-22 18:52:36.088007775 +0100
-@@ -277,7 +277,7 @@
+@@ -284,7 +284,7 @@
   *---------------------------------------------------------------------------------------------------------------------------------------------------
   */
  #ifndef IRMP_USE_CALLBACK

diff --git a/STM32F103xC/patches/irmp.patch b/STM32F103xC/patches/irmp.patch
@@ -1,7 +1,7 @@
 diff -Nrup A/irmpconfig.h B/irmpconfig.h
 --- A/irmpconfig.h	2022-01-22 17:30:00.000000000 +0100
 +++ B/irmpconfig.h	2022-01-22 18:52:36.088007775 +0100
-@@ -277,7 +277,7 @@
+@@ -284,7 +284,7 @@
   *---------------------------------------------------------------------------------------------------------------------------------------------------
   */
  #ifndef IRMP_USE_CALLBACK

diff --git a/STM32F105xC/patches/irmp.patch b/STM32F105xC/patches/irmp.patch
@@ -1,7 +1,7 @@
 diff -Nrup A/irmpconfig.h B/irmpconfig.h
 --- A/irmpconfig.h	2022-01-22 17:30:00.000000000 +0100
 +++ B/irmpconfig.h	2022-01-22 18:52:36.088007775 +0100
-@@ -277,7 +277,7 @@
+@@ -284,7 +284,7 @@
   *---------------------------------------------------------------------------------------------------------------------------------------------------
   */
  #ifndef IRMP_USE_CALLBACK

diff --git a/STM32F303xC/patches/irmp.patch b/STM32F303xC/patches/irmp.patch
@@ -1,7 +1,7 @@
 diff -Nrup A/irmpconfig.h B/irmpconfig.h
 --- A/irmpconfig.h	2022-01-22 17:30:00.000000000 +0100
 +++ B/irmpconfig.h	2022-01-22 18:52:36.088007775 +0100
-@@ -277,7 +277,7 @@
+@@ -284,7 +284,7 @@
   *---------------------------------------------------------------------------------------------------------------------------------------------------
   */
  #ifndef IRMP_USE_CALLBACK

diff --git a/STM32F401xC/patches/irmp.patch b/STM32F401xC/patches/irmp.patch
@@ -1,7 +1,7 @@
 diff -Nrup A/irmpconfig.h B/irmpconfig.h
 --- A/irmpconfig.h	2022-01-22 17:30:00.000000000 +0100
 +++ B/irmpconfig.h	2022-01-22 18:52:36.088007775 +0100
-@@ -277,7 +277,7 @@
+@@ -284,7 +284,7 @@
   *---------------------------------------------------------------------------------------------------------------------------------------------------
   */
  #ifndef IRMP_USE_CALLBACK

diff --git a/STM32F401xE/patches/irmp.patch b/STM32F401xE/patches/irmp.patch
@@ -1,7 +1,7 @@
 diff -Nrup A/irmpconfig.h B/irmpconfig.h
 --- A/irmpconfig.h	2022-01-22 17:30:00.000000000 +0100
 +++ B/irmpconfig.h	2022-01-22 18:52:36.088007775 +0100
-@@ -277,7 +277,7 @@
+@@ -284,7 +284,7 @@
   *---------------------------------------------------------------------------------------------------------------------------------------------------
   */
  #ifndef IRMP_USE_CALLBACK

diff --git a/stm32kbdIRconfig/Linux/stm32kbdIRconfig b/stm32kbdIRconfig/Linux/stm32kbdIRconfig
diff --git a/stm32kbdIRconfig/Linux/stm32kbdIRconfig.c b/stm32kbdIRconfig/Linux/stm32kbdIRconfig.c
@@ -199,13 +199,13 @@ int main(int argc, const char **argv) {
 		printf("old firmware!\n");
 	puts("");
 
-cont:	printf("set: wakeups, macros, IR-data, keys, repeat, alarm, commit on RP2040, statusled and neopixel(s)\nset by remote: wakeups, macros and IR-data (q)\nget: wakeups, macros, IR-data, keys, repeat, alarm, capabilities, eeprom and raw eeprom from RP2040 (g)\nreset: wakeups, macros, IR-data, keys, repeat, alarm and eeprom (r)\nsend IR (i)\nreboot (b)\nmonitor until ^C (m)\nrun test (t)\nhid test (h)\nneopixel test (n)\nexit (x)\n");
+cont:	printf("set: wakeups, macros, IR-data, keys, repeat, alarm, commit on RP2xxx, statusled and neopixel(s)\nset by remote: wakeups, macros and IR-data (q)\nget: wakeups, macros, IR-data, keys, repeat, alarm, capabilities, eeprom and raw eeprom from RP2xxx (g)\nreset: wakeups, macros, IR-data, keys, repeat, alarm and eeprom (r)\nsend IR (i)\nreboot (b)\nmonitor until ^C (m)\nrun test (t)\nhid test (h)\nneopixel test (n)\nexit (x)\n");
 	scanf("%s", &c);
 
 	switch (c) {
 
 	case 's':
-set:		printf("set wakeup(w)\nset macro(m)\nset IR-data(i)\nset key(k)\nset repeat(r)\nset alarm(a)\ncommit on RP2040(c)\nstatusled(s)\nneopixel(n)\n");
+set:		printf("set wakeup(w)\nset macro(m)\nset IR-data(i)\nset key(k)\nset repeat(r)\nset alarm(a)\ncommit on RP2xxx(c)\nstatusled(s)\nneopixel(n)\n");
 		scanf("%s", &d);
 		memset(&outBuf[2], 0, sizeof(outBuf) - 2);
 		idx = 2;
@@ -416,7 +416,7 @@ Set:		printf("set wakeup with remote control(w)\nset macro with remote control(m
 		break;
 
 	case 'g':
-get:		printf("get wakeup(w)\nget macro(m)\nget IR-data (i)\nget key(k)\nget repeat(r)\nget caps(c)\nget alarm(a)\nget eeprom(e)\nget raw eeprom from RP2040(p)\n");
+get:		printf("get wakeup(w)\nget macro(m)\nget IR-data (i)\nget key(k)\nget repeat(r)\nget caps(c)\nget alarm(a)\nget eeprom(e)\nget raw eeprom from RP2xxx(p)\n");
 		scanf("%s", &d);
 		memset(&outBuf[2], 0, sizeof(outBuf) - 2);
 		idx = 2;