refactor(errors): adopt reportable error terminology
This commit is contained in:
1 parent
21e9497915
commit
9fec2fa095
92 files changed
+270
-269
No files matched your search
@@ -22,7 +22,7 @@ use kaptan_drivers::{
|
||||
},
|
||||
mtf01::Mtf01Service,
|
||||
};
|
||||
use kaptan_err_propagate::{ErrorId, ErrorSink};
|
||||
use kaptan_err_reportable::{ErrorId, ErrorSink};
|
||||
use kaptan_log::{DeliveryClass, LogSinkQueue, TransportAdmission};
|
||||
use kaptan_spi::SpiCompletion;
|
||||
use stm32f7::stm32f722;
|
||||
@@ -525,7 +525,7 @@ impl F722LidarState {
|
||||
let _ = publish_lidar_event(event);
|
||||
}
|
||||
|
||||
#[kaptan_err_propagate::propagate]
|
||||
#[kaptan_err_reportable::propagate]
|
||||
pub fn on_timer(&mut self) -> Result<(), StartupError> {
|
||||
if let Some(range) = self.range.as_mut() {
|
||||
if self.startup_ticks < LIDAR_STARTUP_TICKS {
|
||||
@@ -568,7 +568,7 @@ pub fn process_imu(imu: &mut F722Imu, events: u8) {
|
||||
}
|
||||
}
|
||||
|
||||
#[kaptan_err_propagate::propagate]
|
||||
#[kaptan_err_reportable::propagate]
|
||||
fn accept_imu_event(event: ImuEvent) -> Result<(), ErrorId> {
|
||||
match event {
|
||||
ImuEvent::Sample(sample) => {
|
||||
@@ -683,7 +683,7 @@ where
|
||||
|
||||
fn drain_one_mavlink_diagnostic(&mut self) {
|
||||
if self.mavlink_errors.is_empty()
|
||||
&& let Some(record) = kaptan_err_propagate::take()
|
||||
&& let Some(record) = kaptan_err_reportable::take()
|
||||
{
|
||||
let _ = self.mavlink_errors.publish_record(record);
|
||||
}
|
||||
@@ -789,7 +789,7 @@ pub fn record_mavlink_completion(completion: kaptan_dma::TxCompletion) {
|
||||
}
|
||||
}
|
||||
|
||||
#[kaptan_err_propagate::propagate]
|
||||
#[kaptan_err_reportable::propagate]
|
||||
fn publish_lidar_event(
|
||||
event: LidarLiteV3ServiceEvent<I2c1Error>,
|
||||
) -> Result<(), LidarError<I2c1Error>> {
|
||||
@@ -810,14 +810,14 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn transient_i2c_busy_is_retry_not_a_typed_lidar_fault() {
|
||||
while kaptan_err_propagate::take().is_some() {}
|
||||
while kaptan_err_reportable::take().is_some() {}
|
||||
assert_eq!(
|
||||
publish_lidar_event(LidarLiteV3ServiceEvent::Fault(LidarError::Start(
|
||||
I2c1Error::Busy,
|
||||
))),
|
||||
Ok(())
|
||||
);
|
||||
assert!(kaptan_err_propagate::take().is_none());
|
||||
assert!(kaptan_err_reportable::take().is_none());
|
||||
|
||||
assert!(matches!(
|
||||
publish_lidar_event(LidarLiteV3ServiceEvent::Fault(LidarError::Start(
|
||||
@@ -825,7 +825,7 @@ mod tests {
|
||||
))),
|
||||
Err(LidarError::Start(I2c1Error::InvalidLength))
|
||||
));
|
||||
assert!(kaptan_err_propagate::take().is_some());
|
||||
assert!(kaptan_err_reportable::take().is_some());
|
||||
|
||||
assert!(matches!(
|
||||
publish_lidar_event(LidarLiteV3ServiceEvent::Fault(LidarError::Start(
|
||||
@@ -833,6 +833,6 @@ mod tests {
|
||||
))),
|
||||
Err(LidarError::Start(I2c1Error::InvalidAddress))
|
||||
));
|
||||
assert!(kaptan_err_propagate::take().is_some());
|
||||
assert!(kaptan_err_reportable::take().is_some());
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
//! STM32F722 Pll216 clock-source assembly.
|
||||
|
||||
use super::peripherals::{DwtMicrosecondClock, select_pll216_profile};
|
||||
use kaptan_err_propagate::KaptanError;
|
||||
use kaptan_err_reportable::KaptanError;
|
||||
use stm32f7::stm32f722;
|
||||
|
||||
/// Core frequency in whole megahertz after selecting the PLL216 board profile.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
//! Deterministic STM32F722 PLL clock-source selection.
|
||||
|
||||
use kaptan_err_propagate::KaptanError;
|
||||
use kaptan_err_reportable::KaptanError;
|
||||
use stm32f7::stm32f722;
|
||||
|
||||
const CLOCK_SWITCH_POLL_LIMIT: u16 = 1_024;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
//! STM32F722 I²C1 interrupt-driven controller.
|
||||
|
||||
use kaptan_err_propagate::KaptanError;
|
||||
use kaptan_err_reportable::KaptanError;
|
||||
use kaptan_i2c::{I2cBus, I2cCompletion};
|
||||
use stm32f7::stm32f722;
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
//! is generated after the last serial frame; transmit completion can occur
|
||||
//! while the final serial clock is still in progress.
|
||||
|
||||
use kaptan_err_propagate::KaptanError;
|
||||
use kaptan_err_reportable::KaptanError;
|
||||
use kaptan_spi::SpiCompletion;
|
||||
use stm32f7::stm32f722;
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
//! is generated after the last serial frame; transmit completion can occur
|
||||
//! while the final serial clock is still in progress.
|
||||
|
||||
use kaptan_err_propagate::KaptanError;
|
||||
use kaptan_err_reportable::KaptanError;
|
||||
use kaptan_spi::SpiCompletion;
|
||||
use stm32f7::stm32f722;
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
//! DWT-backed monotonic microsecond clock for STM32F722.
|
||||
|
||||
use cortex_m::peripheral::{DCB, DWT};
|
||||
use kaptan_err_propagate::KaptanError;
|
||||
use kaptan_err_reportable::KaptanError;
|
||||
use kaptan_time::{MonotonicClock, Timestamp};
|
||||
|
||||
/// A DWT cycle counter extended into monotonic microseconds.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
//! STM32F722 USART routes used by supported boards.
|
||||
|
||||
use kaptan_err_propagate::KaptanError;
|
||||
use kaptan_err_reportable::KaptanError;
|
||||
use stm32f7::stm32f722;
|
||||
|
||||
/// UART baud-rate configuration error.
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
//! cannot be selected at construction.
|
||||
|
||||
use kaptan_dma::{DmaReadableBuffer, DmaTxEngine, TxCompletion};
|
||||
use kaptan_err_propagate::KaptanError;
|
||||
use kaptan_err_reportable::KaptanError;
|
||||
use stm32f7::stm32f722;
|
||||
|
||||
use super::Usart1Tx;
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
//! cannot be selected at construction.
|
||||
|
||||
use kaptan_dma::{DmaReadableBuffer, DmaTxEngine, TxCompletion};
|
||||
use kaptan_err_propagate::KaptanError;
|
||||
use kaptan_err_reportable::KaptanError;
|
||||
use stm32f7::stm32f722;
|
||||
|
||||
use super::Usart2Tx;
|
||||
|
||||
@@ -5,7 +5,7 @@ use kaptan_drivers::{
|
||||
icm42688::{Error as Icm42688Error, Icm42688, Icm42688Service, Icm42688ServiceEvent},
|
||||
mpu6000::{Error as Mpu6000Error, Mpu6000, Mpu6000Config, Mpu6000Service, Mpu6000ServiceEvent},
|
||||
};
|
||||
use kaptan_err_propagate::{ErrorId, ErrorReport};
|
||||
use kaptan_err_reportable::{ErrorId, ReportableError};
|
||||
use kaptan_sensor::imu::ImuSnapshot;
|
||||
use kaptan_spi::SpiCompletion;
|
||||
use stm32f7::stm32f722;
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#![no_std]
|
||||
|
||||
use kaptan_config::Config;
|
||||
use kaptan_err_propagate::KaptanError;
|
||||
use kaptan_err_reportable::KaptanError;
|
||||
|
||||
pub use kaptan_drivers::mpu6000::{
|
||||
AccelerometerRange, DigitalLowPassFilter, GyroscopeRange, Mpu6000Config,
|
||||
|
||||
Reference in new issue
Block a user