From 4ffca9e3f8bd5b9bab3c1c60a683bd06a29baac9 Mon Sep 17 00:00:00 2001 From: Mark Fine Date: Tue, 24 Mar 2020 14:50:08 -0400 Subject: [PATCH 1/2] Wrap fromIntegral in parens. --- generator/sbpg/targets/haskell.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/generator/sbpg/targets/haskell.py b/generator/sbpg/targets/haskell.py index cf4fa42c2c..f851f650b4 100755 --- a/generator/sbpg/targets/haskell.py +++ b/generator/sbpg/targets/haskell.py @@ -42,10 +42,10 @@ 'u16': 'getWord16le', 'u32': 'getWord32le', 'u64': 'getWord64le', - 's8': 'fromIntegral <$> getWord8', - 's16': 'fromIntegral <$> getWord16le', - 's32': 'fromIntegral <$> getWord32le', - 's64': 'fromIntegral <$> getWord64le', + 's8': '(fromIntegral <$> getWord8)', + 's16': '(fromIntegral <$> getWord16le)', + 's32': '(fromIntegral <$> getWord32le)', + 's64': '(fromIntegral <$> getWord64le)', 'float': 'getFloat32le', 'double': 'getFloat64le', } From 7ddc06e65739234500ee1a0e034c352fb5624ee8 Mon Sep 17 00:00:00 2001 From: Mark Fine Date: Tue, 24 Mar 2020 14:51:32 -0400 Subject: [PATCH 2/2] Regenerated. --- haskell/src/SwiftNav/SBP/Acquisition.hs | 12 ++-- haskell/src/SwiftNav/SBP/ExtEvents.hs | 2 +- haskell/src/SwiftNav/SBP/Gnss.hs | 4 +- haskell/src/SwiftNav/SBP/Imu.hs | 14 ++-- haskell/src/SwiftNav/SBP/Mag.hs | 6 +- haskell/src/SwiftNav/SBP/Navigation.hs | 94 ++++++++++++------------- haskell/src/SwiftNav/SBP/Observation.hs | 32 ++++----- haskell/src/SwiftNav/SBP/Orientation.hs | 20 +++--- haskell/src/SwiftNav/SBP/Piksi.hs | 34 ++++----- haskell/src/SwiftNav/SBP/Ssr.hs | 56 +++++++-------- haskell/src/SwiftNav/SBP/Tracking.hs | 24 +++---- haskell/src/SwiftNav/SBP/Vehicle.hs | 4 +- 12 files changed, 151 insertions(+), 151 deletions(-) diff --git a/haskell/src/SwiftNav/SBP/Acquisition.hs b/haskell/src/SwiftNav/SBP/Acquisition.hs index d78cfee239..8c6b43cb0d 100644 --- a/haskell/src/SwiftNav/SBP/Acquisition.hs +++ b/haskell/src/SwiftNav/SBP/Acquisition.hs @@ -224,9 +224,9 @@ instance Binary AcqSvProfile where _acqSvProfile_bin_width <- getWord16le _acqSvProfile_timestamp <- getWord32le _acqSvProfile_time_spent <- getWord32le - _acqSvProfile_cf_min <- fromIntegral <$> getWord32le - _acqSvProfile_cf_max <- fromIntegral <$> getWord32le - _acqSvProfile_cf <- fromIntegral <$> getWord32le + _acqSvProfile_cf_min <- (fromIntegral <$> getWord32le) + _acqSvProfile_cf_max <- (fromIntegral <$> getWord32le) + _acqSvProfile_cf <- (fromIntegral <$> getWord32le) _acqSvProfile_cp <- getWord32le pure AcqSvProfile {..} @@ -287,9 +287,9 @@ instance Binary AcqSvProfileDep where _acqSvProfileDep_bin_width <- getWord16le _acqSvProfileDep_timestamp <- getWord32le _acqSvProfileDep_time_spent <- getWord32le - _acqSvProfileDep_cf_min <- fromIntegral <$> getWord32le - _acqSvProfileDep_cf_max <- fromIntegral <$> getWord32le - _acqSvProfileDep_cf <- fromIntegral <$> getWord32le + _acqSvProfileDep_cf_min <- (fromIntegral <$> getWord32le) + _acqSvProfileDep_cf_max <- (fromIntegral <$> getWord32le) + _acqSvProfileDep_cf <- (fromIntegral <$> getWord32le) _acqSvProfileDep_cp <- getWord32le pure AcqSvProfileDep {..} diff --git a/haskell/src/SwiftNav/SBP/ExtEvents.hs b/haskell/src/SwiftNav/SBP/ExtEvents.hs index 1e9b2178a2..4786d4bbc3 100644 --- a/haskell/src/SwiftNav/SBP/ExtEvents.hs +++ b/haskell/src/SwiftNav/SBP/ExtEvents.hs @@ -61,7 +61,7 @@ instance Binary MsgExtEvent where get = do _msgExtEvent_wn <- getWord16le _msgExtEvent_tow <- getWord32le - _msgExtEvent_ns_residual <- fromIntegral <$> getWord32le + _msgExtEvent_ns_residual <- (fromIntegral <$> getWord32le) _msgExtEvent_flags <- getWord8 _msgExtEvent_pin <- getWord8 pure MsgExtEvent {..} diff --git a/haskell/src/SwiftNav/SBP/Gnss.hs b/haskell/src/SwiftNav/SBP/Gnss.hs index 99f43bce50..d2c93a0387 100644 --- a/haskell/src/SwiftNav/SBP/Gnss.hs +++ b/haskell/src/SwiftNav/SBP/Gnss.hs @@ -178,7 +178,7 @@ data GpsTime = GpsTime instance Binary GpsTime where get = do _gpsTime_tow <- getWord32le - _gpsTime_ns_residual <- fromIntegral <$> getWord32le + _gpsTime_ns_residual <- (fromIntegral <$> getWord32le) _gpsTime_wn <- getWord16le pure GpsTime {..} @@ -204,7 +204,7 @@ data CarrierPhase = CarrierPhase instance Binary CarrierPhase where get = do - _carrierPhase_i <- fromIntegral <$> getWord32le + _carrierPhase_i <- (fromIntegral <$> getWord32le) _carrierPhase_f <- getWord8 pure CarrierPhase {..} diff --git a/haskell/src/SwiftNav/SBP/Imu.hs b/haskell/src/SwiftNav/SBP/Imu.hs index eb8e35487d..1e44e2b9a8 100644 --- a/haskell/src/SwiftNav/SBP/Imu.hs +++ b/haskell/src/SwiftNav/SBP/Imu.hs @@ -69,12 +69,12 @@ instance Binary MsgImuRaw where get = do _msgImuRaw_tow <- getWord32le _msgImuRaw_tow_f <- getWord8 - _msgImuRaw_acc_x <- fromIntegral <$> getWord16le - _msgImuRaw_acc_y <- fromIntegral <$> getWord16le - _msgImuRaw_acc_z <- fromIntegral <$> getWord16le - _msgImuRaw_gyr_x <- fromIntegral <$> getWord16le - _msgImuRaw_gyr_y <- fromIntegral <$> getWord16le - _msgImuRaw_gyr_z <- fromIntegral <$> getWord16le + _msgImuRaw_acc_x <- (fromIntegral <$> getWord16le) + _msgImuRaw_acc_y <- (fromIntegral <$> getWord16le) + _msgImuRaw_acc_z <- (fromIntegral <$> getWord16le) + _msgImuRaw_gyr_x <- (fromIntegral <$> getWord16le) + _msgImuRaw_gyr_y <- (fromIntegral <$> getWord16le) + _msgImuRaw_gyr_z <- (fromIntegral <$> getWord16le) pure MsgImuRaw {..} put MsgImuRaw {..} = do @@ -111,7 +111,7 @@ data MsgImuAux = MsgImuAux instance Binary MsgImuAux where get = do _msgImuAux_imu_type <- getWord8 - _msgImuAux_temp <- fromIntegral <$> getWord16le + _msgImuAux_temp <- (fromIntegral <$> getWord16le) _msgImuAux_imu_conf <- getWord8 pure MsgImuAux {..} diff --git a/haskell/src/SwiftNav/SBP/Mag.hs b/haskell/src/SwiftNav/SBP/Mag.hs index 1b7e3eaa3f..88ba9dfd82 100644 --- a/haskell/src/SwiftNav/SBP/Mag.hs +++ b/haskell/src/SwiftNav/SBP/Mag.hs @@ -59,9 +59,9 @@ instance Binary MsgMagRaw where get = do _msgMagRaw_tow <- getWord32le _msgMagRaw_tow_f <- getWord8 - _msgMagRaw_mag_x <- fromIntegral <$> getWord16le - _msgMagRaw_mag_y <- fromIntegral <$> getWord16le - _msgMagRaw_mag_z <- fromIntegral <$> getWord16le + _msgMagRaw_mag_x <- (fromIntegral <$> getWord16le) + _msgMagRaw_mag_y <- (fromIntegral <$> getWord16le) + _msgMagRaw_mag_z <- (fromIntegral <$> getWord16le) pure MsgMagRaw {..} put MsgMagRaw {..} = do diff --git a/haskell/src/SwiftNav/SBP/Navigation.hs b/haskell/src/SwiftNav/SBP/Navigation.hs index 54b3f613af..4873ed4807 100644 --- a/haskell/src/SwiftNav/SBP/Navigation.hs +++ b/haskell/src/SwiftNav/SBP/Navigation.hs @@ -79,7 +79,7 @@ instance Binary MsgGpsTime where get = do _msgGpsTime_wn <- getWord16le _msgGpsTime_tow <- getWord32le - _msgGpsTime_ns_residual <- fromIntegral <$> getWord32le + _msgGpsTime_ns_residual <- (fromIntegral <$> getWord32le) _msgGpsTime_flags <- getWord8 pure MsgGpsTime {..} @@ -487,9 +487,9 @@ data MsgBaselineEcef = MsgBaselineEcef instance Binary MsgBaselineEcef where get = do _msgBaselineEcef_tow <- getWord32le - _msgBaselineEcef_x <- fromIntegral <$> getWord32le - _msgBaselineEcef_y <- fromIntegral <$> getWord32le - _msgBaselineEcef_z <- fromIntegral <$> getWord32le + _msgBaselineEcef_x <- (fromIntegral <$> getWord32le) + _msgBaselineEcef_y <- (fromIntegral <$> getWord32le) + _msgBaselineEcef_z <- (fromIntegral <$> getWord32le) _msgBaselineEcef_accuracy <- getWord16le _msgBaselineEcef_n_sats <- getWord8 _msgBaselineEcef_flags <- getWord8 @@ -541,9 +541,9 @@ data MsgBaselineNed = MsgBaselineNed instance Binary MsgBaselineNed where get = do _msgBaselineNed_tow <- getWord32le - _msgBaselineNed_n <- fromIntegral <$> getWord32le - _msgBaselineNed_e <- fromIntegral <$> getWord32le - _msgBaselineNed_d <- fromIntegral <$> getWord32le + _msgBaselineNed_n <- (fromIntegral <$> getWord32le) + _msgBaselineNed_e <- (fromIntegral <$> getWord32le) + _msgBaselineNed_d <- (fromIntegral <$> getWord32le) _msgBaselineNed_h_accuracy <- getWord16le _msgBaselineNed_v_accuracy <- getWord16le _msgBaselineNed_n_sats <- getWord8 @@ -592,9 +592,9 @@ data MsgVelEcef = MsgVelEcef instance Binary MsgVelEcef where get = do _msgVelEcef_tow <- getWord32le - _msgVelEcef_x <- fromIntegral <$> getWord32le - _msgVelEcef_y <- fromIntegral <$> getWord32le - _msgVelEcef_z <- fromIntegral <$> getWord32le + _msgVelEcef_x <- (fromIntegral <$> getWord32le) + _msgVelEcef_y <- (fromIntegral <$> getWord32le) + _msgVelEcef_z <- (fromIntegral <$> getWord32le) _msgVelEcef_accuracy <- getWord16le _msgVelEcef_n_sats <- getWord8 _msgVelEcef_flags <- getWord8 @@ -651,9 +651,9 @@ data MsgVelEcefCov = MsgVelEcefCov instance Binary MsgVelEcefCov where get = do _msgVelEcefCov_tow <- getWord32le - _msgVelEcefCov_x <- fromIntegral <$> getWord32le - _msgVelEcefCov_y <- fromIntegral <$> getWord32le - _msgVelEcefCov_z <- fromIntegral <$> getWord32le + _msgVelEcefCov_x <- (fromIntegral <$> getWord32le) + _msgVelEcefCov_y <- (fromIntegral <$> getWord32le) + _msgVelEcefCov_z <- (fromIntegral <$> getWord32le) _msgVelEcefCov_cov_x_x <- getFloat32le _msgVelEcefCov_cov_x_y <- getFloat32le _msgVelEcefCov_cov_x_z <- getFloat32le @@ -713,9 +713,9 @@ data MsgVelNed = MsgVelNed instance Binary MsgVelNed where get = do _msgVelNed_tow <- getWord32le - _msgVelNed_n <- fromIntegral <$> getWord32le - _msgVelNed_e <- fromIntegral <$> getWord32le - _msgVelNed_d <- fromIntegral <$> getWord32le + _msgVelNed_n <- (fromIntegral <$> getWord32le) + _msgVelNed_e <- (fromIntegral <$> getWord32le) + _msgVelNed_d <- (fromIntegral <$> getWord32le) _msgVelNed_h_accuracy <- getWord16le _msgVelNed_v_accuracy <- getWord16le _msgVelNed_n_sats <- getWord8 @@ -777,9 +777,9 @@ data MsgVelNedCov = MsgVelNedCov instance Binary MsgVelNedCov where get = do _msgVelNedCov_tow <- getWord32le - _msgVelNedCov_n <- fromIntegral <$> getWord32le - _msgVelNedCov_e <- fromIntegral <$> getWord32le - _msgVelNedCov_d <- fromIntegral <$> getWord32le + _msgVelNedCov_n <- (fromIntegral <$> getWord32le) + _msgVelNedCov_e <- (fromIntegral <$> getWord32le) + _msgVelNedCov_d <- (fromIntegral <$> getWord32le) _msgVelNedCov_cov_n_n <- getFloat32le _msgVelNedCov_cov_n_e <- getFloat32le _msgVelNedCov_cov_n_d <- getFloat32le @@ -1094,9 +1094,9 @@ data MsgVelEcefGnss = MsgVelEcefGnss instance Binary MsgVelEcefGnss where get = do _msgVelEcefGnss_tow <- getWord32le - _msgVelEcefGnss_x <- fromIntegral <$> getWord32le - _msgVelEcefGnss_y <- fromIntegral <$> getWord32le - _msgVelEcefGnss_z <- fromIntegral <$> getWord32le + _msgVelEcefGnss_x <- (fromIntegral <$> getWord32le) + _msgVelEcefGnss_y <- (fromIntegral <$> getWord32le) + _msgVelEcefGnss_z <- (fromIntegral <$> getWord32le) _msgVelEcefGnss_accuracy <- getWord16le _msgVelEcefGnss_n_sats <- getWord8 _msgVelEcefGnss_flags <- getWord8 @@ -1153,9 +1153,9 @@ data MsgVelEcefCovGnss = MsgVelEcefCovGnss instance Binary MsgVelEcefCovGnss where get = do _msgVelEcefCovGnss_tow <- getWord32le - _msgVelEcefCovGnss_x <- fromIntegral <$> getWord32le - _msgVelEcefCovGnss_y <- fromIntegral <$> getWord32le - _msgVelEcefCovGnss_z <- fromIntegral <$> getWord32le + _msgVelEcefCovGnss_x <- (fromIntegral <$> getWord32le) + _msgVelEcefCovGnss_y <- (fromIntegral <$> getWord32le) + _msgVelEcefCovGnss_z <- (fromIntegral <$> getWord32le) _msgVelEcefCovGnss_cov_x_x <- getFloat32le _msgVelEcefCovGnss_cov_x_y <- getFloat32le _msgVelEcefCovGnss_cov_x_z <- getFloat32le @@ -1215,9 +1215,9 @@ data MsgVelNedGnss = MsgVelNedGnss instance Binary MsgVelNedGnss where get = do _msgVelNedGnss_tow <- getWord32le - _msgVelNedGnss_n <- fromIntegral <$> getWord32le - _msgVelNedGnss_e <- fromIntegral <$> getWord32le - _msgVelNedGnss_d <- fromIntegral <$> getWord32le + _msgVelNedGnss_n <- (fromIntegral <$> getWord32le) + _msgVelNedGnss_e <- (fromIntegral <$> getWord32le) + _msgVelNedGnss_d <- (fromIntegral <$> getWord32le) _msgVelNedGnss_h_accuracy <- getWord16le _msgVelNedGnss_v_accuracy <- getWord16le _msgVelNedGnss_n_sats <- getWord8 @@ -1279,9 +1279,9 @@ data MsgVelNedCovGnss = MsgVelNedCovGnss instance Binary MsgVelNedCovGnss where get = do _msgVelNedCovGnss_tow <- getWord32le - _msgVelNedCovGnss_n <- fromIntegral <$> getWord32le - _msgVelNedCovGnss_e <- fromIntegral <$> getWord32le - _msgVelNedCovGnss_d <- fromIntegral <$> getWord32le + _msgVelNedCovGnss_n <- (fromIntegral <$> getWord32le) + _msgVelNedCovGnss_e <- (fromIntegral <$> getWord32le) + _msgVelNedCovGnss_d <- (fromIntegral <$> getWord32le) _msgVelNedCovGnss_cov_n_n <- getFloat32le _msgVelNedCovGnss_cov_n_e <- getFloat32le _msgVelNedCovGnss_cov_n_d <- getFloat32le @@ -1354,9 +1354,9 @@ data MsgVelBody = MsgVelBody instance Binary MsgVelBody where get = do _msgVelBody_tow <- getWord32le - _msgVelBody_x <- fromIntegral <$> getWord32le - _msgVelBody_y <- fromIntegral <$> getWord32le - _msgVelBody_z <- fromIntegral <$> getWord32le + _msgVelBody_x <- (fromIntegral <$> getWord32le) + _msgVelBody_y <- (fromIntegral <$> getWord32le) + _msgVelBody_z <- (fromIntegral <$> getWord32le) _msgVelBody_cov_x_x <- getFloat32le _msgVelBody_cov_x_y <- getFloat32le _msgVelBody_cov_x_z <- getFloat32le @@ -1443,7 +1443,7 @@ instance Binary MsgGpsTimeDepA where get = do _msgGpsTimeDepA_wn <- getWord16le _msgGpsTimeDepA_tow <- getWord32le - _msgGpsTimeDepA_ns_residual <- fromIntegral <$> getWord32le + _msgGpsTimeDepA_ns_residual <- (fromIntegral <$> getWord32le) _msgGpsTimeDepA_flags <- getWord8 pure MsgGpsTimeDepA {..} @@ -1640,9 +1640,9 @@ data MsgBaselineEcefDepA = MsgBaselineEcefDepA instance Binary MsgBaselineEcefDepA where get = do _msgBaselineEcefDepA_tow <- getWord32le - _msgBaselineEcefDepA_x <- fromIntegral <$> getWord32le - _msgBaselineEcefDepA_y <- fromIntegral <$> getWord32le - _msgBaselineEcefDepA_z <- fromIntegral <$> getWord32le + _msgBaselineEcefDepA_x <- (fromIntegral <$> getWord32le) + _msgBaselineEcefDepA_y <- (fromIntegral <$> getWord32le) + _msgBaselineEcefDepA_z <- (fromIntegral <$> getWord32le) _msgBaselineEcefDepA_accuracy <- getWord16le _msgBaselineEcefDepA_n_sats <- getWord8 _msgBaselineEcefDepA_flags <- getWord8 @@ -1694,9 +1694,9 @@ data MsgBaselineNedDepA = MsgBaselineNedDepA instance Binary MsgBaselineNedDepA where get = do _msgBaselineNedDepA_tow <- getWord32le - _msgBaselineNedDepA_n <- fromIntegral <$> getWord32le - _msgBaselineNedDepA_e <- fromIntegral <$> getWord32le - _msgBaselineNedDepA_d <- fromIntegral <$> getWord32le + _msgBaselineNedDepA_n <- (fromIntegral <$> getWord32le) + _msgBaselineNedDepA_e <- (fromIntegral <$> getWord32le) + _msgBaselineNedDepA_d <- (fromIntegral <$> getWord32le) _msgBaselineNedDepA_h_accuracy <- getWord16le _msgBaselineNedDepA_v_accuracy <- getWord16le _msgBaselineNedDepA_n_sats <- getWord8 @@ -1745,9 +1745,9 @@ data MsgVelEcefDepA = MsgVelEcefDepA instance Binary MsgVelEcefDepA where get = do _msgVelEcefDepA_tow <- getWord32le - _msgVelEcefDepA_x <- fromIntegral <$> getWord32le - _msgVelEcefDepA_y <- fromIntegral <$> getWord32le - _msgVelEcefDepA_z <- fromIntegral <$> getWord32le + _msgVelEcefDepA_x <- (fromIntegral <$> getWord32le) + _msgVelEcefDepA_y <- (fromIntegral <$> getWord32le) + _msgVelEcefDepA_z <- (fromIntegral <$> getWord32le) _msgVelEcefDepA_accuracy <- getWord16le _msgVelEcefDepA_n_sats <- getWord8 _msgVelEcefDepA_flags <- getWord8 @@ -1797,9 +1797,9 @@ data MsgVelNedDepA = MsgVelNedDepA instance Binary MsgVelNedDepA where get = do _msgVelNedDepA_tow <- getWord32le - _msgVelNedDepA_n <- fromIntegral <$> getWord32le - _msgVelNedDepA_e <- fromIntegral <$> getWord32le - _msgVelNedDepA_d <- fromIntegral <$> getWord32le + _msgVelNedDepA_n <- (fromIntegral <$> getWord32le) + _msgVelNedDepA_e <- (fromIntegral <$> getWord32le) + _msgVelNedDepA_d <- (fromIntegral <$> getWord32le) _msgVelNedDepA_h_accuracy <- getWord16le _msgVelNedDepA_v_accuracy <- getWord16le _msgVelNedDepA_n_sats <- getWord8 diff --git a/haskell/src/SwiftNav/SBP/Observation.hs b/haskell/src/SwiftNav/SBP/Observation.hs index ab2f3e9f12..3a6203ac60 100644 --- a/haskell/src/SwiftNav/SBP/Observation.hs +++ b/haskell/src/SwiftNav/SBP/Observation.hs @@ -74,7 +74,7 @@ data Doppler = Doppler instance Binary Doppler where get = do - _doppler_i <- fromIntegral <$> getWord16le + _doppler_i <- (fromIntegral <$> getWord16le) _doppler_f <- getWord8 pure Doppler {..} @@ -2204,7 +2204,7 @@ data CarrierPhaseDepA = CarrierPhaseDepA instance Binary CarrierPhaseDepA where get = do - _carrierPhaseDepA_i <- fromIntegral <$> getWord32le + _carrierPhaseDepA_i <- (fromIntegral <$> getWord32le) _carrierPhaseDepA_f <- getWord8 pure CarrierPhaseDepA {..} @@ -2616,9 +2616,9 @@ instance Binary MsgGroupDelayDepA where _msgGroupDelayDepA_t_op <- get _msgGroupDelayDepA_prn <- getWord8 _msgGroupDelayDepA_valid <- getWord8 - _msgGroupDelayDepA_tgd <- fromIntegral <$> getWord16le - _msgGroupDelayDepA_isc_l1ca <- fromIntegral <$> getWord16le - _msgGroupDelayDepA_isc_l2c <- fromIntegral <$> getWord16le + _msgGroupDelayDepA_tgd <- (fromIntegral <$> getWord16le) + _msgGroupDelayDepA_isc_l1ca <- (fromIntegral <$> getWord16le) + _msgGroupDelayDepA_isc_l2c <- (fromIntegral <$> getWord16le) pure MsgGroupDelayDepA {..} put MsgGroupDelayDepA {..} = do @@ -2657,9 +2657,9 @@ instance Binary MsgGroupDelayDepB where _msgGroupDelayDepB_t_op <- get _msgGroupDelayDepB_sid <- get _msgGroupDelayDepB_valid <- getWord8 - _msgGroupDelayDepB_tgd <- fromIntegral <$> getWord16le - _msgGroupDelayDepB_isc_l1ca <- fromIntegral <$> getWord16le - _msgGroupDelayDepB_isc_l2c <- fromIntegral <$> getWord16le + _msgGroupDelayDepB_tgd <- (fromIntegral <$> getWord16le) + _msgGroupDelayDepB_isc_l1ca <- (fromIntegral <$> getWord16le) + _msgGroupDelayDepB_isc_l2c <- (fromIntegral <$> getWord16le) pure MsgGroupDelayDepB {..} put MsgGroupDelayDepB {..} = do @@ -2698,9 +2698,9 @@ instance Binary MsgGroupDelay where _msgGroupDelay_t_op <- get _msgGroupDelay_sid <- get _msgGroupDelay_valid <- getWord8 - _msgGroupDelay_tgd <- fromIntegral <$> getWord16le - _msgGroupDelay_isc_l1ca <- fromIntegral <$> getWord16le - _msgGroupDelay_isc_l2c <- fromIntegral <$> getWord16le + _msgGroupDelay_tgd <- (fromIntegral <$> getWord16le) + _msgGroupDelay_isc_l1ca <- (fromIntegral <$> getWord16le) + _msgGroupDelay_isc_l2c <- (fromIntegral <$> getWord16le) pure MsgGroupDelay {..} put MsgGroupDelay {..} = do @@ -3063,10 +3063,10 @@ data MsgGloBiases = MsgGloBiases instance Binary MsgGloBiases where get = do _msgGloBiases_mask <- getWord8 - _msgGloBiases_l1ca_bias <- fromIntegral <$> getWord16le - _msgGloBiases_l1p_bias <- fromIntegral <$> getWord16le - _msgGloBiases_l2ca_bias <- fromIntegral <$> getWord16le - _msgGloBiases_l2p_bias <- fromIntegral <$> getWord16le + _msgGloBiases_l1ca_bias <- (fromIntegral <$> getWord16le) + _msgGloBiases_l1p_bias <- (fromIntegral <$> getWord16le) + _msgGloBiases_l2ca_bias <- (fromIntegral <$> getWord16le) + _msgGloBiases_l2p_bias <- (fromIntegral <$> getWord16le) pure MsgGloBiases {..} put MsgGloBiases {..} = do @@ -3096,7 +3096,7 @@ instance Binary SvAzEl where get = do _svAzEl_sid <- get _svAzEl_az <- getWord8 - _svAzEl_el <- fromIntegral <$> getWord8 + _svAzEl_el <- (fromIntegral <$> getWord8) pure SvAzEl {..} put SvAzEl {..} = do diff --git a/haskell/src/SwiftNav/SBP/Orientation.hs b/haskell/src/SwiftNav/SBP/Orientation.hs index 971203acbb..a2f2457b72 100644 --- a/haskell/src/SwiftNav/SBP/Orientation.hs +++ b/haskell/src/SwiftNav/SBP/Orientation.hs @@ -108,10 +108,10 @@ data MsgOrientQuat = MsgOrientQuat instance Binary MsgOrientQuat where get = do _msgOrientQuat_tow <- getWord32le - _msgOrientQuat_w <- fromIntegral <$> getWord32le - _msgOrientQuat_x <- fromIntegral <$> getWord32le - _msgOrientQuat_y <- fromIntegral <$> getWord32le - _msgOrientQuat_z <- fromIntegral <$> getWord32le + _msgOrientQuat_w <- (fromIntegral <$> getWord32le) + _msgOrientQuat_x <- (fromIntegral <$> getWord32le) + _msgOrientQuat_y <- (fromIntegral <$> getWord32le) + _msgOrientQuat_z <- (fromIntegral <$> getWord32le) _msgOrientQuat_w_accuracy <- getFloat32le _msgOrientQuat_x_accuracy <- getFloat32le _msgOrientQuat_y_accuracy <- getFloat32le @@ -168,9 +168,9 @@ data MsgOrientEuler = MsgOrientEuler instance Binary MsgOrientEuler where get = do _msgOrientEuler_tow <- getWord32le - _msgOrientEuler_roll <- fromIntegral <$> getWord32le - _msgOrientEuler_pitch <- fromIntegral <$> getWord32le - _msgOrientEuler_yaw <- fromIntegral <$> getWord32le + _msgOrientEuler_roll <- (fromIntegral <$> getWord32le) + _msgOrientEuler_pitch <- (fromIntegral <$> getWord32le) + _msgOrientEuler_yaw <- (fromIntegral <$> getWord32le) _msgOrientEuler_roll_accuracy <- getFloat32le _msgOrientEuler_pitch_accuracy <- getFloat32le _msgOrientEuler_yaw_accuracy <- getFloat32le @@ -221,9 +221,9 @@ data MsgAngularRate = MsgAngularRate instance Binary MsgAngularRate where get = do _msgAngularRate_tow <- getWord32le - _msgAngularRate_x <- fromIntegral <$> getWord32le - _msgAngularRate_y <- fromIntegral <$> getWord32le - _msgAngularRate_z <- fromIntegral <$> getWord32le + _msgAngularRate_x <- (fromIntegral <$> getWord32le) + _msgAngularRate_y <- (fromIntegral <$> getWord32le) + _msgAngularRate_z <- (fromIntegral <$> getWord32le) _msgAngularRate_flags <- getWord8 pure MsgAngularRate {..} diff --git a/haskell/src/SwiftNav/SBP/Piksi.hs b/haskell/src/SwiftNav/SBP/Piksi.hs index 7db6e02460..a204bc3107 100644 --- a/haskell/src/SwiftNav/SBP/Piksi.hs +++ b/haskell/src/SwiftNav/SBP/Piksi.hs @@ -299,10 +299,10 @@ data Period = Period instance Binary Period where get = do - _period_avg <- fromIntegral <$> getWord32le - _period_pmin <- fromIntegral <$> getWord32le - _period_pmax <- fromIntegral <$> getWord32le - _period_current <- fromIntegral <$> getWord32le + _period_avg <- (fromIntegral <$> getWord32le) + _period_pmin <- (fromIntegral <$> getWord32le) + _period_pmax <- (fromIntegral <$> getWord32le) + _period_current <- (fromIntegral <$> getWord32le) pure Period {..} put Period {..} = do @@ -333,10 +333,10 @@ data Latency = Latency instance Binary Latency where get = do - _latency_avg <- fromIntegral <$> getWord32le - _latency_lmin <- fromIntegral <$> getWord32le - _latency_lmax <- fromIntegral <$> getWord32le - _latency_current <- fromIntegral <$> getWord32le + _latency_avg <- (fromIntegral <$> getWord32le) + _latency_lmin <- (fromIntegral <$> getWord32le) + _latency_lmax <- (fromIntegral <$> getWord32le) + _latency_current <- (fromIntegral <$> getWord32le) pure Latency {..} put Latency {..} = do @@ -532,11 +532,11 @@ data MsgDeviceMonitor = MsgDeviceMonitor instance Binary MsgDeviceMonitor where get = do - _msgDeviceMonitor_dev_vin <- fromIntegral <$> getWord16le - _msgDeviceMonitor_cpu_vint <- fromIntegral <$> getWord16le - _msgDeviceMonitor_cpu_vaux <- fromIntegral <$> getWord16le - _msgDeviceMonitor_cpu_temperature <- fromIntegral <$> getWord16le - _msgDeviceMonitor_fe_temperature <- fromIntegral <$> getWord16le + _msgDeviceMonitor_dev_vin <- (fromIntegral <$> getWord16le) + _msgDeviceMonitor_cpu_vint <- (fromIntegral <$> getWord16le) + _msgDeviceMonitor_cpu_vaux <- (fromIntegral <$> getWord16le) + _msgDeviceMonitor_cpu_temperature <- (fromIntegral <$> getWord16le) + _msgDeviceMonitor_fe_temperature <- (fromIntegral <$> getWord16le) pure MsgDeviceMonitor {..} put MsgDeviceMonitor {..} = do @@ -595,7 +595,7 @@ data MsgCommandResp = MsgCommandResp instance Binary MsgCommandResp where get = do _msgCommandResp_sequence <- getWord32le - _msgCommandResp_code <- fromIntegral <$> getWord32le + _msgCommandResp_code <- (fromIntegral <$> getWord32le) pure MsgCommandResp {..} put MsgCommandResp {..} = do @@ -788,7 +788,7 @@ data MsgCellModemStatus = MsgCellModemStatus instance Binary MsgCellModemStatus where get = do - _msgCellModemStatus_signal_strength <- fromIntegral <$> getWord8 + _msgCellModemStatus_signal_strength <- (fromIntegral <$> getWord8) _msgCellModemStatus_signal_error_rate <- getFloat32le _msgCellModemStatus_reserved <- whileM (not <$> isEmpty) getWord8 pure MsgCellModemStatus {..} @@ -917,8 +917,8 @@ data MsgFrontEndGain = MsgFrontEndGain instance Binary MsgFrontEndGain where get = do - _msgFrontEndGain_rf_gain <- replicateM 8 fromIntegral <$> getWord8 - _msgFrontEndGain_if_gain <- replicateM 8 fromIntegral <$> getWord8 + _msgFrontEndGain_rf_gain <- replicateM 8 (fromIntegral <$> getWord8) + _msgFrontEndGain_if_gain <- replicateM 8 (fromIntegral <$> getWord8) pure MsgFrontEndGain {..} put MsgFrontEndGain {..} = do diff --git a/haskell/src/SwiftNav/SBP/Ssr.hs b/haskell/src/SwiftNav/SBP/Ssr.hs index 237bc6f838..83295ad210 100644 --- a/haskell/src/SwiftNav/SBP/Ssr.hs +++ b/haskell/src/SwiftNav/SBP/Ssr.hs @@ -50,7 +50,7 @@ data CodeBiasesContent = CodeBiasesContent instance Binary CodeBiasesContent where get = do _codeBiasesContent_code <- getWord8 - _codeBiasesContent_value <- fromIntegral <$> getWord16le + _codeBiasesContent_value <- (fromIntegral <$> getWord16le) pure CodeBiasesContent {..} put CodeBiasesContent {..} = do @@ -84,7 +84,7 @@ instance Binary PhaseBiasesContent where _phaseBiasesContent_integer_indicator <- getWord8 _phaseBiasesContent_widelane_integer_indicator <- getWord8 _phaseBiasesContent_discontinuity_counter <- getWord8 - _phaseBiasesContent_bias <- fromIntegral <$> getWord32le + _phaseBiasesContent_bias <- (fromIntegral <$> getWord32le) pure PhaseBiasesContent {..} put PhaseBiasesContent {..} = do @@ -194,7 +194,7 @@ instance Binary STECSatElement where get = do _sTECSatElement_sv_id <- get _sTECSatElement_stec_quality_indicator <- getWord8 - _sTECSatElement_stec_coeff <- replicateM 4 fromIntegral <$> getWord16le + _sTECSatElement_stec_coeff <- replicateM 4 (fromIntegral <$> getWord16le) pure STECSatElement {..} put STECSatElement {..} = do @@ -217,8 +217,8 @@ data TroposphericDelayCorrectionNoStd = TroposphericDelayCorrectionNoStd instance Binary TroposphericDelayCorrectionNoStd where get = do - _troposphericDelayCorrectionNoStd_hydro <- fromIntegral <$> getWord16le - _troposphericDelayCorrectionNoStd_wet <- fromIntegral <$> getWord8 + _troposphericDelayCorrectionNoStd_hydro <- (fromIntegral <$> getWord16le) + _troposphericDelayCorrectionNoStd_wet <- (fromIntegral <$> getWord8) pure TroposphericDelayCorrectionNoStd {..} put TroposphericDelayCorrectionNoStd {..} = do @@ -242,8 +242,8 @@ data TroposphericDelayCorrection = TroposphericDelayCorrection instance Binary TroposphericDelayCorrection where get = do - _troposphericDelayCorrection_hydro <- fromIntegral <$> getWord16le - _troposphericDelayCorrection_wet <- fromIntegral <$> getWord8 + _troposphericDelayCorrection_hydro <- (fromIntegral <$> getWord16le) + _troposphericDelayCorrection_wet <- (fromIntegral <$> getWord8) _troposphericDelayCorrection_stddev <- getWord8 pure TroposphericDelayCorrection {..} @@ -268,7 +268,7 @@ data STECResidualNoStd = STECResidualNoStd instance Binary STECResidualNoStd where get = do _sTECResidualNoStd_sv_id <- get - _sTECResidualNoStd_residual <- fromIntegral <$> getWord16le + _sTECResidualNoStd_residual <- (fromIntegral <$> getWord16le) pure STECResidualNoStd {..} put STECResidualNoStd {..} = do @@ -294,7 +294,7 @@ data STECResidual = STECResidual instance Binary STECResidual where get = do _sTECResidual_sv_id <- get - _sTECResidual_residual <- fromIntegral <$> getWord16le + _sTECResidual_residual <- (fromIntegral <$> getWord16le) _sTECResidual_stddev <- getWord8 pure STECResidual {..} @@ -452,15 +452,15 @@ instance Binary MsgSsrOrbitClock where _msgSsrOrbitClock_update_interval <- getWord8 _msgSsrOrbitClock_iod_ssr <- getWord8 _msgSsrOrbitClock_iod <- getWord32le - _msgSsrOrbitClock_radial <- fromIntegral <$> getWord32le - _msgSsrOrbitClock_along <- fromIntegral <$> getWord32le - _msgSsrOrbitClock_cross <- fromIntegral <$> getWord32le - _msgSsrOrbitClock_dot_radial <- fromIntegral <$> getWord32le - _msgSsrOrbitClock_dot_along <- fromIntegral <$> getWord32le - _msgSsrOrbitClock_dot_cross <- fromIntegral <$> getWord32le - _msgSsrOrbitClock_c0 <- fromIntegral <$> getWord32le - _msgSsrOrbitClock_c1 <- fromIntegral <$> getWord32le - _msgSsrOrbitClock_c2 <- fromIntegral <$> getWord32le + _msgSsrOrbitClock_radial <- (fromIntegral <$> getWord32le) + _msgSsrOrbitClock_along <- (fromIntegral <$> getWord32le) + _msgSsrOrbitClock_cross <- (fromIntegral <$> getWord32le) + _msgSsrOrbitClock_dot_radial <- (fromIntegral <$> getWord32le) + _msgSsrOrbitClock_dot_along <- (fromIntegral <$> getWord32le) + _msgSsrOrbitClock_dot_cross <- (fromIntegral <$> getWord32le) + _msgSsrOrbitClock_c0 <- (fromIntegral <$> getWord32le) + _msgSsrOrbitClock_c1 <- (fromIntegral <$> getWord32le) + _msgSsrOrbitClock_c2 <- (fromIntegral <$> getWord32le) pure MsgSsrOrbitClock {..} put MsgSsrOrbitClock {..} = do @@ -531,15 +531,15 @@ instance Binary MsgSsrOrbitClockDepA where _msgSsrOrbitClockDepA_update_interval <- getWord8 _msgSsrOrbitClockDepA_iod_ssr <- getWord8 _msgSsrOrbitClockDepA_iod <- getWord8 - _msgSsrOrbitClockDepA_radial <- fromIntegral <$> getWord32le - _msgSsrOrbitClockDepA_along <- fromIntegral <$> getWord32le - _msgSsrOrbitClockDepA_cross <- fromIntegral <$> getWord32le - _msgSsrOrbitClockDepA_dot_radial <- fromIntegral <$> getWord32le - _msgSsrOrbitClockDepA_dot_along <- fromIntegral <$> getWord32le - _msgSsrOrbitClockDepA_dot_cross <- fromIntegral <$> getWord32le - _msgSsrOrbitClockDepA_c0 <- fromIntegral <$> getWord32le - _msgSsrOrbitClockDepA_c1 <- fromIntegral <$> getWord32le - _msgSsrOrbitClockDepA_c2 <- fromIntegral <$> getWord32le + _msgSsrOrbitClockDepA_radial <- (fromIntegral <$> getWord32le) + _msgSsrOrbitClockDepA_along <- (fromIntegral <$> getWord32le) + _msgSsrOrbitClockDepA_cross <- (fromIntegral <$> getWord32le) + _msgSsrOrbitClockDepA_dot_radial <- (fromIntegral <$> getWord32le) + _msgSsrOrbitClockDepA_dot_along <- (fromIntegral <$> getWord32le) + _msgSsrOrbitClockDepA_dot_cross <- (fromIntegral <$> getWord32le) + _msgSsrOrbitClockDepA_c0 <- (fromIntegral <$> getWord32le) + _msgSsrOrbitClockDepA_c1 <- (fromIntegral <$> getWord32le) + _msgSsrOrbitClockDepA_c2 <- (fromIntegral <$> getWord32le) pure MsgSsrOrbitClockDepA {..} put MsgSsrOrbitClockDepA {..} = do @@ -647,7 +647,7 @@ instance Binary MsgSsrPhaseBiases where _msgSsrPhaseBiases_dispersive_bias <- getWord8 _msgSsrPhaseBiases_mw_consistency <- getWord8 _msgSsrPhaseBiases_yaw <- getWord16le - _msgSsrPhaseBiases_yaw_rate <- fromIntegral <$> getWord8 + _msgSsrPhaseBiases_yaw_rate <- (fromIntegral <$> getWord8) _msgSsrPhaseBiases_biases <- whileM (not <$> isEmpty) get pure MsgSsrPhaseBiases {..} diff --git a/haskell/src/SwiftNav/SBP/Tracking.hs b/haskell/src/SwiftNav/SBP/Tracking.hs index 9d43f40795..703bc54a6a 100644 --- a/haskell/src/SwiftNav/SBP/Tracking.hs +++ b/haskell/src/SwiftNav/SBP/Tracking.hs @@ -104,13 +104,13 @@ instance Binary MsgTrackingStateDetailedDepA where _msgTrackingStateDetailedDepA_cn0 <- getWord8 _msgTrackingStateDetailedDepA_lock <- getWord16le _msgTrackingStateDetailedDepA_sid <- get - _msgTrackingStateDetailedDepA_doppler <- fromIntegral <$> getWord32le + _msgTrackingStateDetailedDepA_doppler <- (fromIntegral <$> getWord32le) _msgTrackingStateDetailedDepA_doppler_std <- getWord16le _msgTrackingStateDetailedDepA_uptime <- getWord32le - _msgTrackingStateDetailedDepA_clock_offset <- fromIntegral <$> getWord16le - _msgTrackingStateDetailedDepA_clock_drift <- fromIntegral <$> getWord16le + _msgTrackingStateDetailedDepA_clock_offset <- (fromIntegral <$> getWord16le) + _msgTrackingStateDetailedDepA_clock_drift <- (fromIntegral <$> getWord16le) _msgTrackingStateDetailedDepA_corr_spacing <- getWord16le - _msgTrackingStateDetailedDepA_acceleration <- fromIntegral <$> getWord8 + _msgTrackingStateDetailedDepA_acceleration <- (fromIntegral <$> getWord8) _msgTrackingStateDetailedDepA_sync_flags <- getWord8 _msgTrackingStateDetailedDepA_tow_flags <- getWord8 _msgTrackingStateDetailedDepA_track_flags <- getWord8 @@ -213,13 +213,13 @@ instance Binary MsgTrackingStateDetailedDep where _msgTrackingStateDetailedDep_cn0 <- getWord8 _msgTrackingStateDetailedDep_lock <- getWord16le _msgTrackingStateDetailedDep_sid <- get - _msgTrackingStateDetailedDep_doppler <- fromIntegral <$> getWord32le + _msgTrackingStateDetailedDep_doppler <- (fromIntegral <$> getWord32le) _msgTrackingStateDetailedDep_doppler_std <- getWord16le _msgTrackingStateDetailedDep_uptime <- getWord32le - _msgTrackingStateDetailedDep_clock_offset <- fromIntegral <$> getWord16le - _msgTrackingStateDetailedDep_clock_drift <- fromIntegral <$> getWord16le + _msgTrackingStateDetailedDep_clock_offset <- (fromIntegral <$> getWord16le) + _msgTrackingStateDetailedDep_clock_drift <- (fromIntegral <$> getWord16le) _msgTrackingStateDetailedDep_corr_spacing <- getWord16le - _msgTrackingStateDetailedDep_acceleration <- fromIntegral <$> getWord8 + _msgTrackingStateDetailedDep_acceleration <- (fromIntegral <$> getWord8) _msgTrackingStateDetailedDep_sync_flags <- getWord8 _msgTrackingStateDetailedDep_tow_flags <- getWord8 _msgTrackingStateDetailedDep_track_flags <- getWord8 @@ -371,8 +371,8 @@ data TrackingChannelCorrelation = TrackingChannelCorrelation instance Binary TrackingChannelCorrelation where get = do - _trackingChannelCorrelation_I <- fromIntegral <$> getWord16le - _trackingChannelCorrelation_Q <- fromIntegral <$> getWord16le + _trackingChannelCorrelation_I <- (fromIntegral <$> getWord16le) + _trackingChannelCorrelation_Q <- (fromIntegral <$> getWord16le) pure TrackingChannelCorrelation {..} put TrackingChannelCorrelation {..} = do @@ -426,8 +426,8 @@ data TrackingChannelCorrelationDep = TrackingChannelCorrelationDep instance Binary TrackingChannelCorrelationDep where get = do - _trackingChannelCorrelationDep_I <- fromIntegral <$> getWord32le - _trackingChannelCorrelationDep_Q <- fromIntegral <$> getWord32le + _trackingChannelCorrelationDep_I <- (fromIntegral <$> getWord32le) + _trackingChannelCorrelationDep_Q <- (fromIntegral <$> getWord32le) pure TrackingChannelCorrelationDep {..} put TrackingChannelCorrelationDep {..} = do diff --git a/haskell/src/SwiftNav/SBP/Vehicle.hs b/haskell/src/SwiftNav/SBP/Vehicle.hs index fab9f06b63..6d2c3cd9d8 100644 --- a/haskell/src/SwiftNav/SBP/Vehicle.hs +++ b/haskell/src/SwiftNav/SBP/Vehicle.hs @@ -59,7 +59,7 @@ data MsgOdometry = MsgOdometry instance Binary MsgOdometry where get = do _msgOdometry_tow <- getWord32le - _msgOdometry_velocity <- fromIntegral <$> getWord32le + _msgOdometry_velocity <- (fromIntegral <$> getWord32le) _msgOdometry_flags <- getWord8 pure MsgOdometry {..} @@ -106,7 +106,7 @@ instance Binary MsgWheeltick where _msgWheeltick_time <- getWord64le _msgWheeltick_flags <- getWord8 _msgWheeltick_source <- getWord8 - _msgWheeltick_ticks <- fromIntegral <$> getWord32le + _msgWheeltick_ticks <- (fromIntegral <$> getWord32le) pure MsgWheeltick {..} put MsgWheeltick {..} = do