Revert "[WIP] treewide: Use CamelCase peripheral names everywhere"

This reverts commit ef69e1b.

Author: Rahix

arduino-hal/src/lib.rs

@@ -243,7 +243,7 @@ macro_rules! pins {
 macro_rules! default_serial {
     ($p:expr, $pins:expr, $baud:expr) => {
         $crate::Usart::new(
-            $p.usart1,
+            $p.USART1,
             $pins.d0,
             $pins.d1.into_output(),
             $crate::hal::usart::BaudrateExt::into_baudrate($baud),
@@ -264,7 +264,7 @@ macro_rules! default_serial {
 macro_rules! default_serial {
     ($p:expr, $pins:expr, $baud:expr) => {
         $crate::Usart::new(
-            $p.usart1,
+            $p.USART1,
             $pins.rx,
             $pins.tx.into_output(),
             $crate::hal::usart::BaudrateExt::into_baudrate($baud),
@@ -287,7 +287,7 @@ macro_rules! default_serial {
 /// let dp = arduino_hal::Peripherals::take().unwrap();
 /// let pins = arduino_hal::pins!(dp);
 /// let serial = arduino_hal::Usart::new(
-///     dp.usart1,
+///     dp.USART1,
 ///     pins.d0,
 ///     pins.d1.into_output(),
 ///     // See src/usart.rs for why some boards use the BaudrateArduinoExt trait
@@ -305,7 +305,7 @@ macro_rules! default_serial {
 macro_rules! default_serial {
     ($p:expr, $pins:expr, $baud:expr) => {
         $crate::Usart::new(
-            $p.usart0,
+            $p.USART0,
             $pins.d0,
             $pins.d1.into_output(),
             // See comment in avr-hal-generic/src/usart.rs for why these boards use the
@@ -333,7 +333,7 @@ macro_rules! default_serial {
 macro_rules! default_serial {
     ($p:expr, $pins:expr, $baud:expr) => {
         $crate::Usart::new(
-            $p.usart0,
+            $p.USART0,
             $pins.d0,
             $pins.d1.into_output(),
             $crate::hal::usart::BaudrateExt::into_baudrate($baud),

examples/arduino-uno/src/bin/uno-16chan-servo-driver.rs

@@ -28,7 +28,7 @@ fn main() -> ! {
     let mut led = pins.d13.into_output();
 
     let i2c = arduino_hal::I2c::new(
-        dp.twi,
+        dp.TWI,
         pins.a4.into_pull_up_input(),
         pins.a5.into_pull_up_input(),
         100_000,

examples/arduino-uno/src/bin/uno-adc.rs

@@ -23,7 +23,7 @@ fn main() -> ! {
     let pins = arduino_hal::pins!(dp);
     let mut serial = arduino_hal::default_serial!(dp, pins, 57600);
 
-    let mut adc = arduino_hal::Adc::new(dp.adc, Default::default());
+    let mut adc = arduino_hal::Adc::new(dp.ADC, Default::default());
 
     let (vbg, gnd, tmp) = (
         adc.read_blocking(&adc::channel::Vbg),

examples/arduino-uno/src/bin/uno-eeprom.rs

@@ -13,7 +13,7 @@ fn main() -> ! {
     let pins = arduino_hal::pins!(dp);
     let mut serial = arduino_hal::default_serial!(dp, pins, 57600);
 
-    let mut ep = arduino_hal::Eeprom::new(dp.eeprom);
+    let mut ep = arduino_hal::Eeprom::new(dp.EEPROM);
     let ep_capacity = ep.capacity();
     ufmt::uwriteln!(&mut serial, "eeprom capacity is:{}\r", ep_capacity).unwrap_infallible();
 

examples/arduino-uno/src/bin/uno-ext-interrupt.rs

@@ -47,9 +47,9 @@ fn main() -> ! {
 
     // thanks to tsemczyszyn and Rahix: https://github.com/Rahix/avr-hal/issues/240
     // Configure INT0 for falling edge. 0x03 would be rising edge.
-    dp.exint.eicra().modify(|_, w| w.isc0().set(0x02));
+    dp.EXINT.eicra().modify(|_, w| w.isc0().set(0x02));
     // Enable the INT0 interrupt source.
-    dp.exint.eimsk().modify(|_, w| w.int0().set_bit());
+    dp.EXINT.eimsk().modify(|_, w| w.int0().set_bit());
 
     let mut leds: [Pin<mode::Output>; 4] = [
         pins.d3.into_output().downgrade(),

examples/arduino-uno/src/bin/uno-hc-sr04.rs

@@ -29,7 +29,7 @@ fn main() -> ! {
     // it gives one clock count every 4 µs.
     // since the clock register size is 16 bits, the timer is full every
     // 1/(16e6/64)*2^16 ≈ 260 ms
-    let timer1 = dp.tc1;
+    let timer1 = dp.TC1;
     timer1.tccr1b().write(|w| w.cs1().prescale_64());
 
     'outer: loop {

examples/arduino-uno/src/bin/uno-i2cdetect.rs

@@ -27,7 +27,7 @@ fn main() -> ! {
     let mut serial = arduino_hal::default_serial!(dp, pins, 57600);
 
     let mut i2c = arduino_hal::I2c::new(
-        dp.twi,
+        dp.TWI,
         pins.a4.into_pull_up_input(),
         pins.a5.into_pull_up_input(),
         50000,

examples/arduino-uno/src/bin/uno-infrared.rs

@@ -24,7 +24,7 @@ use panic_halt as _;
 
 use arduino_hal::{
     hal::port::{PD2, PD6, PD7},
-    pac::tc0::tccr0b::Cs0,
+    pac::tc0::tccr0b::CS0_A,
     port::mode::{Floating, Input, Output},
     port::Pin,
     prelude::*,
@@ -51,7 +51,7 @@ fn main() -> ! {
     let mut serial = arduino_hal::default_serial!(dp, pins, 57600);
 
     // Monotonic clock to keep track of the time
-    CLOCK.start(dp.tc0);
+    CLOCK.start(dp.TC0);
 
     let mut uno_led = pins.d13.into_output();
     let mut irdroino_led1 = pins.d7.into_output();
@@ -62,10 +62,10 @@ fn main() -> ! {
     irdroino_led2.set_low();
 
     // Enable group 2 (PORTD)
-    dp.exint.pcicr().write(|w| unsafe { w.bits(0b100) });
+    dp.EXINT.pcicr().write(|w| unsafe { w.bits(0b100) });
 
     // Enable pin change interrupts on PCINT18 which is pin PD2 (= d2)
-    dp.exint.pcmsk2().write(|w| w.set(0b100));
+    dp.EXINT.pcmsk2().write(|w| w.set(0b100));
 
     let ir = Receiver::with_pin(Clock::FREQ, pins.d2);
 
@@ -130,7 +130,7 @@ struct Clock {
 
 impl Clock {
     const FREQ: u32 = 20_000;
-    const PRESCALER: Cs0 = Cs0::Prescale8;
+    const PRESCALER: CS0_A = CS0_A::PRESCALE_8;
     const TOP: u8 = 99;
 
     pub const fn new() -> Clock {
@@ -139,7 +139,7 @@ impl Clock {
         }
     }
 
-    pub fn start(&self, tc0: arduino_hal::pac::Tc0) {
+    pub fn start(&self, tc0: arduino_hal::pac::TC0) {
         // Configure the timer for the above interval (in CTC mode)
         tc0.tccr0a().write(|w| w.wgm0().ctc());
         tc0.ocr0a().write(|w| w.set(Self::TOP));

examples/arduino-uno/src/bin/uno-manual-servo.rs

@@ -29,7 +29,7 @@ fn main() -> ! {
     // - TC1 runs off a 250kHz clock, with 5000 counts per overflow => 50 Hz signal.
     // - Each count increases the duty-cycle by 4us.
     // - Use OC1A which is connected to D9 of the Arduino Uno.
-    let tc1 = dp.tc1;
+    let tc1 = dp.TC1;
     tc1.icr1().write(|w| w.set(4999));
     tc1.tccr1a()
         .write(|w| w.wgm1().set(0b10).com1a().match_clear());

examples/arduino-uno/src/bin/uno-millis.rs

@@ -35,7 +35,7 @@ const MILLIS_INCREMENT: u32 = PRESCALER * TIMER_COUNTS / 16000;
 static MILLIS_COUNTER: avr_device::interrupt::Mutex<cell::Cell<u32>> =
     avr_device::interrupt::Mutex::new(cell::Cell::new(0));
 
-fn millis_init(tc0: arduino_hal::pac::Tc0) {
+fn millis_init(tc0: arduino_hal::pac::TC0) {
     // Configure the timer for the above interval (in CTC mode)
     // and enable its interrupt.
     tc0.tccr0a().write(|w| w.wgm0().ctc());
@@ -76,7 +76,7 @@ fn main() -> ! {
     let pins = arduino_hal::pins!(dp);
     let mut serial = arduino_hal::default_serial!(dp, pins, 57600);
 
-    millis_init(dp.tc0);
+    millis_init(dp.TC0);
 
     // Enable interrupts globally
     unsafe { avr_device::interrupt::enable() };