Skip to content

Update NodeJS + Haskell version #1470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Feb 10, 2025
Merged

Update NodeJS + Haskell version #1470

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6aa773d
Update NodeJS version
RReichert Feb 3, 2025
ac1e27b
update
RReichert Feb 3, 2025
c95d015
update
RReichert Feb 3, 2025
2a5985b
update
RReichert Feb 3, 2025
2290dfa
update
RReichert Feb 4, 2025
293d1b2
ypdate
RReichert Feb 4, 2025
ff39cd4
update
RReichert Feb 4, 2025
d890d08
update
RReichert Feb 4, 2025
cc56205
update
RReichert Feb 4, 2025
4f83c17
update
RReichert Feb 4, 2025
12c0be7
update
RReichert Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ARG UBUNTU_RELEASE

ARG DEBIAN_FRONTEND=noninteractive

ENV NODE_VERSION=v18.17.0
ENV NODE_VERSION=v22.13.1
Copy link
Contributor Author

@RReichert RReichert Feb 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using the latest NodeJS TLS

ENV JAVA_VERSION=11.0.11.hs-adpt
ENV GRADLE_VERSION=7.1.1
ENV CC=gcc-7
Expand Down Expand Up @@ -108,7 +108,7 @@ ENV NVM_DIR=/opt/nvm

RUN \
mkdir -p $NVM_DIR \
&& curl -sL https://raw.githubusercontent.com/creationix/nvm/v0.38.0/install.sh | bash \
&& curl -sL https://raw.githubusercontent.com/creationix/nvm/v0.40.1/install.sh | bash \
&& . $NVM_DIR/nvm.sh \
&& nvm install $NODE_VERSION

Expand Down Expand Up @@ -154,7 +154,7 @@ USER dockerdev

RUN \
if [ "$(ls /tmp)" ]; then ls /tmp; false; fi \
&& stack install --resolver lts-10.10 sbp \
&& stack install --resolver lts-23.7 sbp \
Copy link
Contributor

@sbmueller sbmueller Feb 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey, I think I tried it like this in the past, but it didn't work. I remember you did it like this previously. Can you double-check?

Copy link
Contributor Author

@RReichert RReichert Feb 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From what I understand, the Dockerfile explicitly states what version it wants to use to build the SBP version, where as in the Haskell test build it uses whatever is in that haskell/stack.yaml file. I don't know why there is a difference there.

Copy link
Contributor Author

@RReichert RReichert Feb 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've since reverted this change and tried to unify the Haskell version to lts-14.9

&& rm -rf /tmp/*

CMD ["make", "all"]
Expand Down
35 changes: 35 additions & 0 deletions sbpjson/elm/SbpJson.elm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -944,39 +944,45 @@ type alias GridElement =
}

{-| STEC residual (mean and standard deviation) for the given satellite at the grid point. -}

type alias STECResidual =
{ residual : Int
, stddev : Int
, svID : SvID
}

{-| A (Constellation ID, satellite ID) tuple that uniquely identifies a space vehicle. -}

type alias SvID =
{ constellation : Int
, satID : Int
}

{-| Troposphere vertical delays (mean and standard deviation) at the grid point. -}

type alias TroposphericDelayCorrection =
{ hydro : Int
, stddev : Int
, wet : Int
}

{-| Contains one tropo delay, plus STEC residuals for each satellite at the grid point. -}

type alias GridElementNoStd =
{ index : Int
, stecResiduals : Array STECResidualNoStd
, tropoDelayCorrection : TroposphericDelayCorrectionNoStd
}

{-| STEC residual for the given satellite at the grid point. -}

type alias STECResidualNoStd =
{ residual : Int
, svID : SvID
}

{-| Troposphere vertical delays at the grid point. -}

type alias TroposphericDelayCorrectionNoStd =
{ hydro : Int
, wet : Int
Expand Down Expand Up @@ -1010,6 +1016,7 @@ type alias MsgAcqResult =
}

{-| Signal identifier containing constellation, band, and satellite identifier. -}

type alias GnssSignal =
{ code : Int
, sat : Int
Expand Down Expand Up @@ -1041,6 +1048,7 @@ type alias AcqSvProfile =
}

{-| Digital signature using AES-CMAC 128 algorithm used for data integrity. -}

type alias MsgAESCmacSignature =
{ certificateID : Array Int
, flags : Int
Expand Down Expand Up @@ -1205,6 +1213,7 @@ type alias MsgBootloaderHandshakeResp =
}

{-| The host initiates the bootloader to jump to the application. -}

type alias MsgBootloaderJumpToApp =
{ jump : Int
}
Expand Down Expand Up @@ -1321,6 +1330,7 @@ type alias MsgDops =
}

{-| A DER encoded x.509 ECDSA-256 certificate (using curve secp256r1). -}

type alias MsgEcdsaCertificate =
{ certificateBytes : Array Int
, certificateID : Array Int
Expand All @@ -1329,6 +1339,7 @@ type alias MsgEcdsaCertificate =
}

{-| An ECDSA-256 signature using SHA-256 as the message digest algorithm. -}

type alias MsgEcdsaSignature =
{ certificateID : Array Int
, flags : Int
Expand Down Expand Up @@ -1775,6 +1786,7 @@ type alias MsgGnssTimeOffset =
}

{-| Please see ICD-GPS-200 (30.3.3.3.1.1) for more details. -}

type alias MsgGroupDelay =
{ iscL1CA : Int
, iscL2C : Int
Expand Down Expand Up @@ -1925,6 +1937,7 @@ type alias MsgLinuxMemState =
}

{-| Top 10 list of processes with a large number of open file descriptors. -}

type alias MsgLinuxProcessFdCount =
{ cmdline : String
, fdCount : Int
Expand All @@ -1933,12 +1946,14 @@ type alias MsgLinuxProcessFdCount =
}

{-| Summary of open file descriptors on the system. -}

type alias MsgLinuxProcessFdSummary =
{ mostOpened : String
, sysFdCount : Int
}

{-| Top 10 list of processes with high socket counts. -}

type alias MsgLinuxProcessSocketCounts =
{ cmdline : String
, index : Int
Expand All @@ -1949,6 +1964,7 @@ type alias MsgLinuxProcessSocketCounts =
}

{-| Top 10 list of sockets with deep queues. -}

type alias MsgLinuxProcessSocketQueues =
{ addressOfLargest : String
, cmdline : String
Expand All @@ -1961,6 +1977,7 @@ type alias MsgLinuxProcessSocketQueues =
}

{-| Summaries the socket usage across the system. -}

type alias MsgLinuxSocketUsage =
{ avgQueueDepth : Int
, maxQueueDepth : Int
Expand All @@ -1969,6 +1986,7 @@ type alias MsgLinuxSocketUsage =
}

{-| This presents a summary of CPU and memory utilization, including a timestamp. -}

type alias MsgLinuxSysState =
{ flags : Int
, memTotal : Int
Expand Down Expand Up @@ -1996,6 +2014,7 @@ type alias MsgM25FlashWriteStatus =
}

{-| Raw data from the magnetometer. -}

type alias MsgMagRaw =
{ magX : Int
, magY : Int
Expand Down Expand Up @@ -2067,6 +2086,7 @@ type alias MsgNdbEvent =
}

{-| The bandwidth usage, a list of usage by interface. -}

type alias MsgNetworkBandwidthUsage =
{ interfaces : Array NetworkUsage
}
Expand Down Expand Up @@ -2110,6 +2130,7 @@ type alias MsgObs =
}

{-| Header of a GNSS observation message. -}

type alias ObservationHeader =
{ nObs : Int
, t : GpsTime
Expand Down Expand Up @@ -2212,12 +2233,14 @@ type alias MsgOrientQuat =
}

{-| The OSR message contains network corrections in an observation-like format. -}

type alias MsgOsr =
{ header : ObservationHeader
, obs : Array PackedOsrContent
}

{-| Pseudorange and carrier phase network corrections for a satellite signal. -}

type alias PackedOsrContent =
{ flags : Int
, ionoStd : Int
Expand Down Expand Up @@ -2597,6 +2620,7 @@ type alias MsgReferenceFrameParam =
}

{-| This message from the host resets the Piksi back into the bootloader. -}

type alias MsgReset =
{ flags : Int
}
Expand Down Expand Up @@ -2747,6 +2771,7 @@ type alias SolutionInputType =
}

{-| Spectrum analyzer packet. -}

type alias MsgSpecan =
{ amplitudeRef : Float
, amplitudeUnit : Float
Expand Down Expand Up @@ -2936,6 +2961,7 @@ type alias MsgSsrGriddedCorrectionBounds =
}

{-| STEC polynomial and bounds for the given satellite. -}

type alias STECSatElementIntegrity =
{ stecBoundMu : Int
, stecBoundMuDot : Int
Expand Down Expand Up @@ -2979,6 +3005,7 @@ type alias MsgSsrOrbitClockBounds =
}

{-| Orbit and clock bound. -}

type alias OrbitClockBound =
{ clockBoundMu : Int
, clockBoundSig : Int
Expand All @@ -3000,6 +3027,7 @@ type alias MsgSsrOrbitClockBoundsDegradation =
}

{-| Orbit and clock bound degradation. -}

type alias OrbitClockBoundDegradation =
{ clockBoundMuDot : Int
, clockBoundSigDot : Int
Expand Down Expand Up @@ -3029,6 +3057,7 @@ type alias MsgSsrPhaseBiases =
}

{-| Phase biases are to be added to carrier phase measurements. -}

type alias PhaseBiasesContent =
{ bias : Int
, code : Int
Expand Down Expand Up @@ -3066,6 +3095,7 @@ type alias MsgSsrStecCorrection =
}

{-| STEC polynomial for the given satellite. -}

type alias STECSatElement =
{ stecCoeff : Array Int
, stecQualityIndicator : Int
Expand Down Expand Up @@ -3179,13 +3209,15 @@ type alias MsgSvAzEl =
}

{-| Satellite azimuth and elevation. -}

type alias SvAzEl =
{ az : Int
, el : Int
, sid : GnssSignal
}

{-| This message includes telemetry pertinent to satellite signals available to Starling. -}

type alias MsgTelSv =
{ nObs : Int
, originFlags : Int
Expand Down Expand Up @@ -3216,13 +3248,15 @@ type alias MsgThreadState =
}

{-| When enabled, a tracking channel can output the correlations at each update interval. -}

type alias MsgTrackingIq =
{ channel : Int
, corrs : Array TrackingChannelCorrelation
, sid : GnssSignal
}

{-| Structure containing in-phase and quadrature correlation components. -}

type alias TrackingChannelCorrelation =
{ i : Int
, q : Int
Expand All @@ -3236,6 +3270,7 @@ type alias MsgTrackingState =
}

{-| Tracking channel state for a specific satellite signal and measured signal power. -}

type alias TrackingChannelState =
{ cn0 : Int
, fcn : Int
Expand Down
Loading