theater/picomap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extract picoboot and info handlers into lib/handlers

Browse Source
This commit is contained in:
Ian Gulliver
2026-04-06 17:24:34 +09:00
parent 00ab432a72
commit b197f0bfa7
5 changed files with 37 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/CMakeLists.txt
View File

@@ -10,6 +10,7 @@ set(CMAKE_CXX_STANDARD 23)
pico_sdk_init() pico_sdk_init()
set(LIB_SOURCES set(LIB_SOURCES
lib/handlers.cpp
lib/net.cpp lib/net.cpp
lib/tusb_config.cpp lib/tusb_config.cpp
w6300/w6300.cpp w6300/w6300.cpp

20
firmware/firmware.cpp
View File

@@ -1,12 +1,10 @@
#include "pico/stdlib.h" #include "pico/stdlib.h"
#include "pico/bootrom.h"
#include "pico/unique_id.h"
#include "tusb.h" #include "tusb.h"
#include "wire.h" #include "wire.h"
#include "usb_cdc.h" #include "usb_cdc.h"
#include "timer_queue.h" #include "timer_queue.h"
#include "handlers.h"
#include "net.h" #include "net.h"
#include "w6300.h"
static usb_cdc usb; static usb_cdc usb;
static timer_queue timers; static timer_queue timers;
@@ -40,22 +38,12 @@ int main() {
switch (msg->type_id) { switch (msg->type_id) {
case RequestPICOBOOT::ext_id: case RequestPICOBOOT::ext_id:
usb.send(encode_response(msg->message_id, ResponsePICOBOOT{})); handle_picoboot(usb, msg->message_id);
sleep_ms(100);
reset_usb_boot(0, 1);
break; break;
case RequestInfo::ext_id: { case RequestInfo::ext_id:
ResponseInfo resp; handle_info(usb, msg->message_id);
pico_unique_board_id_t uid;
pico_get_unique_board_id(&uid);
std::copy(uid.id, uid.id + 8, resp.board_id.begin());
auto ninfo = w6300::get_net_info();
resp.mac = ninfo.mac;
resp.link_local = ninfo.lla;
usb.send(encode_response(msg->message_id, resp));
break; break;
} }
}
} }
__wfi(); __wfi();

6
firmware/include/handlers.h Normal file
View File

@@ -0,0 +1,6 @@
#pragma once
#include "wire.h"
#include "usb_cdc.h"
void handle_picoboot(usb_cdc& usb, uint32_t message_id);
void handle_info(usb_cdc& usb, uint32_t message_id);

22
firmware/lib/handlers.cpp Normal file
View File

@@ -0,0 +1,22 @@
#include "handlers.h"
#include "pico/stdlib.h"
#include "pico/bootrom.h"
#include "pico/unique_id.h"
#include "w6300.h"
void handle_picoboot(usb_cdc& usb, uint32_t message_id) {
usb.send(encode_response(message_id, ResponsePICOBOOT{}));
sleep_ms(100);
reset_usb_boot(0, 1);
}
void handle_info(usb_cdc& usb, uint32_t message_id) {
ResponseInfo resp;
pico_unique_board_id_t uid;
pico_get_unique_board_id(&uid);
std::copy(uid.id, uid.id + 8, resp.board_id.begin());
auto ninfo = w6300::get_net_info();
resp.mac = ninfo.mac;
resp.link_local = ninfo.lla;
usb.send(encode_response(message_id, resp));
}

20
firmware/test.cpp
View File

@@ -1,11 +1,9 @@
#include "pico/stdlib.h" #include "pico/stdlib.h"
#include "pico/bootrom.h"
#include "pico/unique_id.h"
#include "tusb.h" #include "tusb.h"
#include "wire.h" #include "wire.h"
#include "usb_cdc.h" #include "usb_cdc.h"
#include "handlers.h"
#include "net.h" #include "net.h"
#include "w6300.h"
static usb_cdc usb; static usb_cdc usb;
@@ -36,22 +34,12 @@ int main() {
switch (msg->type_id) { switch (msg->type_id) {
case RequestPICOBOOT::ext_id: case RequestPICOBOOT::ext_id:
usb.send(encode_response(msg->message_id, ResponsePICOBOOT{})); handle_picoboot(usb, msg->message_id);
sleep_ms(100);
reset_usb_boot(0, 1);
break; break;
case RequestInfo::ext_id: { case RequestInfo::ext_id:
ResponseInfo resp; handle_info(usb, msg->message_id);
pico_unique_board_id_t uid;
pico_get_unique_board_id(&uid);
std::copy(uid.id, uid.id + 8, resp.board_id.begin());
auto ninfo = w6300::get_net_info();
resp.mac = ninfo.mac;
resp.link_local = ninfo.lla;
usb.send(encode_response(msg->message_id, resp));
break; break;
} }
}
} }
__wfi(); __wfi();