Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-01-11 15:29:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

added usb event to not wait for the next frame (#1733)

Browse Source
This commit is contained in:
Bernd Herzog 2024-01-07 14:09:22 +01:00 committed by GitHub
parent 23e6295dd2
commit 9d22711368
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
firmware/application/event_m0.cpp
View File

@ -113,7 +113,6 @@ void EventDispatcher::run() {
while (is_running) { while (is_running) {
const auto events = wait(); const auto events = wait();
dispatch(events); dispatch(events);
portapack::usb_serial.dispatch();
} }
} }
@ -163,6 +162,10 @@ void EventDispatcher::dispatch(const eventmask_t events) {
handle_rtc_tick(); handle_rtc_tick();
} }
if (events & EVT_MASK_USB) {
handle_usb();
}
if (events & EVT_MASK_SWITCHES) { if (events & EVT_MASK_SWITCHES) {
handle_switches(); handle_switches();
} }
@ -216,6 +219,10 @@ void EventDispatcher::handle_rtc_tick() {
portapack::persistent_memory::cache::persist(); portapack::persistent_memory::cache::persist();
} }
void EventDispatcher::handle_usb() {
portapack::usb_serial.dispatch();
}
ui::Widget* EventDispatcher::touch_widget(ui::Widget* const w, ui::TouchEvent event) { ui::Widget* EventDispatcher::touch_widget(ui::Widget* const w, ui::TouchEvent event) {
if (!w->hidden()) { if (!w->hidden()) {
// To achieve reverse depth ordering (last object drawn is // To achieve reverse depth ordering (last object drawn is

2
firmware/application/event_m0.hpp
View File

@ -45,6 +45,7 @@ constexpr auto EVT_MASK_ENCODER = EVENT_MASK(4);
constexpr auto EVT_MASK_TOUCH = EVENT_MASK(5); constexpr auto EVT_MASK_TOUCH = EVENT_MASK(5);
constexpr auto EVT_MASK_APPLICATION = EVENT_MASK(6); constexpr auto EVT_MASK_APPLICATION = EVENT_MASK(6);
constexpr auto EVT_MASK_LOCAL = EVENT_MASK(7); constexpr auto EVT_MASK_LOCAL = EVENT_MASK(7);
constexpr auto EVT_MASK_USB = EVENT_MASK(8);
class EventDispatcher { class EventDispatcher {
public: public:
@ -111,6 +112,7 @@ class EventDispatcher {
void handle_application_queue(); void handle_application_queue();
void handle_local_queue(); void handle_local_queue();
void handle_rtc_tick(); void handle_rtc_tick();
void handle_usb();
static ui::Widget* touch_widget(ui::Widget* const w, ui::TouchEvent event); static ui::Widget* touch_widget(ui::Widget* const w, ui::TouchEvent event);

11
firmware/application/usb_serial_cdc.c
View File

@ -23,10 +23,20 @@
#include "usb_serial_endpoints.h" #include "usb_serial_endpoints.h"
#include "usb_serial_event.hpp" #include "usb_serial_event.hpp"
uint32_t EVT_MASK_USB = EVENT_MASK(8);
extern void usb0_isr(void); extern void usb0_isr(void);
static Thread* thread_usb_event = NULL;
CH_IRQ_HANDLER(USB0_IRQHandler) { CH_IRQ_HANDLER(USB0_IRQHandler) {
CH_IRQ_PROLOGUE(); CH_IRQ_PROLOGUE();
usb0_isr(); usb0_isr();
chSysLockFromIsr();
chEvtSignalI(thread_usb_event, EVT_MASK_USB);
chSysUnlockFromIsr();
CH_IRQ_EPILOGUE(); CH_IRQ_EPILOGUE();
} }
@ -46,6 +56,7 @@ uint32_t __strex(uint32_t val, volatile uint32_t* addr) {
void nvic_enable_irq(uint8_t irqn) { void nvic_enable_irq(uint8_t irqn) {
NVIC_ISER(irqn / 32) = (1 << (irqn % 32)); NVIC_ISER(irqn / 32) = (1 << (irqn % 32));
thread_usb_event = chThdSelf();
} }
void usb_configuration_changed(usb_device_t* const device) { void usb_configuration_changed(usb_device_t* const device) {

2
firmware/application/usb_serial_shell.cpp
View File

@ -1040,5 +1040,5 @@ static const ShellConfig shell_cfg1 = {
void create_shell(EventDispatcher* evtd) { void create_shell(EventDispatcher* evtd) {
_eventDispatcherInstance = evtd; _eventDispatcherInstance = evtd;
shellCreate(&shell_cfg1, SHELL_WA_SIZE, NORMALPRIO); shellCreate(&shell_cfg1, SHELL_WA_SIZE, NORMALPRIO + 10);
} }