aneuhaeuser/novaOS
1
0
Fork 0
mirror of https://github.com/iceHtwoO/novaOS.git synced 2026-04-17 04:32:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Pull Up/Down and test

Browse Source
This commit is contained in:
Alexander Neuhäuser
2025-05-26 14:37:13 +02:00
parent c9ab0bc885
commit 18233ec722
3 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gpio.rs
View File

@@ -24,7 +24,7 @@ pub enum GPIOState {
Alternative5 = 0b010,
}
pub unsafe fn set_gpio_state(gpio: u8, state: GPIOState) -> Result<(), &'static str> {
pub fn set_gpio_state(gpio: u8, state: GPIOState) -> Result<(), &'static str> {
if gpio > 53 {
return Err("GPIO out of range");
}
@@ -32,15 +32,16 @@ pub unsafe fn set_gpio_state(gpio: u8, state: GPIOState) -> Result<(), &'static
let register_index = gpio / 10;
let register_offset = (gpio % 10) * 3;
let register_addr = GPFSEL_BASE + (register_index as u32 * 4);
unsafe {
let current = core::ptr::read_volatile(register_addr as *const u32);
let current = core::ptr::read_volatile(register_addr as *const u32);
let mask = !(0b111 << register_offset);
let cleared = current & mask;
let mask = !(0b111 << register_offset);
let cleared = current & mask;
let new_val = cleared | ((state as u32) << register_offset);
let new_val = cleared | ((state as u32) << register_offset);
core::ptr::write_volatile(register_addr as *mut u32, new_val);
core::ptr::write_volatile(register_addr as *mut u32, new_val);
}
Ok(())
}
@@ -88,7 +89,7 @@ pub fn gpio_pull_down(gpio: u8) {
fn gpio_pull_up_down(gpio: u8, val: u32) {
unsafe {
// Determine GPPUDCLK Register
let register_addr = gpio / 32;
let register_addr = GPPUDCLK_BASE + 4 * (gpio as u32 / 32);
let register_offset = gpio % 32;
// 1. Write Pull up

35
src/main.rs
View File

@@ -4,8 +4,9 @@
use core::{arch::asm, panic::PanicInfo};
use gpio::{gpio_high, gpio_low, set_gpio_state};
use gpio::{gpio_get_state, gpio_high, gpio_low, gpio_pull_up, set_gpio_state};
use timer::{delay_nops, sleep};
use uart::print;
mod gpio;
mod timer;
@@ -29,18 +30,20 @@ pub unsafe extern "C" fn _start() {
#[no_mangle]
extern "C" fn main() {
uart::configure_uart();
unsafe {
// Set ACT Led to Outout
let _ = set_gpio_state(29, gpio::GPIOState::Output);
// Set ACT Led to Outout
let _ = set_gpio_state(21, gpio::GPIOState::Output);
// Set GPIO Pins to UART
let _ = set_gpio_state(14, gpio::GPIOState::Alternative0);
let _ = set_gpio_state(15, gpio::GPIOState::Alternative0);
}
// Set GPIO Pins to UART
let _ = set_gpio_state(14, gpio::GPIOState::Alternative0);
let _ = set_gpio_state(15, gpio::GPIOState::Alternative0);
// Set GPIO 21 to Input
let _ = set_gpio_state(21, gpio::GPIOState::Input);
gpio_pull_up(21);
// Delay so clock speed can stabilize
delay_nops(50000);
uart::print("Hello World!\n");
uart::print("Hello World!\r\n");
sleep(500_000);
@@ -49,6 +52,18 @@ extern "C" fn main() {
sleep(500_000); // 0.5s
let _ = gpio_low(29);
sleep(500_000) // 0.5s
sleep(500_000); // 0.5s
print_gpio_state();
}
}
fn print_gpio_state() {
let state = gpio_get_state(21);
let ascii_byte = b'0' + state;
let data = [ascii_byte];
let s = str::from_utf8(&data).unwrap();
print(s);
print("\r\n");
}