From 153af5bd071fc1f58e253072030acb358a855be2 Mon Sep 17 00:00:00 2001 From: Martin Donlon Date: Tue, 11 Jul 2023 08:23:55 -0700 Subject: [PATCH] Disable serial uart Increase versions to 0.9.0 Mixed case firmware name --- .github/workflows/firmware.yml | 6 +++--- firmware/CMakeLists.txt | 22 ++++++++++++---------- host/picolink/Cargo.toml | 2 +- host/picorom/Cargo.toml | 2 +- host/pypicorom/Cargo.toml | 2 +- 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/.github/workflows/firmware.yml b/.github/workflows/firmware.yml index 252779f..e54383f 100644 --- a/.github/workflows/firmware.yml +++ b/.github/workflows/firmware.yml @@ -41,8 +41,8 @@ jobs: with: name: firmware path: | - build/picorom.elf - build/picorom.uf2 + build/PicoROM.elf + build/PicoROM.uf2 if-no-files-found: error release: @@ -58,5 +58,5 @@ jobs: uses: svenstaro/upload-release-action@v2 with: file_glob: true - file: picorom* + file: PicoROM* diff --git a/firmware/CMakeLists.txt b/firmware/CMakeLists.txt index acaaecd..e49be20 100644 --- a/firmware/CMakeLists.txt +++ b/firmware/CMakeLists.txt @@ -4,17 +4,17 @@ project(rom_emulator C CXX ASM) set(CMAKE_C_STANDARD 11) set(CMAKE_CXX_STANDARD 17) pico_sdk_init() -add_executable(picorom +add_executable(PicoROM main.cpp pico_link.cpp rom.cpp comms.cpp ) -pico_set_float_implementation(picorom none) -pico_set_double_implementation(picorom none) +pico_set_float_implementation(PicoROM none) +pico_set_double_implementation(PicoROM none) -target_compile_definitions(picorom PRIVATE +target_compile_definitions(PicoROM PRIVATE PICO_HEAP_SIZE=128 PICO_STACK_SIZE=512 PICO_CORE1_STACK_SIZE=4 @@ -23,11 +23,13 @@ target_compile_definitions(picorom PRIVATE OUTPUT_BUFFER=1 ) -pico_generate_pio_header(picorom ${CMAKE_CURRENT_LIST_DIR}/data_bus.pio) -pico_generate_pio_header(picorom ${CMAKE_CURRENT_LIST_DIR}/comms.pio) +pico_generate_pio_header(PicoROM ${CMAKE_CURRENT_LIST_DIR}/data_bus.pio) +pico_generate_pio_header(PicoROM ${CMAKE_CURRENT_LIST_DIR}/comms.pio) -pico_enable_stdio_usb(picorom 1) -pico_set_linker_script(picorom ${CMAKE_CURRENT_LIST_DIR}/memmap_firmware.ld) +pico_enable_stdio_usb(PicoROM 1) +pico_enable_stdio_uart(PicoROM 0) -pico_add_extra_outputs(picorom) -target_link_libraries(picorom pico_stdlib pico_multicore hardware_pio) \ No newline at end of file +pico_set_linker_script(PicoROM ${CMAKE_CURRENT_LIST_DIR}/memmap_firmware.ld) + +pico_add_extra_outputs(PicoROM) +target_link_libraries(PicoROM pico_stdlib pico_multicore hardware_pio) \ No newline at end of file diff --git a/host/picolink/Cargo.toml b/host/picolink/Cargo.toml index c7ddcb5..7164719 100644 --- a/host/picolink/Cargo.toml +++ b/host/picolink/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "picolink" -version = "0.1.0" +version = "0.9.0" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/host/picorom/Cargo.toml b/host/picorom/Cargo.toml index 1e014a9..e3f0532 100644 --- a/host/picorom/Cargo.toml +++ b/host/picorom/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "picorom" -version = "0.1.0" +version = "0.9.0" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/host/pypicorom/Cargo.toml b/host/pypicorom/Cargo.toml index b6ebdf8..3e6a063 100644 --- a/host/pypicorom/Cargo.toml +++ b/host/pypicorom/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pypicorom" -version = "0.1.0" +version = "0.9.0" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html