Skip to content

Commit 1ffe289

Browse files
paul-fornageflosse
authored andcommitted
gate defmt to target_os = "none"
1 parent 062a72b commit 1ffe289

10 files changed

Lines changed: 33 additions & 28 deletions

File tree

Cargo.toml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,22 @@ rust-version = "1.85"
1313
[package.metadata.docs.rs]
1414
all-features = true
1515

16-
[dependencies]
17-
log = "0.4.26"
18-
byteorder = { version = "1.5.0", default-features = false }
19-
defmt = {version = "1.0.1", optional = true}
20-
2116
[features]
2217
default = ["tcp", "rtu"]
2318
tcp = []
2419
rtu = []
2520
std = ["byteorder/std"]
2621
defmt = ["dep:defmt"]
2722

23+
[dependencies]
24+
log = { version = "0.4.26" }
25+
byteorder = { version = "1.5.0", default-features = false }
26+
27+
[target.'cfg(target_os = "none")'.dependencies]
28+
defmt = { version = "1.0.1", optional = true }
29+
30+
31+
32+
2833
[badges]
2934
maintenance = { status = "actively-developed" }

src/codec/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pub mod rtu;
55
pub mod tcp;
66

77
/// The type of decoding
8-
#[cfg_attr(feature = "defmt", derive(defmt::Format))]
8+
#[cfg_attr(all(feature = "defmt", target_os = "none"), derive(defmt::Format))]
99
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
1010
pub enum DecoderType {
1111
Request,

src/codec/rtu/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ pub use crate::frame::rtu::*;
1212
const MAX_FRAME_LEN: usize = 256;
1313

1414
/// An extracted RTU PDU frame.
15-
#[cfg_attr(feature = "defmt", derive(defmt::Format))]
15+
#[cfg_attr(all(feature = "defmt", target_os = "none"), derive(defmt::Format))]
1616
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
1717
pub struct DecodedFrame<'a> {
1818
pub slave: SlaveId,
1919
pub pdu: &'a [u8],
2020
}
2121

2222
/// The location of all bytes that belong to the frame.
23-
#[cfg_attr(feature = "defmt", derive(defmt::Format))]
23+
#[cfg_attr(all(feature = "defmt", target_os = "none"), derive(defmt::Format))]
2424
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
2525
pub struct FrameLocation {
2626
/// The index where the frame starts

src/codec/tcp/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pub use crate::frame::tcp::*;
1212
const MAX_FRAME_LEN: usize = 256;
1313

1414
/// An extracted TCP PDU frame.
15-
#[cfg_attr(feature = "defmt", derive(defmt::Format))]
15+
#[cfg_attr(all(feature = "defmt", target_os = "none"), derive(defmt::Format))]
1616
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
1717
pub struct DecodedFrame<'a> {
1818
pub transaction_id: TransactionId,
@@ -21,7 +21,7 @@ pub struct DecodedFrame<'a> {
2121
}
2222

2323
/// The location of all bytes that belong to the frame.
24-
#[cfg_attr(feature = "defmt", derive(defmt::Format))]
24+
#[cfg_attr(all(feature = "defmt", target_os = "none"), derive(defmt::Format))]
2525
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
2626
pub struct FrameLocation {
2727
/// The index where the frame starts

src/error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ impl fmt::Display for Error {
4949
}
5050
}
5151

52-
#[cfg(feature = "defmt")]
52+
#[cfg(all(feature = "defmt", target_os = "none"))]
5353
impl defmt::Format for Error {
5454
fn format(&self, f: defmt::Formatter) {
5555
match self {

src/frame/coils.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use super::*;
22
use crate::error::*;
33

44
/// Packed coils
5-
#[cfg_attr(feature = "defmt", derive(defmt::Format))]
5+
#[cfg_attr(all(feature = "defmt", target_os = "none"), derive(defmt::Format))]
66
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
77
pub struct Coils<'c> {
88
pub(crate) data: RawData<'c>,
@@ -61,7 +61,7 @@ impl<'c> Coils<'c> {
6161

6262
/// Coils iterator.
6363
// TODO: crate an generic iterator
64-
#[cfg_attr(feature = "defmt", derive(defmt::Format))]
64+
#[cfg_attr(all(feature = "defmt", target_os = "none"), derive(defmt::Format))]
6565
#[derive(Debug, Clone, PartialEq, Eq)]
6666
pub struct CoilsIter<'c> {
6767
cnt: usize,

src/frame/data.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use super::*;
22
use crate::error::*;
33

44
/// Modbus data (u16 values)
5-
#[cfg_attr(feature = "defmt", derive(defmt::Format))]
5+
#[cfg_attr(all(feature = "defmt", target_os = "none"), derive(defmt::Format))]
66
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
77
pub struct Data<'d> {
88
pub(crate) data: RawData<'d>,
@@ -58,7 +58,7 @@ impl<'d> Data<'d> {
5858

5959
/// Data iterator
6060
// TODO: crate a generic iterator
61-
#[cfg_attr(feature = "defmt", derive(defmt::Format))]
61+
#[cfg_attr(all(feature = "defmt", target_os = "none"), derive(defmt::Format))]
6262
#[derive(Debug, Clone, PartialEq, Eq)]
6363
pub struct DataIter<'d> {
6464
cnt: usize,

src/frame/mod.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use byteorder::{BigEndian, ByteOrder};
1111
/// A Modbus function code.
1212
///
1313
/// It is represented by an unsigned 8 bit integer.
14-
#[cfg_attr(feature = "defmt", derive(defmt::Format))]
14+
#[cfg_attr(all(feature = "defmt", target_os = "none"), derive(defmt::Format))]
1515
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
1616
pub enum FunctionCode {
1717
/// Modbus Function Code: `01` (`0x01`).
@@ -158,7 +158,7 @@ pub(crate) type Quantity = u16;
158158
type RawData<'r> = &'r [u8];
159159

160160
/// A request represents a message from the client (master) to the server (slave).
161-
#[cfg_attr(feature = "defmt", derive(defmt::Format))]
161+
#[cfg_attr(all(feature = "defmt", target_os = "none"), derive(defmt::Format))]
162162
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
163163
pub enum Request<'r> {
164164
ReadCoils(Address, Quantity),
@@ -193,20 +193,20 @@ pub enum Request<'r> {
193193
}
194194

195195
/// A server (slave) exception response.
196-
#[cfg_attr(feature = "defmt", derive(defmt::Format))]
196+
#[cfg_attr(all(feature = "defmt", target_os = "none"), derive(defmt::Format))]
197197
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
198198
pub struct ExceptionResponse {
199199
pub function: FunctionCode,
200200
pub exception: Exception,
201201
}
202202

203203
/// Represents a message from the client (slave) to the server (master).
204-
#[cfg_attr(feature = "defmt", derive(defmt::Format))]
204+
#[cfg_attr(all(feature = "defmt", target_os = "none"), derive(defmt::Format))]
205205
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
206206
pub struct RequestPdu<'r>(pub Request<'r>);
207207

208208
/// Represents a message from the server (slave) to the client (master).
209-
#[cfg_attr(feature = "defmt", derive(defmt::Format))]
209+
#[cfg_attr(all(feature = "defmt", target_os = "none"), derive(defmt::Format))]
210210
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
211211
pub struct ResponsePdu<'r>(pub Result<Response<'r>, ExceptionResponse>);
212212

@@ -218,7 +218,7 @@ type EventCount = u16;
218218
type MessageCount = u16;
219219

220220
/// The response data of a successfull request.
221-
#[cfg_attr(feature = "defmt", derive(defmt::Format))]
221+
#[cfg_attr(all(feature = "defmt", target_os = "none"), derive(defmt::Format))]
222222
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
223223
pub enum Response<'r> {
224224
ReadCoils(Coils<'r>),
@@ -345,7 +345,7 @@ impl fmt::Display for Exception {
345345
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { write!(f, "{}", self.get_name()) }
346346
}
347347

348-
#[cfg(feature = "defmt")]
348+
#[cfg(all(feature = "defmt", target_os = "none"))]
349349
impl defmt::Format for Exception {
350350
fn format(&self, fmt: defmt::Formatter) { defmt::write!(fmt, "{}", self.get_name()) }
351351
}

src/frame/rtu.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@ use super::*;
44
pub type SlaveId = u8;
55

66
/// RTU header
7-
#[cfg_attr(feature = "defmt", derive(defmt::Format))]
7+
#[cfg_attr(all(feature = "defmt", target_os = "none"), derive(defmt::Format))]
88
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
99
pub struct Header {
1010
pub slave: SlaveId,
1111
}
1212

1313
/// RTU Request ADU
14-
#[cfg_attr(feature = "defmt", derive(defmt::Format))]
14+
#[cfg_attr(all(feature = "defmt", target_os = "none"), derive(defmt::Format))]
1515
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
1616
pub struct RequestAdu<'r> {
1717
pub hdr: Header,
1818
pub pdu: RequestPdu<'r>,
1919
}
2020

2121
/// RTU Response ADU
22-
#[cfg_attr(feature = "defmt", derive(defmt::Format))]
22+
#[cfg_attr(all(feature = "defmt", target_os = "none"), derive(defmt::Format))]
2323
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
2424
pub struct ResponseAdu<'r> {
2525
pub hdr: Header,

src/frame/tcp.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ use super::*;
33
pub type TransactionId = u16;
44
pub type UnitId = u8;
55

6-
#[cfg_attr(feature = "defmt", derive(defmt::Format))]
6+
#[cfg_attr(all(feature = "defmt", target_os = "none"), derive(defmt::Format))]
77
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
88
pub struct Header {
99
pub transaction_id: TransactionId,
1010
pub unit_id: UnitId,
1111
}
1212

13-
#[cfg_attr(feature = "defmt", derive(defmt::Format))]
13+
#[cfg_attr(all(feature = "defmt", target_os = "none"), derive(defmt::Format))]
1414
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
1515
pub struct RequestAdu<'r> {
1616
pub hdr: Header,
1717
pub pdu: RequestPdu<'r>,
1818
}
1919

20-
#[cfg_attr(feature = "defmt", derive(defmt::Format))]
20+
#[cfg_attr(all(feature = "defmt", target_os = "none"), derive(defmt::Format))]
2121
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
2222
pub struct ResponseAdu<'r> {
2323
pub hdr: Header,

0 commit comments

Comments
 (0)