hodasemi/Arduino-Pedal-Effects
1
0
Fork 0
Code Issues 2 Pull requests 2 Actions Projects Releases Wiki Activity

Fix interrupt version to be buildable

Browse source
This commit is contained in:
hodasemi 2023-01-06 18:36:46 +01:00
parent f3329f210a
commit 34d112b38b
1 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
rust/pico/src/main.rs
View file

@ -12,7 +12,7 @@ mod app {
use rp_pico as bsp; use rp_pico as bsp;
use bsp::hal::{ use bsp::hal::{
clocks::{init_clocks_and_plls, Clock}, clocks::init_clocks_and_plls,
gpio::{bank0::Gpio26, Floating, Input, Pin}, gpio::{bank0::Gpio26, Floating, Input, Pin},
rom_data::reset_to_usb_boot, rom_data::reset_to_usb_boot,
sio::Sio, sio::Sio,
@ -31,9 +31,10 @@ mod app {
const SCAN_TIME_US: MicrosDurationU32 = MicrosDurationU32::secs(1); const SCAN_TIME_US: MicrosDurationU32 = MicrosDurationU32::secs(1);
struct Data { static mut USB_BUS: Option<UsbBusAllocator<UsbBus>> = None;
pub struct Data {
i: usize, i: usize,
usb_bus: UsbBusAllocator<UsbBus>,
usb_dev: UsbDevice<'static, UsbBus>, usb_dev: UsbDevice<'static, UsbBus>,
serial: Serial<'static>, serial: Serial<'static>,
@ -95,23 +96,28 @@ mod app {
led_pin.set_low().unwrap(); led_pin.set_low().unwrap();
// Set up the USB driver // Set up the USB driver
let usb_bus = UsbBusAllocator::new(UsbBus::new( unsafe {
c.device.USBCTRL_REGS, USB_BUS = Some(UsbBusAllocator::new(UsbBus::new(
c.device.USBCTRL_DPRAM, c.device.USBCTRL_REGS,
clocks.usb_clock, c.device.USBCTRL_DPRAM,
true, clocks.usb_clock,
&mut resets, true,
)); &mut resets,
)))
};
let serial = Serial::new(&usb_bus); let serial = Serial::new(unsafe { USB_BUS.as_ref().unwrap() });
// Create a USB device with a fake VID and PID // Create a USB device with a fake VID and PID
let usb_dev = UsbDeviceBuilder::new(&usb_bus, UsbVidPid(0x16c0, 0x27dd)) let usb_dev = UsbDeviceBuilder::new(
.manufacturer("Fake company") unsafe { USB_BUS.as_ref().unwrap() },
.product("Serial port") UsbVidPid(0x16c0, 0x27dd),
.serial_number("TEST") )
.device_class(2) // from: https://www.usb.org/defined-class-codes .manufacturer("Fake company")
.build(); .product("Serial port")
.serial_number("TEST")
.device_class(2) // from: https://www.usb.org/defined-class-codes
.build();
let adc = Adc::new(c.device.ADC, &mut resets); let adc = Adc::new(c.device.ADC, &mut resets);
@ -121,7 +127,6 @@ mod app {
let data = Data { let data = Data {
i: 0, i: 0,
usb_bus,
usb_dev, usb_dev,
serial, serial,