Merge pull request #88 from LouDnl/dev

Prepare for intermedia v0.7.0 release

Author: LouDnl

CMakeLists.txt

@@ -25,6 +25,13 @@
 ### Cmake minimum version
 cmake_minimum_required(VERSION 3.17)
 
+### Cmake compiler standard versions
+set(CMAKE_C_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
+
+### CMake stuff for ZED
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
 ### Project magic sprinkles
 set(PROJECT_NAME usbsidpico)
 set(PROJECT_MANUFACTURER "LouD")
@@ -61,6 +68,9 @@ set(ONBOARD_SIDPLAYER 0 CACHE STRING "ONBOARD_SIDPLAYER")
 ### Enable/ Disable build with PIO Uart on unused pins 26/27
 set(USE_PIO_UART 0)
 
+### Enable/ Disable build with Bluetooth on rp2350_w
+set(ENABLE_BLUETOOTH 0 CACHE STRING "ENABLE_BLUETOOTH")
+
 ### Information on the use of CDC callback
 ## This is turned on/off by changing USE_CDC_CALLBACK in globals.h
 
@@ -175,10 +185,6 @@ else()
   set(PICO_COMPILER pico_arm_gcc)  # required for mem_ops on rp2040
 endif()
 
-### Cmake compiler standard versions
-set(CMAKE_C_STANDARD 11)
-set(CMAKE_CXX_STANDARD 17)
-
 ### Target environment path
 set(CMAKE_FIND_ROOT_PATH $ENV{PICO_ENV_PATH})
 set(TINYUSB_PATH ${PICO_SDK_PATH}/lib/tinyusb)
@@ -301,34 +307,44 @@ endif()
 list(APPEND FILENAMES
   ${PROJECT_FILENAME}-v1.0
   ${PROJECT_FILENAME}-v1.3
+  ${PROJECT_FILENAME}-v1.5
 )
 list(APPEND PICOTYPES
   "LED"
-  "LED_AUDIOSWITCH"
+  "LED"
+  "LED"
 )
 list(APPEND PCBVERSIONS
   "1.0"
   "1.3"
+  "1.5"
 )
 if(${PICO_BOARD} STREQUAL "pico" OR ${PICO_BOARD} STREQUAL "pico2")
   list(APPEND FILENAMES
     ${PROJECT_FILENAME}-v1.0-rgb
     ${PROJECT_FILENAME}-v1.3-rgb
+    ${PROJECT_FILENAME}-v1.5-rgb
   )
   list(APPEND PICOTYPES
     "RGB"
-    "RGB_AUDIOSWITCH"
+    "RGB"
+    "RGB"
   )
   list(APPEND PCBVERSIONS
+  # "0.1"  ## Alpha builds only
+  # "0.2"  ## Unreliable
   "1.0"
+  # "1.1"  ## Never built
+  # "1.2"  ## Incorrect gpio pins placing
   "1.3"
-)
+  # "1.4"  ## Power delivery issue
+  "1.5"
+  )
 endif()
 
 ### Source files to compile
 set(SOURCEFILES
   ${CMAKE_CURRENT_LIST_DIR}/src/usbsid.c
-  ${CMAKE_CURRENT_LIST_DIR}/src/usbsid_doubletap.c
   ${CMAKE_CURRENT_LIST_DIR}/src/usbsid_constants.c
   ${CMAKE_CURRENT_LIST_DIR}/src/config.c
   ${CMAKE_CURRENT_LIST_DIR}/src/config_bus.c
@@ -518,6 +534,27 @@ set(TARGET_LL
   tinyusb_board
 )
 
+### Bluetooth control for _w boards
+if(ENABLE_BLUETOOTH EQUAL 1)
+  if(${PICO_BOARD} STREQUAL "pico2_w")
+    set(SOURCEFILES
+      ${SOURCEFILES}
+      ${CMAKE_CURRENT_LIST_DIR}/src/bluetooth.c
+    )
+
+    set(TARGET_LL
+      ${TARGET_LL}
+      pico_cyw43_arch_none  # Select 'none', 'background', or 'rtos' architecture
+      pico_btstack_classic  # Main stack for Classic SPP Bluetooth
+      pico_btstack_cyw43    # Ties BTstack to the onboard CYW chip
+    )
+
+    set(BT_TARGET_PIO 2)    # Use rp2350 pio2
+    add_compile_definitions(USE_BLUETOOTH=1)
+  endif()
+endif()
+
+
 ### Pio files
 set(PIO_BUS     ${CMAKE_CURRENT_LIST_DIR}/src/pio/bus_control.pio)
 set(PIO_CLOCK   ${CMAKE_CURRENT_LIST_DIR}/src/pio/clock.pio)
@@ -627,17 +664,11 @@ foreach(FILENAME PICOTYPE PCBVERSION IN ZIP_LISTS FILENAMES PICOTYPES PCBVERSION
   # executable
   add_executable(${BUILD} ${SOURCEFILES})
   # BUILD TYPES
+  string(REPLACE "." "" PCBVER_INT "${PCBVERSION}")
   if(PICOTYPE STREQUAL "RGB")
-    target_compile_definitions(${BUILD} PRIVATE USBSID USBSID_PRODUCT="${BUILD_VERSION}" USE_RGB=1 PCB_VERSION="${PCBVERSION}")
-    # add_compile_definitions(USE_RGB=1)
-  elseif(PICOTYPE STREQUAL "RGB_AUDIOSWITCH")
-    target_compile_definitions(${BUILD} PRIVATE USBSID USBSID_PRODUCT="${BUILD_VERSION}" USE_RGB=1 HAS_AUDIOSWITCH=1 PCB_VERSION="${PCBVERSION}")
-    # add_compile_definitions(USE_RGB=1 HAS_AUDIOSWITCH=1)
-  elseif(PICOTYPE STREQUAL "LED_AUDIOSWITCH")
-    target_compile_definitions(${BUILD} PRIVATE USBSID USBSID_PRODUCT="${BUILD_VERSION}" HAS_AUDIOSWITCH=1 PCB_VERSION="${PCBVERSION}")
-    # add_compile_definitions(HAS_AUDIOSWITCH=1)
+    target_compile_definitions(${BUILD} PRIVATE USBSID USBSID_PRODUCT="${BUILD_VERSION}" USE_RGB=1 PCB_VERSION="${PCBVERSION}" PCB_VERSION_INT=${PCBVER_INT})
   else()
-    target_compile_definitions(${BUILD} PRIVATE USBSID USBSID_PRODUCT="${BUILD_VERSION}" PCB_VERSION="${PCBVERSION}")
+    target_compile_definitions(${BUILD} PRIVATE USBSID USBSID_PRODUCT="${BUILD_VERSION}" PCB_VERSION="${PCBVERSION}" PCB_VERSION_INT=${PCBVER_INT})
   endif()
   # pio addition
   pico_generate_pio_header(${BUILD} ${PIO_BUS})
@@ -673,7 +704,12 @@ foreach(FILENAME PICOTYPE PCBVERSION IN ZIP_LISTS FILENAMES PICOTYPES PCBVERSION
   endif()
   # tell the linker what libraries to link
   target_link_libraries(${BUILD} ${TARGET_LL})
-  if (PICO_CYW43_SUPPORTED)
+  if ((ENABLE_BLUETOOTH EQUAL 1) AND (${PICO_BOARD} STREQUAL "pico2_w"))
+    # Redirect the CYW43 wireless driver to use the third PIO block (PIO2)
+    target_compile_definitions(${BUILD} PRIVATE
+        CYW43_SPI_PIO_PREFERRED_PIO=${BT_TARGET_PIO}
+    )
+  elseif(PICO_CYW43_SUPPORTED AND NOT (ENABLE_BLUETOOTH EQUAL 1))
     target_link_libraries(${BUILD} pico_cyw43_arch_none)
   endif()
   # target usbsid types
@@ -685,4 +721,7 @@ foreach(FILENAME PICOTYPE PCBVERSION IN ZIP_LISTS FILENAMES PICOTYPES PCBVERSION
   # enable uart output, disable usb output
   pico_enable_stdio_uart(${BUILD} 1)  # essentialy the same as LL pico_stdio_uart
   pico_enable_stdio_usb(${BUILD} 0)
+if(${PICO_BOARD} STREQUAL "pico2_w")
+  pico_add_extra_outputs(${BUILD})
+endif()
 endforeach()

README.md

@@ -2,6 +2,12 @@
 # [<img src="images/usbsid-logo.png" width="250em">](images/usbsid-logo.png)![LouD](images/loud.png)
 USBSID-Pico is a RaspberryPi Pico/PicoW (RP2040) & Pico2/Pico2W (RP2350) based board for interfacing one or two MOS SID chips and/or hardware SID emulators over (WEB)USB with your computer, phone, ASID supporting player or USB midi controller.  
 
+
+# NEW: USBSID-Pico Configtool
+Checkout the new [USBSID-Pico Configtool](https://github.com/LouDnl/USBSID-Pico-Configtool)  
+[<img src="images/screenshot-linux.png" width="500em">](https://github.com/LouDnl/USBSID-Pico-Configtool)  
+
+
 # This is USBSID-Pico! :)
 | **“Raster Bar” (8-bit)** | **Van Halen's Jump<br>dual SID in Stereo!** | **Next Level** | **Outerversal<br>dual SID in Stereo!** |
 |:-:|:-:|:-:|:-:|
@@ -11,6 +17,7 @@ USBSID-Pico is a RaspberryPi Pico/PicoW (RP2040) & Pico2/Pico2W (RP2350) based b
 |:-:|:-:|:-:|:-:|
 | [<img src="https://img.youtube.com/vi/7hiAkLAqsiI/0.jpg" width=75%>](https://www.youtube.com/watch?v=7hiAkLAqsiI)<br><small><sub>by Censor Design</sub></small> | [<img src="https://img.youtube.com/vi/4gckiwzOW9U/0.jpg" width=75%>](https://www.youtube.com/watch?v=4gckiwzOW9U)<br><small><sub>by Censor Design</sub></small> | [<img src="https://img.youtube.com/vi/q4Fg7V2DYCI/0.jpg" width=75%>](https://www.youtube.com/watch?v=q4Fg7V2DYCI)<br><small><sub>by Censor Design</sub> | [<img src="https://img.youtube.com/vi/RTtmsbH4jC0/0.jpg" width=75%>](https://www.youtube.com/watch?v=RTtmsbH4jC0)<br><small><sub>by Censor Design</sub></small> |
 
+
 # Swag!
 Do you like swag!? I sure do!! [greyandslate](https://bsky.app/profile/greyandslate.bsky.social) created these great t-shirt designs which are available for purchase in his [Etsy shop](https://greyandslate.etsy.com/?search_query=usbsid), link below.  
 **Use coupon code USBSID15 for a 15% discount!**  
@@ -20,6 +27,7 @@ Shop link: [https://greyandslate.etsy.com/?search_query=usbsid](https://greyands
 [<img src="images/tees/usbsid-pico-tshirt-logo.jpg" width="250em">](https://www.etsy.com/nl/listing/4426327960/t-shirt-usbsid-pico-logo-chiptune?etsrc=sdt)
 [<img src="images/tees/usbsid-pico-tshirt-board.jpg" width="250em">](https://www.etsy.com/nl/listing/4426320773/usbsid-pico-chiptune-board-t-shirt-met?etsrc=sdt)
 
+
 # Index
 * [Software support & Features](#software-support-and-features)
   * [Software manual](doc/USBSID-Pico-software-manual.adoc) [PDF](doc/USBSID-Pico-software-manual.pdf)
@@ -64,6 +72,7 @@ Shop link: [https://greyandslate.etsy.com/?search_query=usbsid](https://greyands
 * [License](#license)
 * [Certification](#certification)
 
+
 # Software support and features
 ![USBSID-Pico](images/pcbv1.3-pdsid.png)  
 See the [Software manual](doc/USBSID-Pico-software-manual.adoc) for more information on how to use supported software!  
@@ -132,6 +141,7 @@ Any questions about or support with USBSID-Pico can be asked
 * [Github discussions](https://github.com/LouDnl/USBSID-Pico/discussions)
 * [USBSID manuals](doc/)
 
+
 # Project status
 Visit the [Project Page](https://github.com/users/LouDnl/projects/1) for an up-to-date list of things being worked on.
 While in development any mentioned features, options, etc. are subject to change.  
@@ -188,11 +198,14 @@ An example rule file can be found [here](examples/udev-rules/69-usbsid-permissio
 #### Windows driver
 See the [Software manual](doc/USBSID-Pico-software-manual.adoc) for driver installation information!
 
+
 # Firmware
 See the [releases page](https://github.com/LouDnl/USBSID-Pico/releases) for more information on what's changed and previous releases.  
 
 ### Configuring your board's firmware
-See the [Firmware manual](doc/USBSID-Pico-firmware-manual.adoc) for more information on how to set up your board!  
+Use the new official [USBSID-Pico-Configtool](https://github.com/LouDnl/USBSID-Pico-Configtool) to configure your board.  
+Downloads are available in the [releases](https://github.com/LouDnl/USBSID-Pico-Configtool/releases) section of the tools githubpage.  
+Make sure you read the [Firmware manual](doc/USBSID-Pico-firmware-manual.adoc) for more information on how to set up your board!  
 
 #### Testing your board
 You can test your board with WebUSB and ASID here on the same site as the web configuration tool here: [USBSID web configuration tool](https://usbsid.loudai.nl/?player=webusb) (requires a Chrome based browser).  
@@ -224,11 +237,16 @@ The firmware is still in development so features might change, be added or remov
   - Requires Black Pico clone board with RGB LED onboard!
   - SID voices to use for calculation can be changed in config
 - Uses the [TinyUSB](https://github.com/hathach/tinyusb) stack
+#### v1.3+ PCB
+- Audio switch Stereo/Mono control
+#### v1.4+ PCB
+- Socket voltage control
 
 ### Building
 You can build the firmware using the Pico SDK 2.1.1 and the included TinyUSB. Be sure to clone the SDK with `--recurse-submodules`.  
 After download run `cd pico-sdk/lib/tinyusb` and then `python3 tools/get_deps.py PICO_PLATFORM` where PICO_PLATFORM is either rp2040 or rp2350 depending on the board you are using.
 
+
 # Hardware
 ## Where to buy
 #### My Tindie store
@@ -238,20 +256,24 @@ Sponsored by [<img src="images/pcbway.png" width="150em">](images/pcbway.png)
 #### PCBWay
 At a minimum of 5 bare or assembled boards it is also possible to purchase PCB's at PCBWay  
 No account yet at [PCBWay](https://pcbway.com/g/2458i7)? Please use [my referral link](https://pcbway.com/g/2458i7) to register, thanks!  
+[PCB revision v1.5 (not yet!)](#)  
+[PCB revision v1.3](https://www.pcbway.com/project/shareproject/USBSID_Pico_v1_3_05f2b88e.html)  
 [PCB revision v1.0](https://www.pcbway.com/project/shareproject/USBSID_Pico_c99c9748.html)  
-[PCB revision v1.3](https://www.pcbway.com/project/shareproject/USBSID_Pico_v1_3_05f2b88e.html)
 #### Known and approved resellers
 [Run Stop Re-Store](https://www.runstoprestore.nl) at [Retro8BITshop](https://www.retro8bitshop.com) is the first reseller to sell licensed USBSID-Pico boards.  
 PCB revision v1.3 [product page](https://www.retro8bitshop.com/product/usbsid-pico-by-loud/)
 
 ## PCB usage information
 Your USBSID-Pico PCB has several hardware features like jumpers and pins that require your attention. Click on the viewing method
-### PCB revision v1.0 manual
-- [Open online PCB v1.0 manual](doc/USBSID-Pico-PCBv1.0-manual.adoc)
-- [Download PCB v1.0 PDF manual](doc/USBSID-Pico-PCBv1.0-manual.pdf)
+### PCB revision v1.5 manual
+- [Open online PCB v1.5 manual](doc/USBSID-Pico-PCBv1.5-manual.adoc)
+- [Download PCB v1.5 PDF manual](doc/USBSID-Pico-PCBv1.5-manual.pdf)
 ### PCB revision v1.3 manual
 - [Open online PCB v1.3 manual](doc/USBSID-Pico-PCBv1.3-manual.adoc)
 - [Download PCB v1.3 PDF manual](doc/USBSID-Pico-PCBv1.3-manual.pdf)
+### PCB revision v1.0 manual
+- [Open online PCB v1.0 manual](doc/USBSID-Pico-PCBv1.0-manual.adoc)
+- [Download PCB v1.0 PDF manual](doc/USBSID-Pico-PCBv1.0-manual.pdf)
 
 ## Cases
 All USBSID-Pico community created cases are available in the [cases](cases/) directory, direct links below.  
@@ -264,6 +286,25 @@ _Cases for PCB revision v1.3:_
 * [Dual USBSID-Pico Commodore 64 Case](cases/v1.3/Dual_USBSID-Pico_Commodore_64_Case) by [@OlefinMakes](https://github.com/OlefinMakes/)
 
 ## PCB Features
+### revision v1.5
+- Improved voltage and audio filtering
+  - Input voltage filtering with LC filter
+  - ESD protection diode on audio port for (minimal) backwards reverse voltage protection
+  - Extra capacitors on SID 5v and hv (9v/12v) voltage inpuit
+  - Softpull to gnd when headphone jack is empty (should help against clicks on jack insert)
+- Jumperless design
+  - Automatic 9v/12v selection based on detected Chip/SID
+    - sockets are independently configuratble for 9v or 12
+    - 5v and hv (9v/12v) on/off is for both sockets (sorry not enough gpios!)
+  - Automatic per socket SID filter capacitor selection based on detected Chip/SID
+  - Automatic per socket 6581 shunt resistor on/off based on detected Chip/SID
+  - Automatic per socket 8580 digiboost based on detected Chip/SID
+- Updated audio expansion pins
+  - Plug and play ready for the new "Volume daughterboard"
+  - Ext IN always connected 
+    - Be carefull when connecting anything to this pin!
+  - Now includes SID voltage pin
+- Includes all other features from v1.3
 ### revision v1.3
 - Supports all MOS SID chips e.g. MOS6581, MOS6582 & MOS8580
 - Supports SID chip replacements e.g. [SIDKick-Pico](https://github.com/frntc/SIDKick-pico), [ARMSID](https://www.nobomi.cz/8bit/armsid/index_en.php) & [FPGASID](https://www.fpgasid.de), [SwinSID](https://github.com/dmantione/swinsid).
@@ -336,9 +377,11 @@ the open source KiCad design files and gerbers documents below.
 * v0.1 testboard<br>
   [<img src="images/v0.1-top.png" width="50%">](images/v0.1-top.png) 
 
+
 # Examples
 Visit my [Youtube channel](https://www.youtube.com/channel/UCOu1hPBTsEbG7ZFnk9-29KQ), [other socials](https://github.com/LouDnl) or the [SHOWCASE](SHOWCASE.md) page to see more examples of the board in action.
 
+
 # Acknowledgements
 Special thanks goes out to [@tobozo](https://github.com/tobozo/) for making the USBSID-Pico logo and for his (mental🤣) support since starting this project.  
 Thanks to [@erique](https://github.com/erique) and [@koobo](https://github.com/koobo) for creating and implementing Amiga support!  
@@ -355,15 +398,19 @@ Some of those projects are - in no particular order:
 * [SID Factory II by Chordian](https://github.com/Chordian/sidfactory2)
 * [Cynthcart by PaulSlocum](https://github.com/PaulSlocum/cynthcart)
 
+
 # Disclaimer
 I do this stuff in my free time for my enjoyment. Since I like to share my joy in creating this with everyone I try my best to provide a working PCB and Firmware. I am in no way an electronics engineer and can give __no guarantees__ that this stuff does not break or damage your hardware, computer, phone, or whatever you try to hook it up to. Be sure to take great care when inserting any real MOS SID chips into the board. While everything has been tested with real chips, this is in no way a guarantee that nothing could go wrong. Use of this board and firmware at your own risk! I am in no way responsible for your damaged hardware. That being said, have fun!
 
+
 # License
 ### Software License ~ GNUv2
 All code written by me in this repository is licensed under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
 Any code in this repository that is not written by me automatically falls under the licensing conditions by the authors of said code as mentioned in the source code header.
 For for more information about this license please read the LICENSE document in the root of the USBSID-Pico repository.
 
+### USBSID-Pico v1.5 PCB Hardware License ~ TBD
+
 ### USBSID-Pico v1.3 PCB Hardware License ~ Creative Commons
 <a href="https://github.com/LouDnl/USBSID-Pico/tree/master/hardware/USBSID-Pico-v1.3">USBSID-Pico v1.3 PCB</a> © 2025-2026 by <a href="https://github.com/LouDnl">LouD</a> is licensed under <a href="https://creativecommons.org/licenses/by-nc-nd/4.0/">Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International</a><img src="https://mirrors.creativecommons.org/presskit/icons/cc.svg" alt="" width="20em" style="max-width: 1em;max-height:1em;margin-left: .2em;"><img src="https://mirrors.creativecommons.org/presskit/icons/by.svg" alt="" width="20em" style="max-width: 1em;max-height:1em;margin-left: .2em;"><img src="https://mirrors.creativecommons.org/presskit/icons/nc.svg" alt="" width="20em" style="max-width: 1em;max-height:1em;margin-left: .2em;"><img src="https://mirrors.creativecommons.org/presskit/icons/nd.svg" alt="" width="20em" style="max-width: 1em;max-height:1em;margin-left: .2em;">
 

cases/v1.3/spotUP-revisited/USBSID-Pico v1.3 top case open with reset narrow hole.png

@@ -0,0 +1,43 @@
+= *USBSID-Pico PCB revision v1.5 manual*
+:author: LouD
+:description: This document contains important information about USBSID-Pico PCB revision v1.5
+:url-repo: https://www.github.com/LouDnl/USBSID-Pico
+:revdate: {localdate}
+:toc:
+:toc-placement!:
+
+Author: {author} - generated on {revdate}
+
+toc::[]
+[%always]
+<<<
+
+== Disclaimer
+include::disclaimer.adoc[]
+
+// == PCB top overview
+// .Click image for larger view
+// [#img-v13top,link=images/v1.3/v1.3b-top-marked.png]
+// image::images/v1.3/v1.3b-top-marked.png[title=PCB top overview]
+
+[%always]
+<<<
+
+== More information coming soon!
+Soon!
+
+
+[%always]
+<<<
+
+// == PCB bottom overview
+// .Click image for larger view
+// [#img-v13bottom,link=images/v1.3/v1.3b-bottom.png]
+// image::images/v1.3/v1.3b-bottom.png[title=PCB bottom overview]
+
+== License
+include::license-software.adoc[]
+
+include::license-hardware.adoc[]
+
+Author: {author} - generated on {revdate}

cases/v1.3/spotUP-revisited/USBSID-Pico v1.3 top case open with reset narrow hole.stl

@@ -101,10 +101,16 @@ or
 == Firmware configuration
 USBSID-Pico has an extensive set of configuration options that expands with each firmware release. +
 
-=== Configuration tool
-You can configurate your board by using the commandline config-tool or together with the Python Configuration GUI by ISL/Samar if you prefer a GUI.
+=== USBSID-Pico-Configtool
+You can configurate your board by using the official USBSID-Pico-Configtool +
+The tool is available here https://github.com/LouDnl/USBSID-Pico-Configtool[USBSID-Pico-Configtool] in the releases section
 
-==== GUI downloads
+=== Commandline configuration tool
+You can configurate your board with:
+  - the commandline config-tool
+  - the commandline config-tool with the Python Configuration GUI by ISL/Samar if you prefer a GUI.
+
+==== Python Configuration GUI downloads
 https://github.com/LouDnl/USBSID-Pico/blob/master/examples/config-tool/cfg_usbsid_GUI.py[Download script] +
 Python3 -> https://www.python.org/downloads/[Download] +
 TkInter -> https://tkdocs.com/tutorial/install.html[Installation guide] +