diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b57e3e8ab..2c072f620 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 @@ -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 @@ -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 diff --git a/Cargo.lock b/Cargo.lock index 36f079908..0708aa2a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9,7 +9,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0e9889e6db118d49d88d84728d0e964d973a5680befb5f85f55141beea5c20b" dependencies = [ "libc", - "mach 0.1.2", + "mach", ] [[package]] @@ -20,7 +20,7 @@ checksum = "99696c398cbaf669d2368076bdb3d627fb0ce51a26899d7c61228c5c0af3bf4a" dependencies = [ "CoreFoundation-sys", "libc", - "mach 0.1.2", + "mach", ] [[package]] @@ -174,9 +174,9 @@ checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4" [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "block" @@ -1283,9 +1283,9 @@ dependencies = [ [[package]] name = "libudev" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea626d3bdf40a1c5aee3bcd4f40826970cae8d80a8fec934c82a63840094dcfe" +checksum = "78b324152da65df7bb95acfcaab55e3097ceaab02fb19b228a9eb74d55f135e0" dependencies = [ "libc", "libudev-sys", @@ -1358,10 +1358,10 @@ dependencies = [ ] [[package]] -name = "mach" -version = "0.2.3" +name = "mach2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1" +checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" dependencies = [ "libc", ] @@ -1551,9 +1551,9 @@ checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121" [[package]] name = "nix" -version = "0.20.2" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5e06129fb611568ef4e868c14b326274959aa70ff7776e9d55323531c374945" +checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" dependencies = [ "bitflags", "cc", @@ -1564,15 +1564,13 @@ dependencies = [ [[package]] name = "nix" -version = "0.22.3" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" +checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc" dependencies = [ "bitflags", - "cc", "cfg-if 1.0.0", "libc", - "memoffset", ] [[package]] @@ -2515,16 +2513,16 @@ dependencies = [ [[package]] name = "serialport" -version = "4.0.2-alpha.0" -source = "git+https://github.com/swift-nav/serialport-rs.git#43d7ea47eaa82aee19a699ca530b593b0fb8d849" +version = "4.2.1-alpha.0" +source = "git+https://github.com/swift-nav/serialport-rs.git#64ccc6fef4361236a624f253d20ec063b0d34d50" dependencies = [ "CoreFoundation-sys", "IOKit-sys", "bitflags", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libudev", - "mach 0.2.3", - "nix 0.20.2", + "mach2", + "nix 0.24.2", "regex", "winapi", ] diff --git a/Makefile.toml b/Makefile.toml index b3db51e55..9cdf85571 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -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 ''' diff --git a/resources/LogPanel.qml b/resources/LogPanel.qml index 17a4e86b1..fffb03936 100644 --- a/resources/LogPanel.qml +++ b/resources/LogPanel.qml @@ -262,7 +262,7 @@ Item { } Timer { - interval: Globals.currentRefreshRate + interval: Utils.hzToMilliseconds(Globals.currentRefreshRate) running: parent.visible repeat: true onTriggered: {