Fix output filenames

CMakeLists.txt

@@ -70,13 +70,16 @@ else()
   set(PICO_PLATFORM rp2040)
 endif()
 
-### Target product
+### Target product & output filename
 if(${PICO_BOARD} STREQUAL "pico")
   set(PROJECT_PRODUCT ${PRODUCT_STRING})
+  set(PROJECT_FILENAME ${PROJECT_NAME})
 elseif(${PICO_BOARD} STREQUAL "pico_w")
   set(PROJECT_PRODUCT "${PRODUCT_STRING}_W")
+  set(PROJECT_FILENAME "${PROJECT_NAME}_w")
 elseif(${PICO_BOARD} STREQUAL "pico2")
   set(PROJECT_PRODUCT "${PRODUCT_STRING}2")
+  set(PROJECT_FILENAME "${PROJECT_NAME}2")
 endif()
 
 ### Version validation
@@ -189,14 +192,14 @@ message("Compile time flags: ${COMPILE_OPTS}")
 
 ### Executable names
 list(APPEND FILENAMES
-  ${PROJECT_NAME}_${PICO_BOARD}
+  ${PROJECT_FILENAME}
 )
 list(APPEND PICOTYPES
   "LED"
 )
 if(${PICO_BOARD} STREQUAL "pico")
 list(APPEND FILENAMES
-  ${PROJECT_NAME}-rgb_${PICO_BOARD}
+  ${PROJECT_FILENAME}-rgb
 )
 list(APPEND PICOTYPES
     "RGB"

README.md

@@ -92,10 +92,10 @@ Windows/Android: USB Midi, ASID (in webbrowser) SID Play
 # Firmware
 See the [firmware changelog](CHANGELOG.md) for more information on what's changed and previous releases.
 ### Firmware versions
-Use `usbsidpico_pico.uf2` for Pico1 regular green rp2040 Pico boards.  
-Use `usbsidpico-rgb_pico.uf2` for Pico1 black clone rp2040 Pico boards with RGB LED onboard.  
-Use `usbsidpico_pico_w.uf2` for PicoW regular green rp2040 Pico boards.  
-Use `usbsidpico_pico2.uf2` for Pico2 regular green rp2040 Pico boards.  
+Use `usbsidpico.uf2` for Pico1 regular green rp2040 Pico boards.  
+Use `usbsidpico-rgb.uf2` for Pico1 black clone rp2040 Pico boards with RGB LED onboard.  
+Use `usbsidpico_w.uf2` for PicoW regular green rp2040 Pico boards.  
+Use `usbsidpico2.uf2` for Pico2 regular green rp2040 Pico boards.  
 **WARNING!** Do _NOT_ use the RGB firmware for any of the (non black) rp2040 or rp2350 Pico boards that do not contain an RGB LED.
 ### How to flash
 A Raspberry Pi Pico board is incredibly easy to flash, as it comes with a built in bootloader for flashing new firmwares in the `uf2` format.