diff --git a/love/src/components/AuxTel/Dome/Dome.container.jsx b/love/src/components/AuxTel/Dome/Dome.container.jsx index 84fa1a120..adac85005 100644 --- a/love/src/components/AuxTel/Dome/Dome.container.jsx +++ b/love/src/components/AuxTel/Dome/Dome.container.jsx @@ -103,7 +103,7 @@ const DomeContainer = ({ telescopeRAHour, telescopeRADeg, telescopeDecDeg, - telescopeRotatorRad, + telescopeRotatorDeg, raDecHourFormat, ...props }) => { @@ -158,7 +158,7 @@ const DomeContainer = ({ telescopeRAHour={telescopeRAHour} telescopeRADeg={telescopeRADeg} telescopeDecDeg={telescopeDecDeg} - telescopeRotatorRad={telescopeRotatorRad} + telescopeRotatorDeg={telescopeRotatorDeg} raDecHourFormat={raDecHourFormat} /> ); diff --git a/love/src/components/AuxTel/Dome/Dome.jsx b/love/src/components/AuxTel/Dome/Dome.jsx index 2866946c0..0cb7c25ca 100644 --- a/love/src/components/AuxTel/Dome/Dome.jsx +++ b/love/src/components/AuxTel/Dome/Dome.jsx @@ -109,8 +109,8 @@ export default class Dome extends Component { telescopeRADeg: PropTypes.number, /** Telescope current Dec in degrees */ telescopeDecDeg: PropTypes.number, - /** Telescope rotator position in rad */ - telescopeRotatorRad: PropTypes.number, + /** Telescope rotator position in degrees */ + telescopeRotatorDeg: PropTypes.number, /** Whether to display the RA and DEC in hour format */ raDecHourFormat: PropTypes.bool, }; @@ -306,7 +306,7 @@ export default class Dome extends Component { telescopeRAHour, telescopeRADeg, telescopeDecDeg, - telescopeRotatorRad, + telescopeRotatorDeg, raDecHourFormat, } = this.props; @@ -447,7 +447,7 @@ export default class Dome extends Component { telescopeRAHour={telescopeRAHour} telescopeRADeg={telescopeRADeg} telescopeDecDeg={telescopeDecDeg} - telescopeRotatorRad={telescopeRotatorRad} + telescopeRotatorDeg={telescopeRotatorDeg} raDecHourFormat={raDecHourFormat} /> diff --git a/love/src/components/AuxTel/Dome/DomeSummaryTable/DomeSummaryTable.jsx b/love/src/components/AuxTel/Dome/DomeSummaryTable/DomeSummaryTable.jsx index 4eb449508..ed28f55e3 100644 --- a/love/src/components/AuxTel/Dome/DomeSummaryTable/DomeSummaryTable.jsx +++ b/love/src/components/AuxTel/Dome/DomeSummaryTable/DomeSummaryTable.jsx @@ -71,7 +71,7 @@ export default class DomeSummaryTable extends Component { telescopeRAHour: PropTypes.number, telescopeRADeg: PropTypes.number, telescopeDecDeg: PropTypes.number, - telescopeRotatorRad: PropTypes.number, + telescopeRotatorDeg: PropTypes.number, raDecHourFormat: PropTypes.bool, }; @@ -113,7 +113,7 @@ export default class DomeSummaryTable extends Component { telescopeRAHour, telescopeRADeg, telescopeDecDeg, - telescopeRotatorRad, + telescopeRotatorDeg, raDecHourFormat, } = this.props; @@ -159,7 +159,7 @@ export default class DomeSummaryTable extends Component { const parsedTelescopeDecHour = degreesToDMS(telescopeDecDeg); const parsedTelescopeRADeg = defaultNumberFormatter(telescopeRADeg, 2) + '°'; const parsedTelescopeDecDeg = defaultNumberFormatter(telescopeDecDeg, 2) + '°'; - const parsedTelescopeRotatorDeg = defaultNumberFormatter(degrees(telescopeRotatorRad), 2) + '°'; + const parsedTelescopeRotatorDeg = defaultNumberFormatter(telescopeRotatorDeg, 2) + '°'; const telescopeRAText = raDecHourFormat ? parsedTelescopeRAHour : parsedTelescopeRADeg; const telescopeDecText = raDecHourFormat ? parsedTelescopeDecHour : parsedTelescopeDecDeg; diff --git a/love/src/components/MainTel/MTDome/MTDome.container.jsx b/love/src/components/MainTel/MTDome/MTDome.container.jsx index bd611a97f..a04c69b96 100644 --- a/love/src/components/MainTel/MTDome/MTDome.container.jsx +++ b/love/src/components/MainTel/MTDome/MTDome.container.jsx @@ -83,7 +83,7 @@ const MTDomeContainer = ({ telescopeRAHour, telescopeRADeg, telescopeDecDeg, - telescopeRotatorRad, + telescopeRotatorDeg, raDecHourFormat, ...props }) => { @@ -117,7 +117,7 @@ const MTDomeContainer = ({ telescopeRAHour={telescopeRAHour} telescopeRADeg={telescopeRADeg} telescopeDecDeg={telescopeDecDeg} - telescopeRotatorRad={telescopeRotatorRad} + telescopeRotatorDeg={telescopeRotatorDeg} raDecHourFormat={raDecHourFormat} /> ); diff --git a/love/src/components/MainTel/MTDome/MTDome.jsx b/love/src/components/MainTel/MTDome/MTDome.jsx index 62c423dcb..f9a6ca2db 100644 --- a/love/src/components/MainTel/MTDome/MTDome.jsx +++ b/love/src/components/MainTel/MTDome/MTDome.jsx @@ -223,8 +223,8 @@ export default class MTDome extends Component { telescopeRADeg: PropTypes.number, /** Telescope current Dec in degrees */ telescopeDecDeg: PropTypes.number, - /** Telescope rotator position in rad */ - telescopeRotatorRad: PropTypes.number, + /** Telescope rotator position in degrees */ + telescopeRotatorDeg: PropTypes.number, /** Whether to display the RA and DEC in hour format */ raDecHourFormat: PropTypes.bool, }; @@ -572,7 +572,7 @@ export default class MTDome extends Component { telescopeRAHour, telescopeRADeg, telescopeDecDeg, - telescopeRotatorRad, + telescopeRotatorDeg, raDecHourFormat, } = this.props; @@ -661,7 +661,7 @@ export default class MTDome extends Component { telescopeRAHour={telescopeRAHour} telescopeRADeg={telescopeRADeg} telescopeDecDeg={telescopeDecDeg} - telescopeRotatorRad={telescopeRotatorRad} + telescopeRotatorDeg={telescopeRotatorDeg} raDecHourFormat={raDecHourFormat} /> diff --git a/love/src/components/MainTel/MTDome/MTDomeSummaryTable/MTDomeSummaryTable.jsx b/love/src/components/MainTel/MTDome/MTDomeSummaryTable/MTDomeSummaryTable.jsx index 1606aa0b7..6fbeb8bb2 100644 --- a/love/src/components/MainTel/MTDome/MTDomeSummaryTable/MTDomeSummaryTable.jsx +++ b/love/src/components/MainTel/MTDome/MTDomeSummaryTable/MTDomeSummaryTable.jsx @@ -74,8 +74,8 @@ export default class MTDomeSummaryTable extends Component { telescopeRADeg: PropTypes.number, /** Telescope current Dec in degrees */ telescopeDecDeg: PropTypes.number, - /** Telescope rotator position in rad */ - telescopeRotatorRad: PropTypes.number, + /** Telescope rotator position in degrees */ + telescopeRotatorDeg: PropTypes.number, /** Whether to display the RA and DEC in hour format */ raDecHourFormat: PropTypes.bool, }; @@ -113,7 +113,7 @@ export default class MTDomeSummaryTable extends Component { telescopeRAHour, telescopeRADeg, telescopeDecDeg, - telescopeRotatorRad, + telescopeRotatorDeg, raDecHourFormat, } = this.props; @@ -135,7 +135,7 @@ export default class MTDomeSummaryTable extends Component { const parsedTelescopeDecHour = degreesToDMS(telescopeDecDeg); const parsedTelescopeRADeg = defaultNumberFormatter(telescopeRADeg, 2) + '°'; const parsedTelescopeDecDeg = defaultNumberFormatter(telescopeDecDeg, 2) + '°'; - const parsedTelescopeRotatorDeg = defaultNumberFormatter(degrees(telescopeRotatorRad), 2) + '°'; + const parsedTelescopeRotatorDeg = defaultNumberFormatter(telescopeRotatorDeg, 2) + '°'; const telescopeRAText = raDecHourFormat ? parsedTelescopeRAHour : parsedTelescopeRADeg; const telescopeDecText = raDecHourFormat ? parsedTelescopeDecHour : parsedTelescopeDecDeg; diff --git a/love/src/redux/selectors/selectors.js b/love/src/redux/selectors/selectors.js index dff1078b8..a005ffa5e 100644 --- a/love/src/redux/selectors/selectors.js +++ b/love/src/redux/selectors/selectors.js @@ -774,7 +774,7 @@ export const getAuxiliaryTelescopeState = (state) => { telescopeRAHour: data['telemetry-ATPtg-0-mountStatus']?.mountRA?.value ?? 0, telescopeRADeg: data['telemetry-ATPtg-0-mountPositions']?.ra?.value[0] ?? 0, telescopeDecDeg: data['telemetry-ATPtg-0-mountStatus']?.mountDec?.value ?? 0, - telescopeRotatorRad: data['telemetry-ATPtg-0-mountStatus']?.mountRot?.value ?? 0, + telescopeRotatorDeg: data['telemetry-ATPtg-0-mountStatus']?.mountRot?.value ?? 0, targetName: data['event-ATPtg-0-currentTarget']?.[0].targetName?.value ?? 'Unknown', }; }; @@ -1318,7 +1318,7 @@ export const getMainTelescopeState = (state) => { telescopeRAHour: data['telemetry-MTPtg-0-mountStatus']?.mountRA?.value ?? 0, telescopeRADeg: data['telemetry-MTPtg-0-mountPosition']?.ra?.value ?? 0, telescopeDecDeg: data['telemetry-MTPtg-0-mountStatus']?.mountDec?.value ?? 0, - telescopeRotatorRad: data['telemetry-MTPtg-0-mountStatus']?.mountRot?.value ?? 0, + telescopeRotatorDeg: data['telemetry-MTPtg-0-mountStatus']?.mountRot?.value ?? 0, targetName: data['event-MTPtg-0-currentTarget']?.[0].targetName?.value ?? 'Unknown', }; };