mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
Merge branch 'bunnie-dev' into main
This commit is contained in:
commit
aeef6f26f6
4 changed files with 51 additions and 13 deletions
|
|
@ -513,6 +513,7 @@ fn xmain() -> ! {
|
||||||
i2c.i2c_write(ABRTCMC_I2C_ADR, ABRTCMC_CONTROL2, &[control2]).expect("RTC access error");
|
i2c.i2c_write(ABRTCMC_I2C_ADR, ABRTCMC_CONTROL2, &[control2]).expect("RTC access error");
|
||||||
xous::return_scalar(msg.sender, 0).expect("couldn't return to caller");
|
xous::return_scalar(msg.sender, 0).expect("couldn't return to caller");
|
||||||
}),
|
}),
|
||||||
|
#[cfg(any(target_os = "none", target_os = "xous"))]
|
||||||
Some(Opcode::GetRtcValue) => msg_blocking_scalar_unpack!(msg, _, _, _, _, {
|
Some(Opcode::GetRtcValue) => msg_blocking_scalar_unpack!(msg, _, _, _, _, {
|
||||||
// There is a possibility that the RTC hardware is actually in an invalid state.
|
// There is a possibility that the RTC hardware is actually in an invalid state.
|
||||||
// Thus, this will return a u64 which is formatted as follows:
|
// Thus, this will return a u64 which is formatted as follows:
|
||||||
|
|
@ -556,6 +557,18 @@ fn xmain() -> ! {
|
||||||
(total_secs & 0xFFFF_FFFF) as usize,
|
(total_secs & 0xFFFF_FFFF) as usize,
|
||||||
).expect("couldn't return to caller");
|
).expect("couldn't return to caller");
|
||||||
}),
|
}),
|
||||||
|
#[cfg(not(any(target_os = "none", target_os = "xous")))]
|
||||||
|
Some(Opcode::GetRtcValue) => msg_blocking_scalar_unpack!(msg, _, _, _, _, {
|
||||||
|
use chrono::prelude::*;
|
||||||
|
let now = Local::now();
|
||||||
|
let total_secs = now.timestamp_millis() - 148409348; // sets the offset to something like 1974, which is roughly where an RTC value ends up in reality
|
||||||
|
xous::return_scalar2(msg.sender,
|
||||||
|
((total_secs >> 32) & 0xFFFF_FFFF) as usize,
|
||||||
|
(total_secs & 0xFFFF_FFFF) as usize,
|
||||||
|
).expect("couldn't return to caller");
|
||||||
|
// use the tt variable so we don't get a warning
|
||||||
|
let _ = tt.elapsed_ms();
|
||||||
|
}),
|
||||||
Some(Opcode::Quit) => {
|
Some(Opcode::Quit) => {
|
||||||
log::info!("Received quit opcode, exiting.");
|
log::info!("Received quit opcode, exiting.");
|
||||||
let dropconn = xous::connect(i2c_sid).unwrap();
|
let dropconn = xous::connect(i2c_sid).unwrap();
|
||||||
|
|
|
||||||
|
|
@ -1224,6 +1224,12 @@ fn try_mount_or_format(modals: &modals::Modals, pddb_os: &mut PddbOs, basis_cach
|
||||||
#[cfg(not(any(target_os = "none", target_os = "xous")))]
|
#[cfg(not(any(target_os = "none", target_os = "xous")))]
|
||||||
{
|
{
|
||||||
pddb_os.pddb_format(false, Some(&modals)).expect("couldn't format PDDB");
|
pddb_os.pddb_format(false, Some(&modals)).expect("couldn't format PDDB");
|
||||||
|
let _ = xous::send_message(time_resetter,
|
||||||
|
xous::Message::new_blocking_scalar(
|
||||||
|
0, // the ID is "hard coded" using enumerated discriminants
|
||||||
|
0, 0, 0, 0
|
||||||
|
)
|
||||||
|
).expect("couldn't reset time");
|
||||||
pddb_os.dbg_dump(Some("full".to_string()), None);
|
pddb_os.dbg_dump(Some("full".to_string()), None);
|
||||||
if let Some(sys_basis) = pddb_os.pddb_mount() {
|
if let Some(sys_basis) = pddb_os.pddb_mount() {
|
||||||
log::info!("PDDB mount operation finished successfully");
|
log::info!("PDDB mount operation finished successfully");
|
||||||
|
|
|
||||||
|
|
@ -302,7 +302,6 @@ fn xmain() -> ! {
|
||||||
|
|
||||||
let mut stats_phase: usize = 0;
|
let mut stats_phase: usize = 0;
|
||||||
|
|
||||||
let dt_pump_interval = 15;
|
|
||||||
let charger_pump_interval = 180;
|
let charger_pump_interval = 180;
|
||||||
let batt_interval;
|
let batt_interval;
|
||||||
let secnotes_interval;
|
let secnotes_interval;
|
||||||
|
|
@ -514,18 +513,6 @@ fn xmain() -> ! {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (stats_phase % dt_pump_interval) == 2 {
|
|
||||||
// #[cfg(any(target_os = "none", target_os = "xous"))]
|
|
||||||
// TODO_RTC
|
|
||||||
// placeholder for the RTC request when it is ready
|
|
||||||
#[cfg(not(any(target_os = "none", target_os = "xous")))]
|
|
||||||
{
|
|
||||||
log::trace!("hosted request of date time - short circuiting server call");
|
|
||||||
use chrono::prelude::*;
|
|
||||||
let now = Local::now();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
{ // update the time field
|
{ // update the time field
|
||||||
// have to clear the entire rectangle area, because the text has a variable width and dirty text will remain if the text is shortened
|
// have to clear the entire rectangle area, because the text has a variable width and dirty text will remain if the text is shortened
|
||||||
gam.draw_rectangle(status_gid, time_rect).ok();
|
gam.draw_rectangle(status_gid, time_rect).ok();
|
||||||
|
|
|
||||||
|
|
@ -41,13 +41,20 @@ const TIME_SERVER_UTC_OFFSET: &'static str = "utc_offset";
|
||||||
/// This is the offset from UTC to the display time zone. This can vary when the user changes time zones.
|
/// This is the offset from UTC to the display time zone. This can vary when the user changes time zones.
|
||||||
pub(crate) const TIME_SERVER_TZ_OFFSET: &'static str = "tz_offset";
|
pub(crate) const TIME_SERVER_TZ_OFFSET: &'static str = "tz_offset";
|
||||||
|
|
||||||
|
#[allow(dead_code)]
|
||||||
const CTL3: usize = 0;
|
const CTL3: usize = 0;
|
||||||
|
#[allow(dead_code)]
|
||||||
const SECS: usize = 1;
|
const SECS: usize = 1;
|
||||||
|
#[allow(dead_code)]
|
||||||
const MINS: usize = 2;
|
const MINS: usize = 2;
|
||||||
|
#[allow(dead_code)]
|
||||||
const HOURS: usize = 3;
|
const HOURS: usize = 3;
|
||||||
|
#[allow(dead_code)]
|
||||||
const DAYS: usize = 4;
|
const DAYS: usize = 4;
|
||||||
// note 5 is skipped - this is weekdays, and is unused
|
// note 5 is skipped - this is weekdays, and is unused
|
||||||
|
#[allow(dead_code)]
|
||||||
const MONTHS: usize = 6;
|
const MONTHS: usize = 6;
|
||||||
|
#[allow(dead_code)]
|
||||||
const YEARS: usize = 7;
|
const YEARS: usize = 7;
|
||||||
|
|
||||||
/// Do not modify the discriminants in this structure. They are used in `libstd` directly.
|
/// Do not modify the discriminants in this structure. They are used in `libstd` directly.
|
||||||
|
|
@ -293,6 +300,7 @@ pub fn start_time_server() {
|
||||||
});
|
});
|
||||||
|
|
||||||
// this thread handles more sensitive operations on the RTC.
|
// this thread handles more sensitive operations on the RTC.
|
||||||
|
#[cfg(any(target_os = "none", target_os = "xous"))]
|
||||||
thread::spawn({
|
thread::spawn({
|
||||||
let rtc_checked = rtc_checked.clone();
|
let rtc_checked = rtc_checked.clone();
|
||||||
move || {
|
move || {
|
||||||
|
|
@ -359,8 +367,30 @@ pub fn start_time_server() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
#[cfg(not(any(target_os = "none", target_os = "xous")))]
|
||||||
|
thread::spawn({
|
||||||
|
let rtc_checked = rtc_checked.clone();
|
||||||
|
move || {
|
||||||
|
let xns = xous_names::XousNames::new().unwrap();
|
||||||
|
// we expect exactly one connection from the PDDB
|
||||||
|
let priv_sid = xns.register_name(pddb::TIME_SERVER_PDDB, Some(1)).expect("can't register server");
|
||||||
|
rtc_checked.store(true, Ordering::SeqCst);
|
||||||
|
loop {
|
||||||
|
let msg = xous::receive_message(priv_sid).unwrap();
|
||||||
|
match FromPrimitive::from_usize(msg.body.id()) {
|
||||||
|
Some(PrivTimeOp::ResetRtc) => xous::msg_blocking_scalar_unpack!(msg, _, _, _, _, {
|
||||||
|
log::warn!("RTC time reset command received. This does nothing in hosted mode");
|
||||||
|
xous::return_scalar(msg.sender, 0).unwrap();
|
||||||
|
}),
|
||||||
|
_ => log::error!("Time server private thread received unknown opcode: {:?}", msg),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[allow(dead_code)]
|
||||||
fn is_rtc_invalid(settings: &[u8]) -> bool {
|
fn is_rtc_invalid(settings: &[u8]) -> bool {
|
||||||
((settings[CTL3] & 0xE0) != (Control3::BATT_STD_BL_EN).bits()) // power switchover setting should be initialized
|
((settings[CTL3] & 0xE0) != (Control3::BATT_STD_BL_EN).bits()) // power switchover setting should be initialized
|
||||||
|| ((settings[SECS] & 0x80) != 0) // clock integrity should be guaranteed
|
|| ((settings[SECS] & 0x80) != 0) // clock integrity should be guaranteed
|
||||||
|
|
@ -372,9 +402,11 @@ fn is_rtc_invalid(settings: &[u8]) -> bool {
|
||||||
|| (to_binary(settings[YEARS]) > 99)
|
|| (to_binary(settings[YEARS]) > 99)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[allow(dead_code)]
|
||||||
fn to_binary(bcd: u8) -> u8 {
|
fn to_binary(bcd: u8) -> u8 {
|
||||||
(bcd & 0xf) + ((bcd >> 4) * 10)
|
(bcd & 0xf) + ((bcd >> 4) * 10)
|
||||||
}
|
}
|
||||||
|
#[allow(dead_code)]
|
||||||
fn to_bcd(binary: u8) -> u8 {
|
fn to_bcd(binary: u8) -> u8 {
|
||||||
let mut lsd: u8 = binary % 10;
|
let mut lsd: u8 = binary % 10;
|
||||||
if lsd > 9 {
|
if lsd > 9 {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue