From 1a48e6e6255a8010d2aa1174d46c8fdce624df43 Mon Sep 17 00:00:00 2001
From: Vehicle Researcher <user@comma.ai>
Date: Mon, 17 Feb 2020 18:08:20 -0800
Subject: [PATCH] Squashed 'cereal/' changes from ab32956aa..eba4349b9

eba4349b9 put liveLocation in qlogs
6c4735f21 add fixed fingerprintSource
4c50d26c6 GitHub actions (#25)
988783f6a Merge pull request #28 from commaai/power_monitoring
b43fd0673 Added offroad power usage

git-subtree-dir: cereal
git-subtree-split: eba4349b9ac2c15a17f7169e6c24464501308347
---
 .github/workflows/tests.yml | 23 +++++++++++++++++++++++
 azure-pipelines.yml         | 14 --------------
 car.capnp                   |  1 +
 log.capnp                   |  1 +
 service_list.yaml           |  2 +-
 5 files changed, 26 insertions(+), 15 deletions(-)
 create mode 100644 .github/workflows/tests.yml
 delete mode 100644 azure-pipelines.yml

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
new file mode 100644
index 00000000000000..3b8f6ca8e03b87
--- /dev/null
+++ b/.github/workflows/tests.yml
@@ -0,0 +1,23 @@
+name: Tests
+
+on: [push, pull_request]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-16.04
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build docker image
+      run: docker build -t cereal .
+    - name: Unit Tests
+      run: |
+        docker run cereal bash -c "scons --test --asan -j$(nproc) && messaging/test_runner"
+    - name: Test ZMQ
+      run: |
+        docker run cereal bash -c "ZMQ=1 python -m unittest discover ."
+    - name: Test MSGQ
+      run: |
+        docker run cereal bash -c "MSGQ=1 python -m unittest discover ."
+
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
deleted file mode 100644
index c14526a5c1c404..00000000000000
--- a/azure-pipelines.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-pr: none
-
-pool:
-  vmImage: 'ubuntu-16.04'
-
-steps:
-- script: |
-    set -e
-    docker build -t cereal .
-    docker run cereal bash -c "scons --test --asan -j$(nproc) && messaging/test_runner"
-    docker run cereal bash -c "ZMQ=1 python -m unittest discover ."
-    docker run cereal bash -c "MSGQ=1 python -m unittest discover ."
-
-  displayName: 'Run Tests'
diff --git a/car.capnp b/car.capnp
index 745389232537f1..58ff3fb42e95cb 100644
--- a/car.capnp
+++ b/car.capnp
@@ -477,5 +477,6 @@ struct CarParams {
   enum FingerprintSource {
     can @0;
     fw @1;
+    fixed @2;
   }
 }
diff --git a/log.capnp b/log.capnp
index e01c8977e23607..46971d81a309e9 100644
--- a/log.capnp
+++ b/log.capnp
@@ -280,6 +280,7 @@ struct ThermalData {
   batteryVoltage @16 :Int32;
   usbOnline @12 :Bool;
   networkType @22 :NetworkType;
+  offroadPowerUsage @23 :UInt32;  # Power usage since going offroad in uWh
 
   fanSpeed @10 :UInt16;
   started @11 :Bool;
diff --git a/service_list.yaml b/service_list.yaml
index 7dd1a62e96907d..5747293abd6f3a 100644
--- a/service_list.yaml
+++ b/service_list.yaml
@@ -31,7 +31,7 @@ carState: [8021, true, 100., 10]
 # 8022 is reserved for sshd
 carControl: [8023, true, 100., 10]
 plan: [8024, true, 20.]
-liveLocation: [8025, true, 0.]
+liveLocation: [8025, true, 0., 1]
 gpsLocation: [8026, true, 1., 1]
 ethernetData: [8027, true, 0.]
 navUpdate: [8028, true, 0.]