From 131141b75ce22589fe3cdea0fc5557e9c35721dc Mon Sep 17 00:00:00 2001 From: loudnl Date: Fri, 22 Nov 2024 14:56:30 +0100 Subject: [PATCH 1/3] I must learn to proof read --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 3b89d02..1e32175 100644 --- a/README.md +++ b/README.md @@ -148,9 +148,8 @@ Click [this link](https://www.retro8bitshop.com/product/usbsid-pico-by-loud/) to #### PCBWay At a minimum of 5 bare or assembled boards it is also possible to purchase at [PCBWay here](https://www.pcbway.com/project/shareproject/USBSID_Pico_c99c9748.html). #### Me (while I still have boards) -While still available you can purchase assembled boards minus Pico can be purchased from me - send me a message on any of my socials. +While still available you can purchase assembled boards minus Pico from me - send me a message on any of my socials. -I am currently negotiating the possibility for the boards to be purchasable at an online store here in NL. ### Schematic and BOM If you want and are up to it you can create your own development board by using the provided [schematic](resources/v1.0-schematic.pdf) and [interactive BOM](https://loudnl.github.io/). ### PCB Features ~ v1.0 From 5e7a2440176f856eb5acbd7e45e244bc75c13f1c Mon Sep 17 00:00:00 2001 From: loudnl Date: Sun, 8 Dec 2024 15:17:08 +0100 Subject: [PATCH 2/3] Fix indentation --- CMakeLists.txt | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index afe229d..1890f09 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,13 +35,14 @@ set(PROJECT_VERSION "0.2.2-BETA.${MAGIC_SMOKE}") # Must be the same as in confi ### Want a cookie? # NOTICE: ENABLING THESE DEBUGGING DEFINITIONS WILL HAVE SIGNIFICANT IMPACT AND WILL DELAY PLAYING! if(NOT DEFINED $ENV{DISABLE_DEBUGGING}) # MATCHES - set(USBSID_DEBUGGING 1) # Enable UART ~ mandatory enable for all other logging types - set(MEMORY_LOGGING 0) # Enable memory map of SID 1 voices printing - set(DEFAULT_DEBUGGING 1) # Enable debugging in usbsid.c - set(USBIO_DEBUGGING 0) # Enable debugging in usbsid.c - set(CONFIG_DEBUGGING 1) # Enable debugging in config.c - set(GPIOBUS_DEBUGGING 0) # Enable debugging in gpio.c - set(MIDI_DEBUGGING 0) # Enable debugging in midi.c + set(USBSID_DEBUGGING 1) # Enable UART ~ mandatory enable for all other logging types + set(MEMORY_LOGGING 0) # Enable memory map of SID 1 voices printing + set(DEFAULT_DEBUGGING 1) # Enable debugging in usbsid.c + set(USBIO_DEBUGGING 0) # Enable debugging in usbsid.c + set(CONFIG_DEBUGGING 1) # Enable debugging in config.c + set(GPIOBUS_DEBUGGING 0) # Enable debugging in gpio.c + set(MIDI_DEBUGGING 0) # Enable debugging in midi.c + set(MIDIVOICE_DEBUGGING 0) # Enable debugging in midi.c endif() @@ -198,12 +199,12 @@ list(APPEND PICOTYPES "LED" ) if(${PICO_BOARD} STREQUAL "pico") -list(APPEND FILENAMES - ${PROJECT_FILENAME}-rgb -) -list(APPEND PICOTYPES + list(APPEND FILENAMES + ${PROJECT_FILENAME}-rgb + ) + list(APPEND PICOTYPES "RGB" -) + ) endif() ### Source files to compile From c8a0420ddc478efd31b05af11d018265c6e2020f Mon Sep 17 00:00:00 2001 From: loudnl Date: Sun, 8 Dec 2024 15:37:02 +0100 Subject: [PATCH 3/3] Update version for release - small fix in board detect for manual build --- CMakeLists.txt | 15 +++++++++++---- src/config.h | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1890f09..735d91d 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,8 +29,8 @@ cmake_minimum_required(VERSION 3.17) set(PROJECT_NAME usbsidpico) set(PROJECT_MANUFACTURER "LouD") set(PRODUCT_STRING "USBSID-Pico") -set(MAGIC_SMOKE "20241120") -set(PROJECT_VERSION "0.2.2-BETA.${MAGIC_SMOKE}") # Must be the same as in config.h +set(MAGIC_SMOKE "20241208") +set(PROJECT_VERSION "0.2.3-BETA.${MAGIC_SMOKE}") # Must be the same as in config.h ### Want a cookie? # NOTICE: ENABLING THESE DEBUGGING DEFINITIONS WILL HAVE SIGNIFICANT IMPACT AND WILL DELAY PLAYING! @@ -67,8 +67,15 @@ endif() if(DEFINED PICO_PLATFORM) message("PICO_PLATFORM is defined as ${PICO_PLATFORM}") else() - message("PICO_PLATFORM not defined, defaulting to 'rp2040'") - set(PICO_PLATFORM rp2040) + if(DEFINED PICO_BOARD) + if(PICO_BOARD STREQUAL "pico2") + set(PICO_PLATFORM rp2350) + message("PICO_PLATFORM not defined, board is ${PICO_BOARD} setting PICO_PLATFORM to ${PICO_PLATFORM}") + endif() + else() + message("PICO_PLATFORM not defined, defaulting to 'rp2040'") + set(PICO_PLATFORM rp2040) + endif() endif() ### Target product & output filename diff --git a/src/config.h b/src/config.h index 8384198..b3846ad 100644 --- a/src/config.h +++ b/src/config.h @@ -55,7 +55,7 @@ #define MAGIC_SMOKE 19700101 /* DATEOFRELEASE */ #endif #ifndef PROJECT_VERSION -#define PROJECT_VERSION "0.2.2-BETA.20241120" /* Must be the same as in CMakeLists.txt */ +#define PROJECT_VERSION "0.2.3-BETA.20241208" /* Must be the same as in CMakeLists.txt */ #endif #ifdef PICO_DEFAULT_LED_PIN