Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix examples broken by #95 #103

Merged
merged 2 commits into from
Dec 18, 2023
Merged

Fix examples broken by #95 #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75289a5
Fix examples broken by #95
usbalbin Dec 16, 2023
e14c5a1
fmt
usbalbin Dec 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion examples/flash_with_rtic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ mod app {
use crate::utils::logger;
use stm32g4xx_hal::flash::{FlashExt, FlashSize, FlashWriter, Parts};
use stm32g4xx_hal::prelude::*;
use stm32g4xx_hal::pwr::PwrExt;
use stm32g4xx_hal::rcc::{PllConfig, RccExt};

const LOG_LEVEL: log::LevelFilter = log::LevelFilter::Info;
Expand Down Expand Up @@ -67,7 +68,8 @@ mod app {
// The ADC will ultimately be put into synchronous mode and will derive
// its clock from the AHB bus clock, with a prescalar of 2 or 4.

let mut rcc = rcc.freeze(clock_config);
let pwr = dp.PWR.constrain().freeze();
let mut rcc = rcc.freeze(clock_config, pwr);

unsafe {
let mut flash = &(*stm32g4xx_hal::stm32::FLASH::ptr());
Expand Down
2 changes: 1 addition & 1 deletion examples/uart.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ use hal::{rcc, stm32};
use stm32g4xx_hal as hal;

use cortex_m_rt::entry;
use defmt::info;
use nb::block;
use utils::logger::info;

#[macro_use]
mod utils;
Expand Down