From d6bb5d52668e0f5c7276a7a08257ab07170a4824 Mon Sep 17 00:00:00 2001
From: Naxdy <naxdy@naxdy.org>
Date: Wed, 3 Apr 2024 01:46:14 +0200
Subject: [PATCH] fix(flash): access after a delay
apparently accessing the flash immediately after boot poses some issues
---
src/config.rs | 23 +++++++++++++++++++----
src/gcc_hid.rs | 8 +++-----
src/input.rs | 16 +++++++++++-----
src/main.rs | 12 ++++--------
4 files changed, 37 insertions(+), 22 deletions(-)
diff --git a/src/config.rs b/src/config.rs
index 53d21f8..b728095 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -10,7 +10,7 @@ use core::{
use defmt::{debug, error, info, warn, Format};
use embassy_futures::yield_now;
use embassy_rp::{
- flash::{Async, Flash, ERASE_SIZE},
+ flash::{Async, Blocking, Flash, ERASE_SIZE},
peripherals::FLASH,
};
use packed_struct::{derive::PackedStruct, PackedStruct};
@@ -476,7 +476,7 @@ enum NotchAdjustmentType {
/// This needs to be incremented for ANY change to ControllerConfig
/// else we risk loading uninitialized memory.
-pub const CONTROLLER_CONFIG_REVISION: u8 = 1;
+pub const CONTROLLER_CONFIG_REVISION: u8 = 21;
#[derive(Debug, Clone, Format, PackedStruct)]
#[packed_struct(endian = "msb")]
@@ -563,7 +563,15 @@ impl ControllerConfig {
mut flash: &mut Flash<'static, FLASH, Async, FLASH_SIZE>,
) -> Result<Self, embassy_rp::flash::Error> {
let mut controller_config_packed: <ControllerConfig as packed_struct::PackedStruct>::ByteArray = [0u8; 659]; // ControllerConfig byte size
- flash.blocking_read(ADDR_OFFSET, &mut controller_config_packed)?;
+
+ let r = flash.blocking_read(ADDR_OFFSET, &mut controller_config_packed);
+
+ if let Err(_) = r {
+ warn!("Controller config not found in flash, using default.");
+ controller_config_packed = [0u8; 659];
+ } else {
+ r.unwrap();
+ }
match ControllerConfig::unpack(&controller_config_packed).unwrap() {
a if a.config_revision == CONTROLLER_CONFIG_REVISION => {
@@ -1588,7 +1596,7 @@ async fn configuration_main_loop<
a.buttons_1.button_x = true;
a.buttons_1.button_a = true;
a.stick_x = 127;
- a.stick_y = (127
+ a.stick_y = (127 as i8
+ match final_config.input_consistency_mode {
true => 69,
false => -69,
@@ -1626,6 +1634,13 @@ pub async fn config_task(
info!("Config task is running.");
+ Timer::after_millis(1000).await;
+
+ let new_config = ControllerConfig::from_flash_memory(&mut flash).unwrap();
+
+ SIGNAL_CHANGE_RUMBLE_STRENGTH.signal(new_config.rumble_strength);
+ SIGNAL_CONFIG_CHANGE.signal(new_config);
+
loop {
let desired_config_state = SIGNAL_CONFIG_MODE_STATUS_CHANGE.wait().await;
diff --git a/src/gcc_hid.rs b/src/gcc_hid.rs
index 63e4528..71caf60 100644
--- a/src/gcc_hid.rs
+++ b/src/gcc_hid.rs
@@ -261,11 +261,9 @@ impl Handler for MyDeviceHandler {
}
#[embassy_executor::task]
-pub async fn usb_transfer_task(
- driver: Driver<'static, USB>,
- raw_serial: [u8; 8],
- input_consistency_mode: bool,
-) {
+pub async fn usb_transfer_task(driver: Driver<'static, USB>, input_consistency_mode: bool) {
+ let raw_serial = [0u8; 8];
+
let mut serial_buffer = [0u8; 64];
let serial = format_no_std::show(
diff --git a/src/input.rs b/src/input.rs
index 1bcd791..279f715 100644
--- a/src/input.rs
+++ b/src/input.rs
@@ -148,7 +148,7 @@ async fn update_stick_states(
let mut cx_sum = 0u32;
let mut cy_sum = 0u32;
- let end_time = Instant::now() + Duration::from_micros(250); // this seems kinda magic, and it is, but
+ let end_time = Instant::now() + Duration::from_micros(200); // this seems kinda magic, and it is, but
let mut spi_unlocked = SPI_SHARED.lock().await;
let mut spi_acs_unlocked = SPI_ACS_SHARED.lock().await;
@@ -377,6 +377,14 @@ fn update_button_states<
gcc_state.buttons_1.dpad_right = btn_dright.is_low();
gcc_state.buttons_1.dpad_up = btn_dup.is_low();
gcc_state.buttons_1.dpad_down = btn_ddown.is_low();
+ gcc_state.trigger_l = match gcc_state.buttons_2.button_l {
+ true => 255,
+ false => 0,
+ };
+ gcc_state.trigger_r = match gcc_state.buttons_2.button_r {
+ true => 255,
+ false => 0,
+ };
}
#[embassy_executor::task]
@@ -386,8 +394,6 @@ pub async fn input_integrity_benchmark() {
report: {
let mut report = GcReport::default();
report.buttons_1.dpad_up = true;
- report.cstick_x = 0;
- report.cstick_y = 0;
report
},
duration_ms: 100,
@@ -501,7 +507,7 @@ pub async fn update_stick_states_task(
spi_ccs: Output<'static, AnyPin>,
mut controller_config: ControllerConfig,
) {
- Timer::after_secs(1).await;
+ Timer::after_secs(5).await;
*SPI_SHARED.lock().await = Some(spi);
*SPI_ACS_SHARED.lock().await = Some(spi_acs);
*SPI_CCS_SHARED.lock().await = Some(spi_ccs);
@@ -559,7 +565,7 @@ pub async fn update_stick_states_task(
match Instant::now() {
n => {
match (n - last_loop_time).as_micros() {
- a if a > 1999 => debug!("Loop took {} us", a),
+ a if a > 1666 => debug!("Loop took {} us", a),
_ => {}
};
last_loop_time = n;
diff --git a/src/main.rs b/src/main.rs
index 1dc9b72..85f5a36 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -17,6 +17,7 @@ use defmt::{debug, info};
use embassy_executor::Executor;
use embassy_executor::InterruptExecutor;
use embassy_futures::join::join;
+use embassy_rp::flash::Blocking;
use embassy_rp::interrupt;
use embassy_rp::interrupt::InterruptExt;
use embassy_rp::{
@@ -29,6 +30,7 @@ use embassy_rp::{
spi::{self, Spi},
usb::{Driver, InterruptHandler},
};
+use embassy_time::Instant;
use gcc_hid::usb_transfer_task;
use gpio::{Level, Output};
@@ -62,14 +64,9 @@ fn main() -> ! {
// reading and writing from flash has to be done on the main thread, else funny things happen.
- let mut flash = Flash::<_, Async, FLASH_SIZE>::new(p.FLASH, p.DMA_CH0);
+ let flash = Flash::<_, Async, FLASH_SIZE>::new(p.FLASH, p.DMA_CH0);
- let mut uid = [0u8; 8];
- flash.blocking_unique_id(&mut uid).unwrap();
-
- let controller_config = ControllerConfig::from_flash_memory(&mut flash).unwrap();
-
- debug!("Read unique id: {:02X}", uid);
+ let controller_config = ControllerConfig::default();
let mosi = p.PIN_7;
let miso = p.PIN_4;
@@ -107,7 +104,6 @@ fn main() -> ! {
spawner
.spawn(usb_transfer_task(
driver,
- uid,
controller_config.input_consistency_mode,
))
.unwrap();