Skip to content

Cherry-pick bd00f7d 87b29d6 43208dc 88ae5b3 #746

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 4 commits into from
Sep 22, 2022
Merged

Cherry-pick bd00f7d 87b29d6 43208dc 88ae5b3 #746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd00f7d
Reduce the update frequency of the log panel to 5hz (#734)
keithel-qt Sep 14, 2022
87b29d6
Uprev serialport for windows overlapped io support. (#744)
john-michaelburke Sep 20, 2022
d159b26
Fix imagemagick version conflict with CI + install libssl-dev in CI. …
john-michaelburke Sep 21, 2022
5c3d18f
Update public_suffix before fpm install. (#751)
john-michaelburke Sep 22, 2022
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
8 changes: 5 additions & 3 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
shell: bash
run: |
if [ "$RUNNER_OS" == "Linux" ]; then
sudo apt-get update && sudo apt-get install -y capnproto libudev-dev
sudo apt-get update && sudo apt-get install -y capnproto libudev-dev libssl-dev
elif [ "$RUNNER_OS" == "macOS" ]; then
brew install capnp llvm
elif [ "$RUNNER_OS" == "Windows" ]; then
Expand Down Expand Up @@ -158,7 +158,7 @@ jobs:

- name: Install Dependencies.
run: |
sudo apt-get update && sudo apt-get install -y capnproto libudev-dev
sudo apt-get update && sudo apt-get install -y capnproto libudev-dev libssl-dev

- name: Cache pip
uses: actions/cache@v2
Expand Down Expand Up @@ -253,7 +253,9 @@ jobs:
ruby-dev \
rubygems \
build-essential \
libudev-dev
libudev-dev \
libssl-dev
sudo gem install public_suffix -v 4.0.7 # This is a fix for U18.
sudo gem install --no-document fpm
elif [ "$RUNNER_OS" == "macOS" ]; then
brew install capnp llvm create-dmg
Expand Down
38 changes: 18 additions & 20 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Makefile.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ exec --fail-on-error ${DIST_PYTHON} ./get-pip.py
script_runner = "@duckscript"
script = '''
wget -O imagemagick.tool.7.1.0.nupkg https://github.com/swift-nav/swift-toolchains/releases/download/imagemagick-7.1.0/imagemagick.tool.7.1.0.nupkg
exec --fail-on-error choco install -q -y vcredist2010 --version=10.0.40219.1
exec --fail-on-error choco install -q -y --side-by-side vcredist2010 --version=10.0.40219.32503
exec --fail-on-error choco install -q -y ./imagemagick.tool.7.1.0.nupkg
rm imagemagick.tool.7.1.0.nupkg
'''
Expand Down
2 changes: 1 addition & 1 deletion resources/LogPanel.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ Item {
}

Timer {
interval: Globals.currentRefreshRate
interval: Utils.hzToMilliseconds(Globals.currentRefreshRate)
running: parent.visible
repeat: true
onTriggered: {
Expand Down