add boot loader
This commit is contained in:
@@ -5,6 +5,7 @@ mod log_sink;
|
||||
|
||||
use crate::prometeu_runner::PrometeuRunner;
|
||||
use winit::event_loop::EventLoop;
|
||||
use prometeu_core::firmware::BootTarget;
|
||||
use prometeu_core::telemetry::CertificationConfig;
|
||||
|
||||
fn load_cap_config(path: &str) -> Option<CertificationConfig> {
|
||||
@@ -37,14 +38,26 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
let args: Vec<String> = std::env::args().collect();
|
||||
let mut fs_root = None;
|
||||
let mut cap_config = None;
|
||||
let mut cartridge_path = None;
|
||||
let mut boot_target = BootTarget::Hub;
|
||||
|
||||
let mut i = 1; // Pula o nome do executável
|
||||
while i < args.len() {
|
||||
match args[i].as_str() {
|
||||
"run" => {
|
||||
"--run" => {
|
||||
if i + 1 < args.len() {
|
||||
cartridge_path = Some(args[i + 1].clone());
|
||||
boot_target = BootTarget::Cartridge {
|
||||
path: args[i + 1].clone(),
|
||||
debug: false,
|
||||
};
|
||||
i += 1;
|
||||
}
|
||||
}
|
||||
"--debug" => {
|
||||
if i + 1 < args.len() {
|
||||
boot_target = BootTarget::Cartridge {
|
||||
path: args[i + 1].clone(),
|
||||
debug: true,
|
||||
};
|
||||
i += 1;
|
||||
}
|
||||
}
|
||||
@@ -68,16 +81,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
let event_loop = EventLoop::new()?;
|
||||
|
||||
let mut runner = PrometeuRunner::new(fs_root, cap_config);
|
||||
|
||||
if let Some(path) = cartridge_path {
|
||||
match runner.load_cartridge(&path) {
|
||||
Ok(_) => println!("Cartridge loaded: {}", path),
|
||||
Err(e) => {
|
||||
eprintln!("Failed to load cartridge: {:?}", e);
|
||||
return Ok(());
|
||||
}
|
||||
}
|
||||
}
|
||||
runner.set_boot_target(boot_target);
|
||||
|
||||
event_loop.run_app(&mut runner)?;
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ use crate::fs_desktop_backend::HostDirBackend;
|
||||
use crate::log_sink::HostConsoleSink;
|
||||
use cpal::traits::{DeviceTrait, HostTrait, StreamTrait};
|
||||
use pixels::{Pixels, SurfaceTexture};
|
||||
use prometeu_core::firmware::Firmware;
|
||||
use prometeu_core::firmware::{BootTarget, Firmware};
|
||||
use prometeu_core::hardware::{AudioCommand, InputSignals, OUTPUT_SAMPLE_RATE};
|
||||
use prometeu_core::Hardware;
|
||||
use ringbuf::traits::{Consumer, Producer, Split};
|
||||
@@ -42,6 +42,8 @@ pub struct PrometeuRunner {
|
||||
|
||||
overlay_enabled: bool,
|
||||
|
||||
debug_waiting_for_start: bool,
|
||||
|
||||
audio_load_accum_us: u64,
|
||||
audio_load_samples: u64,
|
||||
audio_perf_consumer: Option<ringbuf::wrap::CachingCons<Arc<HeapRb<u64>>>>,
|
||||
@@ -51,6 +53,15 @@ pub struct PrometeuRunner {
|
||||
}
|
||||
|
||||
impl PrometeuRunner {
|
||||
pub(crate) fn set_boot_target(&mut self, boot_target: BootTarget) {
|
||||
self.firmware.boot_target = boot_target.clone();
|
||||
if let BootTarget::Cartridge { debug: true, .. } = boot_target {
|
||||
self.debug_waiting_for_start = true;
|
||||
println!("[Debugger] Waiting for start command...");
|
||||
println!("[Debugger] (Stub: press D to start execution)");
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn load_cartridge(&mut self, path: &str) -> Result<(), CartridgeError> {
|
||||
let cartridge = CartridgeLoader::load(path)?;
|
||||
self.firmware.load_cartridge(cartridge);
|
||||
@@ -82,6 +93,7 @@ impl PrometeuRunner {
|
||||
frames_since_last_update: 0,
|
||||
current_fps: 0.0,
|
||||
overlay_enabled: false,
|
||||
debug_waiting_for_start: false,
|
||||
audio_load_accum_us: 0,
|
||||
audio_load_samples: 0,
|
||||
audio_perf_consumer: None,
|
||||
@@ -225,6 +237,12 @@ impl ApplicationHandler for PrometeuRunner {
|
||||
WindowEvent::KeyboardInput { event, .. } => {
|
||||
if let PhysicalKey::Code(code) = event.physical_key {
|
||||
let is_down = event.state == ElementState::Pressed;
|
||||
|
||||
if is_down && code == KeyCode::KeyD && self.debug_waiting_for_start {
|
||||
self.debug_waiting_for_start = false;
|
||||
println!("[Debugger] Execution started!");
|
||||
}
|
||||
|
||||
match code {
|
||||
KeyCode::ArrowUp => self.input_signals.up_signal = is_down,
|
||||
KeyCode::ArrowDown => self.input_signals.down_signal = is_down,
|
||||
@@ -301,7 +319,9 @@ impl ApplicationHandler for PrometeuRunner {
|
||||
|
||||
// 🔥 O coração do determinismo: consome o tempo em fatias exatas de 60Hz
|
||||
while self.accumulator >= self.frame_target_dt {
|
||||
self.firmware.step_frame(&self.input_signals, &mut self.hardware);
|
||||
if !self.debug_waiting_for_start {
|
||||
self.firmware.step_frame(&self.input_signals, &mut self.hardware);
|
||||
}
|
||||
|
||||
// Envia comandos de áudio gerados neste frame para a thread de áudio
|
||||
if let Some(producer) = &mut self.audio_producer {
|
||||
|
||||
Reference in New Issue
Block a user