Skip to content

Commit

Permalink
Implement missing device types
Browse files Browse the repository at this point in the history
I've decided not to make the reserved ones validation errors here since
it seems like they're way more likely to come up with new ones that
should be vaguely supported
  • Loading branch information
Lexicality committed Apr 21, 2024
1 parent db152cf commit 01a9a42
Showing 1 changed file with 52 additions and 13 deletions.
65 changes: 52 additions & 13 deletions src/parse/transport_layer/header.rs
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ pub enum DeviceType {
Valve, // Gas or water
ReservedSwitchingDevice,
CustomerUnit, // Display device
ReservedCustomerUnit,
Garbage,
ReservedCO2,
ReservedEnvironmental,
Expand All @@ -192,21 +193,59 @@ pub enum DeviceType {
}

impl DeviceType {
fn parse(input: &mut &Bytes) -> MBResult<DeviceType> {
fn parse(input: &mut &Bytes) -> MBResult<Self> {
binary::u8
.map(|v| match v {
0x00 => DeviceType::Other,
0x01 => DeviceType::OilMeter,
0x02 => DeviceType::ElectricityMeter,
0x03 => DeviceType::GasMeter,
0x04 => DeviceType::ThermalEnergyMeter(ThermalMeterType::OutletHeat),
0x05 => DeviceType::SteamMeter,
0x06 => DeviceType::WaterMeter(WaterMeterType::Warm),
0x07 => DeviceType::WaterMeter(WaterMeterType::Potable),
0x08 => DeviceType::HeatCostAllocator,
// TODO
_ => todo!("Device type {v}"),
// _ => DeviceType::Reserved,
0x00 => Self::Other,
0x01 => Self::OilMeter,
0x02 => Self::ElectricityMeter,
0x03 => Self::GasMeter,
0x04 => Self::ThermalEnergyMeter(ThermalMeterType::OutletHeat),
0x05 => Self::SteamMeter,
0x06 => Self::WaterMeter(WaterMeterType::Warm),
0x07 => Self::WaterMeter(WaterMeterType::Potable),
0x08 => Self::HeatCostAllocator,
0x09 => Self::CompressedAir,
0x0A => Self::ThermalEnergyMeter(ThermalMeterType::OutletCooling),
0x0B => Self::ThermalEnergyMeter(ThermalMeterType::InletCooling),
0x0C => Self::ThermalEnergyMeter(ThermalMeterType::InletHeat),
0x0D => Self::ThermalEnergyMeter(ThermalMeterType::Combined),
0x0E => Self::BusOrSystemComponent,
0x0F => Self::Unknown,
0x10 => Self::WaterMeter(WaterMeterType::Irrigation),
0x11 => Self::WaterDataLogger,
0x12 => Self::GasDataLogger,
0x13 => Self::GasConverter,
0x14 => Self::CalorificValue,
0x15 => Self::WaterMeter(WaterMeterType::Hot),
0x16 => Self::WaterMeter(WaterMeterType::Cold),
0x17 => Self::WaterMeter(WaterMeterType::DualRegister),
0x18 => Self::PressureMeter,
0x19 => Self::ADConverter,
0x1A => Self::SmokeDetector,
0x1B => Self::RoomSensor,
0x1C => Self::GasDetector,
0x1D..=0x1F => Self::ReservedSensor,
0x20 => Self::ElectricalBreaker,
0x21 => Self::Valve,
0x22..=0x24 => Self::ReservedSwitchingDevice,
0x25 => Self::CustomerUnit,
0x26 | 0x27 => Self::ReservedCustomerUnit,
0x28 => Self::WaterMeter(WaterMeterType::Waste),
0x29 => Self::Garbage,
0x2A => Self::ReservedCO2,
0x2B..=0x2F => Self::ReservedEnvironmental,
0x30 => Self::ServiceTool,
0x31 => Self::CommunicationController,
0x32 => Self::UnidirectionalRepeater,
0x33 => Self::BidirectionalRepeater,
0x34 | 0x35 => Self::ReservedSystemDevice,
0x36 => Self::RadioConverterSystemSide,
0x37 => Self::RadioConverterMeterSide,
0x38 => Self::BusConverterMeterSide,
0x39..=0x3F => Self::ReservedSystemDevice,
0x40..=0xFE => Self::Reserved,
0xFF => Self::Wildcard,
})
.parse_next(input)
}
Expand Down

0 comments on commit 01a9a42

Please sign in to comment.