Skip to content

Commit

Permalink
Merge pull request #31 from LouDnl/dev
Browse files Browse the repository at this point in the history
 Update to v0.2.3-BETA
  • Loading branch information
LouDnl authored Dec 8, 2024
2 parents 1dbe7df + c8a0420 commit 6c5e1e2
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 19 deletions.
40 changes: 24 additions & 16 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,20 @@ 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!
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()


Expand All @@ -66,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
Expand Down Expand Up @@ -198,12 +206,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
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6c5e1e2

Please sign in to comment.