fix

Author: burrbull

examples/adc-continious.rs

@@ -42,7 +42,6 @@ fn main() -> ! {
 
     info!("Setup Gpio");
     let gpioa = dp.GPIOA.split(&mut rcc);
-    let pa0 = gpioa.pa0.into_analog();
 
     info!("Setup Adc1");
     let mut delay = cp.SYST.delay(&rcc.clocks);
@@ -54,7 +53,7 @@ fn main() -> ! {
     adc.set_auto_delay(true);
     adc.set_continuous(Continuous::Continuous);
     adc.reset_sequence();
-    adc.configure_channel(&pa0, Sequence::One, SampleTime::Cycles_640_5);
+    adc.configure_channel(&gpioa.pa0, Sequence::One, SampleTime::Cycles_640_5);
     adc.configure_channel(&Vref, Sequence::Two, SampleTime::Cycles_640_5);
     adc.configure_channel(&Temperature, Sequence::Three, SampleTime::Cycles_640_5);
     let adc = adc.enable();

examples/adc-one-shot.rs

@@ -43,13 +43,12 @@ fn main() -> ! {
     info!("Setup Gpio");
 
     let gpioa = dp.GPIOA.split(&mut rcc);
-    let pa7 = gpioa.pa7.into_analog();
 
     info!("Enter Loop");
 
     loop {
         info!("Convert");
-        let sample = adc.convert(&pa7, SampleTime::Cycles_640_5);
+        let sample = adc.convert(&gpioa.pa7, SampleTime::Cycles_640_5);
         info!("sample to mv");
         let millivolts = adc.sample_to_millivolts(sample);
         info!("pa7: {}mV", millivolts);

examples/button.rs

@@ -17,7 +17,7 @@ use cortex_m_rt::entry;
 
 type ButtonPin = gpio::PC13<Input>;
 
-// Make LED pin globally available
+// Make LED and BUTTON pins globally available
 static G_BUTTON: Mutex<RefCell<Option<ButtonPin>>> = Mutex::new(RefCell::new(None));
 static G_LED_ON: AtomicBool = AtomicBool::new(true);
 

examples/comp.rs

@@ -9,36 +9,33 @@
 #![no_std]
 
 mod utils;
-extern crate cortex_m_rt as rt;
 
-use rt::entry;
+use cortex_m_rt::entry;
 
 #[entry]
 fn main() -> ! {
-    use hal::comparator::{refint_input, ComparatorExt, ComparatorSplit, Config, Hysteresis};
-    use hal::gpio::{GpioExt, PushPull};
-    use hal::rcc::RccExt;
-    use hal::stm32;
-    use stm32g4xx_hal as hal;
-
-    let dp = stm32::Peripherals::take().expect("cannot take peripherals");
+    use stm32g4xx_hal::{
+        comparator::{refint_input, ComparatorExt, ComparatorSplit, Config, Hysteresis},
+        gpio::{GpioExt, PushPull},
+        pac,
+        rcc::RccExt,
+    };
+
+    let dp = pac::Peripherals::take().expect("cannot take peripherals");
     let mut rcc = dp.RCC.constrain();
 
     let gpioa = dp.GPIOA.split(&mut rcc);
 
     let (comp1, comp2, ..) = dp.COMP.split(&mut rcc);
 
-    let pa1 = gpioa.pa1.into_analog();
-    let pa0 = gpioa.pa0.into_analog();
-    let comp1 = comp1.comparator(pa1, pa0, Config::default(), &rcc.clocks);
+    let comp1 = comp1.comparator(gpioa.pa1, gpioa.pa0, Config::default(), &rcc.clocks);
     let comp1 = comp1.enable();
 
     // led1 pa1 will be updated manually when to match comp1 value
     let mut led1 = gpioa.pa5.into_push_pull_output();
 
-    let pa7 = gpioa.pa7.into_analog();
     let comp2 = comp2.comparator(
-        pa7,
+        gpioa.pa7,
         refint_input::VRefintM12,
         Config::default()
             .hysteresis(Hysteresis::None)
@@ -53,9 +50,6 @@ fn main() -> ! {
 
     loop {
         // Read comp1 output and update led1 accordingly
-        match comp1.output() {
-            true => led1.set_high(),
-            false => led1.set_low(),
-        }
+        led1.set_state(comp1.output().into());
     }
 }

examples/comp_w_dac.rs

@@ -10,16 +10,17 @@ use rt::entry;
 
 #[entry]
 fn main() -> ! {
-    use hal::comparator::{self, ComparatorExt, ComparatorSplit};
-    use hal::dac::{Dac1IntSig1, DacExt, DacOut};
-    use hal::delay::SYSTDelayExt;
-    use hal::gpio::{GpioExt, PushPull};
-    use hal::rcc::RccExt;
-    use hal::stasis::Freeze;
-    use hal::stm32;
-    use stm32g4xx_hal as hal;
+    use stm32g4xx_hal::{
+        comparator::{self, ComparatorExt, ComparatorSplit},
+        dac::{Dac1IntSig1, DacExt, DacOut},
+        delay::SYSTDelayExt,
+        gpio::{GpioExt, PushPull},
+        pac,
+        rcc::RccExt,
+        stasis::Freeze,
+    };
 
-    let dp = stm32::Peripherals::take().expect("cannot take peripherals");
+    let dp = pac::Peripherals::take().expect("cannot take peripherals");
     let cp = cortex_m::Peripherals::take().expect("cannot take core peripherals");
 
     let mut rcc = dp.RCC.constrain();
@@ -34,13 +35,14 @@ fn main() -> ! {
     let (mut dac, [dac_token]) = dac.freeze();
 
     let (comp1, _comp2, ..) = dp.COMP.split(&mut rcc);
-    let pa1 = gpioa.pa1.into_analog();
 
     // Set up comparator with pa1 as positive, and the DAC as negative input
     let comp = comp1.comparator(
-        pa1,
+        gpioa.pa1,
         dac_token,
-        comparator::Config::default().hysteresis(comparator::Hysteresis::None),
+        comparator::Config::default()
+            .hysteresis(comparator::Hysteresis::None)
+            .output_inverted(),
         &rcc.clocks,
     );
 

examples/cordic.rs

@@ -3,22 +3,20 @@
 #![no_main]
 #![no_std]
 
-extern crate cortex_m;
-extern crate cortex_m_rt as rt;
-extern crate stm32g4xx_hal as hal;
-
-use hal::cordic::{
-    op::{dynamic::Mode as _, Magnitude, SinCos, Sqrt},
-    prec::P60,
-    scale::N0,
-    types::{I1F15, Q15, Q31},
-    Ext as _,
+use cortex_m_rt::entry;
+use stm32g4xx_hal::{
+    cordic::{
+        op::{dynamic::Mode as _, Magnitude, SinCos, Sqrt},
+        prec::P60,
+        scale::N0,
+        types::{I1F15, Q15, Q31},
+        Ext as _,
+    },
+    pac,
+    prelude::*,
+    pwr::PwrExt,
+    rcc::Config,
 };
-use hal::prelude::*;
-use hal::pwr::PwrExt;
-use hal::rcc::Config;
-use hal::stm32;
-use rt::entry;
 
 #[macro_use]
 mod utils;
@@ -27,7 +25,7 @@ use utils::logger::println;
 
 #[entry]
 fn main() -> ! {
-    let dp = stm32::Peripherals::take().expect("cannot take peripherals");
+    let dp = pac::Peripherals::take().expect("cannot take peripherals");
     let pwr = dp.PWR.constrain().freeze();
     let mut rcc = dp.RCC.freeze(Config::hsi(), pwr);