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

Refactor

Browse Source
This commit is contained in:
Alexander Neuhäuser
2025-06-04 17:20:04 +02:00
parent a289dcfd17
commit c78d834742
8 changed files with 190 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/main.rs
View File

@@ -8,13 +8,15 @@ use core::{
};
use nova::{
gpio::{
gpio_enable_low_detect, gpio_get_state, gpio_high, gpio_low, gpio_pull_up, set_gpio_state,
GPIOState,
irq_interrupt::enable_irq_source,
peripherals::{
gpio::{
gpio_get_state, gpio_high, gpio_low, gpio_pull_up, set_falling_edge_detect,
set_gpio_state, GPIOState,
},
uart::{print, uart_init},
},
interrupt::enable_iqr_source,
timer::{delay_nops, sleep},
uart::{print, uart_init},
timer::{delay_nops, sleep_ms, sleep_us},
};
global_asm!(include_str!("vector.S"));
@@ -44,14 +46,11 @@ pub unsafe extern "C" fn _start() {
#[no_mangle]
pub extern "C" fn main() -> ! {
uart_init();
enable_uart();
// Set ACT Led to Outout
let _ = set_gpio_state(21, GPIOState::Output);
// Set GPIO Pins to UART
let _ = set_gpio_state(14, GPIOState::Alternative0);
let _ = set_gpio_state(15, GPIOState::Alternative0);
print_current_el_str();
// Delay so clock speed can stabilize
@@ -69,26 +68,26 @@ pub extern "C" fn main() -> ! {
pub extern "C" fn kernel_main() -> ! {
print_current_el_str();
sleep(500_000);
sleep_us(500_000);
// Set GPIO 21 to Input
enable_iqr_source(49); //21 is on the first GPIO bank
let _ = set_gpio_state(21, GPIOState::Input);
gpio_pull_up(21);
gpio_enable_low_detect(21, true);
// Set GPIO 26 to Input
enable_irq_source(nova::irq_interrupt::IRQState::GpioInt0); //26 is on the first GPIO bank
let _ = set_gpio_state(26, GPIOState::Input);
gpio_pull_up(26);
set_falling_edge_detect(26, true);
loop {
let _ = gpio_high(29);
sleep(500_000); // 0.5s
sleep_ms(500); // 0.5s
let _ = gpio_low(29);
sleep(500_000); // 0.5s
sleep_ms(500); // 0.5s
print_gpio_state();
}
}
fn print_gpio_state() {
let state = gpio_get_state(21);
let state = gpio_get_state(26);
let ascii_byte = b'0' + state;
let data = [ascii_byte];
@@ -110,6 +109,13 @@ pub fn get_current_el() -> u64 {
el >> 2
}
fn enable_uart() {
uart_init();
// Set GPIO Pins to UART
let _ = set_gpio_state(14, GPIOState::Alternative0);
let _ = set_gpio_state(15, GPIOState::Alternative0);
}
fn print_current_el_str() {
let el = get_current_el();
let el_str = match el {