From 30a697066c5746ce1a069619b71e0bb55590d060 Mon Sep 17 00:00:00 2001 From: Ian Gulliver Date: Sun, 5 Apr 2026 21:33:19 +0900 Subject: [PATCH] Move C++ tree into firmware/ --- .gitignore | 2 +- cmd/load/main.go | 4 ++-- CMakeLists.txt => firmware/CMakeLists.txt | 0 dhcp.cpp => firmware/dhcp.cpp | 0 {include => firmware/include}/dhcp.h | 0 {include => firmware/include}/halfsiphash.h | 0 {include => firmware/include}/msgpack.h | 0 {include => firmware/include}/net.h | 0 {include => firmware/include}/ring_buffer.h | 0 {include => firmware/include}/sorted_list.h | 0 {include => firmware/include}/static_vector.h | 0 {include => firmware/include}/timer_queue.h | 0 {include => firmware/include}/tusb_config.h | 0 {include => firmware/include}/usb_cdc.h | 0 {include => firmware/include}/wire.h | 0 main.cpp => firmware/main.cpp | 0 net.cpp => firmware/net.cpp | 0 pico_sdk_import.cmake => firmware/pico_sdk_import.cmake | 0 tusb_config.cpp => firmware/tusb_config.cpp | 0 {w6300 => firmware/w6300}/qspi.pio | 0 {w6300 => firmware/w6300}/w6300.cpp | 0 {w6300 => firmware/w6300}/w6300.h | 0 22 files changed, 3 insertions(+), 3 deletions(-) rename CMakeLists.txt => firmware/CMakeLists.txt (100%) rename dhcp.cpp => firmware/dhcp.cpp (100%) rename {include => firmware/include}/dhcp.h (100%) rename {include => firmware/include}/halfsiphash.h (100%) rename {include => firmware/include}/msgpack.h (100%) rename {include => firmware/include}/net.h (100%) rename {include => firmware/include}/ring_buffer.h (100%) rename {include => firmware/include}/sorted_list.h (100%) rename {include => firmware/include}/static_vector.h (100%) rename {include => firmware/include}/timer_queue.h (100%) rename {include => firmware/include}/tusb_config.h (100%) rename {include => firmware/include}/usb_cdc.h (100%) rename {include => firmware/include}/wire.h (100%) rename main.cpp => firmware/main.cpp (100%) rename net.cpp => firmware/net.cpp (100%) rename pico_sdk_import.cmake => firmware/pico_sdk_import.cmake (100%) rename tusb_config.cpp => firmware/tusb_config.cpp (100%) rename {w6300 => firmware/w6300}/qspi.pio (100%) rename {w6300 => firmware/w6300}/w6300.cpp (100%) rename {w6300 => firmware/w6300}/w6300.h (100%) diff --git a/.gitignore b/.gitignore index 378eac2..3e6c943 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -build +firmware/build diff --git a/cmd/load/main.go b/cmd/load/main.go index 9a095e5..9fb1acc 100644 --- a/cmd/load/main.go +++ b/cmd/load/main.go @@ -17,7 +17,7 @@ func main() { fmt.Fprintf(os.Stderr, "error: %v\n", err) os.Exit(1) } - buildDir := filepath.Join(wd, "build") + buildDir := filepath.Join(wd, "firmware", "build") if err := run(buildDir); err != nil { fmt.Fprintf(os.Stderr, "error: %v\n", err) @@ -27,7 +27,7 @@ func main() { func run(buildDir string) error { fmt.Println("Configuring...") - cmake := exec.Command("cmake", "-B", buildDir) + cmake := exec.Command("cmake", "-S", filepath.Join(filepath.Dir(buildDir)), "-B", buildDir) cmake.Stdout = os.Stdout cmake.Stderr = os.Stderr if err := cmake.Run(); err != nil { diff --git a/CMakeLists.txt b/firmware/CMakeLists.txt similarity index 100% rename from CMakeLists.txt rename to firmware/CMakeLists.txt diff --git a/dhcp.cpp b/firmware/dhcp.cpp similarity index 100% rename from dhcp.cpp rename to firmware/dhcp.cpp diff --git a/include/dhcp.h b/firmware/include/dhcp.h similarity index 100% rename from include/dhcp.h rename to firmware/include/dhcp.h diff --git a/include/halfsiphash.h b/firmware/include/halfsiphash.h similarity index 100% rename from include/halfsiphash.h rename to firmware/include/halfsiphash.h diff --git a/include/msgpack.h b/firmware/include/msgpack.h similarity index 100% rename from include/msgpack.h rename to firmware/include/msgpack.h diff --git a/include/net.h b/firmware/include/net.h similarity index 100% rename from include/net.h rename to firmware/include/net.h diff --git a/include/ring_buffer.h b/firmware/include/ring_buffer.h similarity index 100% rename from include/ring_buffer.h rename to firmware/include/ring_buffer.h diff --git a/include/sorted_list.h b/firmware/include/sorted_list.h similarity index 100% rename from include/sorted_list.h rename to firmware/include/sorted_list.h diff --git a/include/static_vector.h b/firmware/include/static_vector.h similarity index 100% rename from include/static_vector.h rename to firmware/include/static_vector.h diff --git a/include/timer_queue.h b/firmware/include/timer_queue.h similarity index 100% rename from include/timer_queue.h rename to firmware/include/timer_queue.h diff --git a/include/tusb_config.h b/firmware/include/tusb_config.h similarity index 100% rename from include/tusb_config.h rename to firmware/include/tusb_config.h diff --git a/include/usb_cdc.h b/firmware/include/usb_cdc.h similarity index 100% rename from include/usb_cdc.h rename to firmware/include/usb_cdc.h diff --git a/include/wire.h b/firmware/include/wire.h similarity index 100% rename from include/wire.h rename to firmware/include/wire.h diff --git a/main.cpp b/firmware/main.cpp similarity index 100% rename from main.cpp rename to firmware/main.cpp diff --git a/net.cpp b/firmware/net.cpp similarity index 100% rename from net.cpp rename to firmware/net.cpp diff --git a/pico_sdk_import.cmake b/firmware/pico_sdk_import.cmake similarity index 100% rename from pico_sdk_import.cmake rename to firmware/pico_sdk_import.cmake diff --git a/tusb_config.cpp b/firmware/tusb_config.cpp similarity index 100% rename from tusb_config.cpp rename to firmware/tusb_config.cpp diff --git a/w6300/qspi.pio b/firmware/w6300/qspi.pio similarity index 100% rename from w6300/qspi.pio rename to firmware/w6300/qspi.pio diff --git a/w6300/w6300.cpp b/firmware/w6300/w6300.cpp similarity index 100% rename from w6300/w6300.cpp rename to firmware/w6300/w6300.cpp diff --git a/w6300/w6300.h b/firmware/w6300/w6300.h similarity index 100% rename from w6300/w6300.h rename to firmware/w6300/w6300.h