summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Pinot <texitoi@texitoi.eu>2020-08-19 23:50:42 +0200
committerGuillaume Pinot <texitoi@texitoi.eu>2020-08-19 23:50:42 +0200
commit5a0c87ff029ce985a97f42565f23736109218f40 (patch)
tree055faa2f5491d33836193414a449bc604a6f80dd
parent9365f8ed96f344c772828529725d287516a60814 (diff)
Blind implementation of serial communication
-rw-r--r--firmware/Cargo.lock1
-rw-r--r--firmware/Cargo.toml1
-rw-r--r--firmware/src/main.rs60
3 files changed, 54 insertions, 8 deletions
diff --git a/firmware/Cargo.lock b/firmware/Cargo.lock
index b731acf..6bdfa27 100644
--- a/firmware/Cargo.lock
+++ b/firmware/Cargo.lock
@@ -218,6 +218,7 @@ dependencies = [
"embedded-hal",
"generic-array 0.13.2",
"keyberon",
+ "nb 1.0.0",
"panic-halt",
"stm32f0xx-hal",
"usb-device",
diff --git a/firmware/Cargo.toml b/firmware/Cargo.toml
index de35114..1da11be 100644
--- a/firmware/Cargo.toml
+++ b/firmware/Cargo.toml
@@ -14,6 +14,7 @@ cortex-m-rtic = "0.5"
generic-array = "0.13"
embedded-hal = "0.2"
usb-device = "0.2.0"
+nb = "1.0.0"
[profile.release]
lto = true
diff --git a/firmware/src/main.rs b/firmware/src/main.rs
index d9afdc0..f1ece31 100644
--- a/firmware/src/main.rs
+++ b/firmware/src/main.rs
@@ -7,6 +7,11 @@ use panic_halt as _;
use core::convert::Infallible;
use embedded_hal::digital::v2::{InputPin, OutputPin};
use generic_array::typenum::{U4, U6};
+use hal::gpio::{gpioa, gpiob, Floating, Input, Output, PullUp, PushPull};
+use hal::prelude::*;
+use hal::serial;
+use hal::usb;
+use hal::{stm32, timers};
use keyberon::action::{k, l, m, Action, Action::*};
use keyberon::debounce::Debouncer;
use keyberon::impl_heterogenous_array;
@@ -14,11 +19,9 @@ use keyberon::key_code::KbHidReport;
use keyberon::key_code::KeyCode::*;
use keyberon::layout::{Event, Layout};
use keyberon::matrix::{Matrix, PressedKeys};
+use nb::block;
use rtic::app;
-use stm32f0xx_hal::gpio::{gpioa, gpiob, Floating, Input, Output, PullUp, PushPull};
-use stm32f0xx_hal::prelude::*;
-use stm32f0xx_hal::usb;
-use stm32f0xx_hal::{stm32, timers};
+use stm32f0xx_hal as hal;
use usb_device::bus::UsbBusAllocator;
use usb_device::class::UsbClass as _;
use usb_device::device::UsbDeviceState;
@@ -104,7 +107,7 @@ pub static LAYERS: keyberon::layout::Layers = &[
],
];
-#[app(device = stm32f0xx_hal::stm32, peripherals = true)]
+#[app(device = crate::hal::pac, peripherals = true)]
const APP: () = {
struct Resources {
usb_dev: UsbDevice,
@@ -114,6 +117,8 @@ const APP: () = {
layout: Layout,
timer: timers::Timer<stm32::TIM3>,
transpose: fn(Event) -> Event,
+ tx: serial::Tx<hal::pac::USART1>,
+ rx: serial::Rx<hal::pac::USART1>,
}
#[init]
@@ -155,6 +160,13 @@ const APP: () = {
transpose_right
};
+ let (pa9, pa10) = (gpioa.pa9, gpioa.pa10);
+ let (tx, rx) = cortex_m::interrupt::free(move |cs| {
+ (pa9.into_alternate_af1(cs), pa10.into_alternate_af1(cs))
+ });
+ let (tx, rx) =
+ serial::Serial::usart1(c.device.USART1, (tx, rx), 115_200.bps(), &mut rcc).split();
+
let pa15 = gpioa.pa15;
let matrix = cortex_m::interrupt::free(move |cs| {
Matrix::new(
@@ -183,6 +195,8 @@ const APP: () = {
matrix: matrix.unwrap(),
layout: Layout::new(LAYERS),
transpose,
+ tx,
+ rx,
}
}
@@ -210,12 +224,12 @@ const APP: () = {
#[task(
binds = TIM3,
- priority = 1,
+ priority = 2,
spawn = [handle_report],
- resources = [matrix, debouncer, layout, timer, &transpose],
+ resources = [matrix, debouncer, layout, timer, &transpose, tx],
)]
fn tick(c: tick::Context) {
- c.resources.timer.wait().ok();
+ c.resources.timer.wait().unwrap();
for event in c
.resources
@@ -223,6 +237,9 @@ const APP: () = {
.events(c.resources.matrix.get().unwrap())
.map(c.resources.transpose)
{
+ for &b in &ser(event) {
+ block!(c.resources.tx.write(b)).unwrap();
+ }
c.spawn
.handle_report(c.resources.layout.event(event).collect())
.unwrap();
@@ -232,6 +249,19 @@ const APP: () = {
.unwrap();
}
+ #[task(binds = USART1, priority = 1, spawn = [handle_report], resources = [layout, rx])]
+ fn rx(mut c: rx::Context) {
+ static mut BUF: [u8; 4] = [0; 4];
+ for b in &mut BUF[..] {
+ *b = nb::block!(c.resources.rx.read()).unwrap();
+ }
+ if let Ok(event) = de(&BUF[..]) {
+ c.spawn
+ .handle_report(c.resources.layout.lock(|l| l.event(event).collect()))
+ .unwrap();
+ }
+ }
+
extern "C" {
fn CEC_CAN();
}
@@ -246,3 +276,17 @@ fn transpose_right(e: Event) -> Event {
Event::Release(x, y) => Event::Release(11 - x, y),
}
}
+
+fn de(bytes: &[u8]) -> Result<Event, ()> {
+ match bytes {
+ &[b'P', x, y, b'\n'] => Ok(Event::Press(x as usize, y as usize)),
+ &[b'R', x, y, b'\n'] => Ok(Event::Release(x as usize, y as usize)),
+ _ => Err(()),
+ }
+}
+fn ser(e: Event) -> [u8; 4] {
+ match e {
+ Event::Press(x, y) => [b'P', x as u8, y as u8, b'\n'],
+ Event::Release(x, y) => [b'R', x as u8, y as u8, b'\n'],
+ }
+}