Skip to content

Commit d3d404b

Browse files
committed
For C compatibility, changed CableDelaysApplied:No to CableDelaysApplied:NoCableDelaysApplied
1 parent 51b1e3f commit d3d404b

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

src/metafits_context/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ impl std::str::FromStr for GeometricDelaysApplied {
156156
#[repr(C)]
157157
#[derive(Debug, PartialEq, Clone, Copy, FromPrimitive)]
158158
pub enum CableDelaysApplied {
159-
No = 0,
159+
NoCableDelaysApplied = 0,
160160
CableAndRecClock = 1,
161161
CableAndRecClockAndBeamformerDipoleDelays = 2,
162162
}
@@ -179,7 +179,7 @@ impl fmt::Display for CableDelaysApplied {
179179
f,
180180
"{}",
181181
match self {
182-
CableDelaysApplied::No => "No",
182+
CableDelaysApplied::NoCableDelaysApplied => "No",
183183
CableDelaysApplied::CableAndRecClock => "Cable and receiver clock cable length",
184184
CableDelaysApplied::CableAndRecClockAndBeamformerDipoleDelays =>
185185
"Cable, receiver clock cable and pointing-dependent beamformer dipole delays",
@@ -193,7 +193,7 @@ impl std::str::FromStr for CableDelaysApplied {
193193

194194
fn from_str(input: &str) -> Result<CableDelaysApplied, Self::Err> {
195195
match input {
196-
"No" => Ok(CableDelaysApplied::No),
196+
"No" => Ok(CableDelaysApplied::NoCableDelaysApplied),
197197
"Cable and receiver clock cable length" => Ok(CableDelaysApplied::CableAndRecClock),
198198
"Cable, receiver clock cable and pointing-dependent beamformer dipole delays" => {
199199
Ok(CableDelaysApplied::CableAndRecClockAndBeamformerDipoleDelays)
@@ -740,7 +740,7 @@ impl MetafitsContext {
740740
})
741741
}
742742
},
743-
None => CableDelaysApplied::No,
743+
None => CableDelaysApplied::NoCableDelaysApplied,
744744
};
745745

746746
// This next key is specified as TINT not TBOOL in the metafits, so we need to translate 0=false, 1=true

src/metafits_context/test.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,10 @@ fn test_metafits_context_new_corrlegacy_valid() {
224224
// Geometric delays - this old metafits has none of these keys so it will be No
225225
assert_eq!(context.geometric_delays_applied, GeometricDelaysApplied::No);
226226
// Cable delays applied - this old metafits has none of these keys so it will be No
227-
assert_eq!(context.cable_delays_applied, CableDelaysApplied::No);
227+
assert_eq!(
228+
context.cable_delays_applied,
229+
CableDelaysApplied::NoCableDelaysApplied
230+
);
228231

229232
// Calibration delays & gains applied - this old metafits has none of these keys so it will be false
230233
assert!(!context.calibration_delays_and_gains_applied);

0 commit comments

Comments
 (0)