Updated to new schema

This commit is contained in:
Joey Hines 2026-04-02 20:32:13 -06:00
parent aa4aaba4c9
commit a65fdc64f8
Signed by: joeyahines
GPG Key ID: E99D8FB14855100E
3 changed files with 64 additions and 52 deletions

View File

@ -1,6 +1,6 @@
[package]
name = "rust-dsn-parser"
version = "0.2.0"
version = "0.3.0"
edition = "2024"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

View File

@ -1,50 +1,62 @@
<dsn>
<station name="gdscc" friendlyName="Goldstone" timeUTC="1664054963000" timeZoneOffset="-25200000"/>
<dish name="DSS26" azimuthAngle="180.0" elevationAngle="89.80" windSpeed="1.852" isMSPA="false" isArray="false" isDDOR="false">
<downSignal signalType="none" dataRate="4250000" frequency="8475000000" power="-120.3788" spacecraft="KPLO" spacecraftID="-155"/>
<upSignal signalType="none" dataRate="1000" frequency="7188" power="0.0000" spacecraft="KPLO" spacecraftID="-155"/>
<downSignal signalType="none" dataRate="8192" frequency="2261000000" power="-161.6540" spacecraft="KPLO" spacecraftID="-155"/>
<target name="KPLO" id="155" uplegRange="-1.000e+00" downlegRange="-1.000e+00" rtlt="-1.0000"/>
</dish>
<dish name="DSS14" azimuthAngle="272.7" elevationAngle="25.50" windSpeed="15.43" isMSPA="false" isArray="false" isDDOR="false">
<downSignal signalType="carrier" dataRate="0.0000" frequency="8426000000" power="-147.3783" spacecraft="HYB2" spacecraftID="-37"/>
<target name="HYB2" id="37" uplegRange="1.950e+08" downlegRange="1.949e+08" rtlt="1301"/>
</dish>
<station name="mdscc" friendlyName="Madrid" timeUTC="1664054963000" timeZoneOffset="7200000"/>
<dish name="DSS65" azimuthAngle="" elevationAngle="" windSpeed="" isMSPA="false" isArray="false" isDDOR="false">
<downSignal signalType="data" dataRate="1250000" frequency="2282000000" power="-112.1945" spacecraft="MMS3" spacecraftID="-110"/>
<upSignal signalType="data" dataRate="2000" frequency="2101" power="0.2691" spacecraft="MMS3" spacecraftID="-110"/>
<target name="MMS3" id="110" uplegRange="1.817e+05" downlegRange="1.818e+05" rtlt="1.212"/>
</dish>
<dish name="DSS54" azimuthAngle="144.5" elevationAngle="51.96" windSpeed="18.52" isMSPA="false" isArray="false" isDDOR="false">
<downSignal signalType="data" dataRate="40000" frequency="2270000000" power="-120.4680" spacecraft="JWST" spacecraftID="-170"/>
<upSignal signalType="data" dataRate="16000" frequency="2090" power="5.086" spacecraft="JWST" spacecraftID="-170"/>
<downSignal signalType="data" dataRate="28000000" frequency="25900000000" power="-91.6436" spacecraft="JWST" spacecraftID="-170"/>
<target name="JWST" id="170" uplegRange="1.267e+06" downlegRange="1.267e+06" rtlt="8.455"/>
</dish>
<dish name="DSS63" azimuthAngle="125.7" elevationAngle="34.23" windSpeed="18.52" isMSPA="false" isArray="false" isDDOR="false">
<downSignal signalType="data" dataRate="200000" frequency="8404000000" power="-124.8344" spacecraft="JNO" spacecraftID="-61"/>
<upSignal signalType="data" dataRate="2000" frequency="7153" power="17.38" spacecraft="JNO" spacecraftID="-61"/>
<target name="JNO" id="61" uplegRange="5.922e+08" downlegRange="5.922e+08" rtlt="3951"/>
</dish>
<station name="cdscc" friendlyName="Canberra" timeUTC="1664054963000" timeZoneOffset="36000000"/>
<dish name="DSS34" azimuthAngle="" elevationAngle="" windSpeed="" isMSPA="false" isArray="false" isDDOR="false">
<downSignal signalType="none" dataRate="0.0000" frequency="2278000000" power="-478.9152" spacecraft="ACE" spacecraftID="-92"/>
<upSignal signalType="none" dataRate="1000" frequency="2098" power="0.0000" spacecraft="ACE" spacecraftID="-92"/>
<target name="ACE" id="92" uplegRange="1.566e+06" downlegRange="1.566e+06" rtlt="10.45"/>
</dish>
<dish name="DSS35" azimuthAngle="253.5" elevationAngle="37.87" windSpeed="0.0000" isMSPA="false" isArray="false" isDDOR="false">
<downSignal signalType="data" dataRate="312500" frequency="8422000000" power="-107.0920" spacecraft="DART" spacecraftID="-135"/>
<upSignal signalType="data" dataRate="2000" frequency="7168" power="18.22" spacecraft="DART" spacecraftID="-135"/>
<target name="DART" id="135" uplegRange="1.170e+07" downlegRange="1.170e+07" rtlt="78.08"/>
</dish>
<dish name="DSS43" azimuthAngle="27.84" elevationAngle="33.41" windSpeed="0.0000" isMSPA="false" isArray="false" isDDOR="false">
<downSignal signalType="carrier" dataRate="0.0000" frequency="8426000000" power="-146.7820" spacecraft="HYB2" spacecraftID="-37"/>
<target name="HYB2" id="37" uplegRange="1.950e+08" downlegRange="1.949e+08" rtlt="1301"/>
</dish>
<dish name="DSS36" azimuthAngle="155.8" elevationAngle="13.23" windSpeed="0.0000" isMSPA="false" isArray="false" isDDOR="false">
<downSignal signalType="none" dataRate="0.0000" frequency="26140000000" power="-166.2977" spacecraft="TEST" spacecraftID="-99"/>
<target name="TEST" id="99" uplegRange="-1.000e+00" downlegRange="-1.000e+00" rtlt="-1.0000"/>
</dish>
<timestamp>1664054963000</timestamp>
</dsn>
<station name="gdscc" friendlyName="Goldstone" timeUTC="1775183083000" timeZoneOffset="-25200000.0"/>
<dish name="DSS26" azimuthAngle="194" elevationAngle="77" windSpeed="24" isMSPA="false" isArray="false" isDDOR="false" activity="Spacecraft Telemetry, Tracking, and Command">
<upSignal active="true" signalType="data" dataRate="0" frequency="0" band="X" power="18" spacecraft="JNO" spacecraftID="-61"/>
<downSignal active="true" signalType="data" dataRate="35080" frequency="0" band="X" power="-130" spacecraft="JNO" spacecraftID="-61"/>
<target name="JNO" id="61" uplegRange="763000000" downlegRange="763000000" rtlt="5090"/>
</dish>
<dish name="DSS14" azimuthAngle="0" elevationAngle="90" windSpeed="" isMSPA="false" isArray="false" isDDOR="false" activity="Engineering Upgrades">
<target name="DSN" id="99" uplegRange="-1" downlegRange="-1" rtlt="-1"/>
</dish>
<dish name="DSS25" azimuthAngle="114" elevationAngle="55" windSpeed="24" isMSPA="false" isArray="false" isDDOR="false" activity="Spacecraft Telemetry, Tracking, and Command">
<upSignal active="true" signalType="data" dataRate="0" frequency="0" band="X" power="0.2" spacecraft="ESCB" spacecraftID="-9"/>
<downSignal active="true" signalType="data" dataRate="8000" frequency="0" band="X" power="-130" spacecraft="ESCB" spacecraftID="-9"/>
<target name="ESCB" id="9" uplegRange="2380000" downlegRange="2380000" rtlt="15.8"/>
</dish>
<dish name="DSS24" azimuthAngle="34" elevationAngle="12" windSpeed="24" isMSPA="false" isArray="false" isDDOR="false" activity="Spacecraft Telemetry, Tracking, and Command">
<upSignal active="true" signalType="data" dataRate="0" frequency="0" band="S" power="2" spacecraft="CHDR" spacecraftID="-151"/>
<downSignal active="true" signalType="data" dataRate="1188000" frequency="0" band="S" power="-110" spacecraft="CHDR" spacecraftID="-151"/>
<target name="CHDR" id="151" uplegRange="91900" downlegRange="91900" rtlt="0.61"/>
</dish>
<station name="mdscc" friendlyName="Madrid" timeUTC="1775183083000" timeZoneOffset="7200000.0"/>
<dish name="DSS56" azimuthAngle="192" elevationAngle="25" windSpeed="3" isMSPA="false" isArray="false" isDDOR="false" activity="Spacecraft Telemetry, Tracking, and Command">
<upSignal active="false" signalType="none" dataRate="0" frequency="0" band="S" power="0" spacecraft="EM2" spacecraftID="-24"/>
<downSignal active="false" signalType="none" dataRate="0" frequency="0" band="S" power="-480" spacecraft="EM2" spacecraftID="-24"/>
<downSignal active="true" signalType="data" dataRate="6000000" frequency="0" band="S" power="-97" spacecraft="EM2" spacecraftID="-24"/>
<downSignal active="true" signalType="data" dataRate="6000000" frequency="0" band="S" power="-97" spacecraft="EM2" spacecraftID="-24"/>
<target name="EM2" id="24" uplegRange="47000" downlegRange="47000" rtlt="0.31"/>
</dish>
<dish name="DSS54" azimuthAngle="192" elevationAngle="24" windSpeed="3" isMSPA="false" isArray="false" isDDOR="false" activity="Spacecraft Telemetry, Tracking, and Command">
<upSignal active="true" signalType="data" dataRate="0" frequency="0" band="S" power="0.2" spacecraft="EM2" spacecraftID="-24"/>
<downSignal active="true" signalType="data" dataRate="6000000" frequency="0" band="S" power="-98" spacecraft="EM2" spacecraftID="-24"/>
<downSignal active="false" signalType="none" dataRate="0" frequency="0" band="S" power="-480" spacecraft="EM2" spacecraftID="-24"/>
<downSignal active="true" signalType="data" dataRate="6000000" frequency="0" band="S" power="-98" spacecraft="EM2" spacecraftID="-24"/>
<target name="EM2" id="24" uplegRange="47000" downlegRange="47000" rtlt="0.31"/>
</dish>
<dish name="DSS53" azimuthAngle="0" elevationAngle="90" windSpeed="" isMSPA="false" isArray="false" isDDOR="false" activity="Engineering Upgrades">
<target name="DSN" id="99" uplegRange="-1" downlegRange="-1" rtlt="-1"/>
</dish>
<dish name="DSS65" azimuthAngle="205" elevationAngle="32" windSpeed="3" isMSPA="false" isArray="false" isDDOR="false" activity="Spacecraft Telemetry, Tracking, and Command">
<upSignal active="true" signalType="data" dataRate="0" frequency="0" band="S" power="0.2" spacecraft="KPLO" spacecraftID="-155"/>
<downSignal active="false" signalType="none" dataRate="0" frequency="0" band="X" power="-130" spacecraft="KPLO" spacecraftID="-155"/>
<downSignal active="true" signalType="data" dataRate="8192" frequency="0" band="S" power="-110" spacecraft="KPLO" spacecraftID="-155"/>
<target name="KPLO" id="155" uplegRange="394000" downlegRange="394000" rtlt="2.63"/>
</dish>
<dish name="DSS63" azimuthAngle="121" elevationAngle="48" windSpeed="3" isMSPA="false" isArray="false" isDDOR="false" activity="Spacecraft Telemetry, Tracking, and Command">
<downSignal active="true" signalType="data" dataRate="160" frequency="0" band="X" power="-160" spacecraft="VGR1" spacecraftID="-31"/>
<target name="VGR1" id="31" uplegRange="25400000000" downlegRange="25400000000" rtlt="169000"/>
</dish>
<station name="cdscc" friendlyName="Canberra" timeUTC="1775183083000" timeZoneOffset="39600000.0"/>
<dish name="DSS35" azimuthAngle="0" elevationAngle="90" windSpeed="" isMSPA="false" isArray="false" isDDOR="false" activity="Engineering Upgrades">
<target name="DSN" id="99" uplegRange="-1" downlegRange="-1" rtlt="-1"/>
</dish>
<dish name="DSS36" azimuthAngle="0" elevationAngle="90" windSpeed="" isMSPA="false" isArray="false" isDDOR="false" activity="Antenna Unplanned Maintenance">
<target name="DSS" id="99" uplegRange="-1" downlegRange="-1" rtlt="-1"/>
</dish>
<dish name="DSS34" azimuthAngle="324" elevationAngle="52" windSpeed="7" isMSPA="false" isArray="false" isDDOR="false" activity="Spacecraft Telemetry, Tracking, and Command">
<upSignal active="true" signalType="data" dataRate="0" frequency="0" band="X" power="18" spacecraft="EMM" spacecraftID="-62"/>
<downSignal active="true" signalType="data" dataRate="241900" frequency="0" band="X" power="-120" spacecraft="EMM" spacecraftID="-62"/>
<target name="EMM" id="62" uplegRange="343000000" downlegRange="343000000" rtlt="2290"/>
</dish>
<timestamp>1775183083000</timestamp>
</dsn>

View File

@ -99,7 +99,7 @@ pub struct Station {
pub name: String,
pub friendly_name: String,
pub time_utc: u64,
pub tz_offset: i64,
pub tz_offset: f64,
pub dishes: Vec<Dish>,
}
@ -117,7 +117,7 @@ impl TryFrom<Vec<OwnedAttribute>> for Station {
let name = get_attr(&attrs, "name")?;
let friendly_name = get_attr(&attrs, "friendlyName")?;
let time_utc = get_attr(&attrs, "timeUTC")?.parse::<u64>()?;
let tz_offset = get_attr(&attrs, "timeZoneOffset")?.parse::<i64>()?;
let tz_offset = get_attr(&attrs, "timeZoneOffset")?.parse::<f64>()?;
Ok(Self {
name,