Merge branch 'merbanan:master' into master

merbanan · Oct 30, 2023 · 14a0458 · 14a0458
2 parents 8f87a26 + 97dd0f0
commit 14a0458
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/tests/blueline/02/blueline_433.92M_250k.cu8 b/tests/blueline/02/blueline_433.92M_250k.cu8
diff --git a/tests/blueline/02/protocol b/tests/blueline/02/protocol
@@ -0,0 +1 @@
+176:12080
diff --git a/tests/oregon_scientific/THN132N/THN132N_180_ch3.json b/tests/oregon_scientific/THN132N/THN132N_180_ch3.json
@@ -1,2 +1,2 @@
-{"time" : "@0.148384s", "model" : "Oregon-THN132N", "id" : 231, "channel" : 3, "battery_ok" : 1, "temperature_C" : 18.000}
-{"time" : "@0.148384s", "model" : "Oregon-THN132N", "id" : 231, "channel" : 3, "battery_ok" : 1, "temperature_C" : 18.000}
+{"time" : "@0.148384s", "model" : "Oregon-THN132N", "id" : 231, "channel" : 4, "battery_ok" : 1, "temperature_C" : 18.000}
+{"time" : "@0.148384s", "model" : "Oregon-THN132N", "id" : 231, "channel" : 4, "battery_ok" : 1, "temperature_C" : 18.000}
diff --git a/tests/oregon_scientific/THN132N/THN132N_213_ch3.json b/tests/oregon_scientific/THN132N/THN132N_213_ch3.json
@@ -1,2 +1,2 @@
-{"time" : "@0.148892s", "model" : "Oregon-THN132N", "id" : 231, "channel" : 3, "battery_ok" : 1, "temperature_C" : 21.300}
-{"time" : "@0.148892s", "model" : "Oregon-THN132N", "id" : 231, "channel" : 3, "battery_ok" : 1, "temperature_C" : 21.300}
+{"time" : "@0.148892s", "model" : "Oregon-THN132N", "id" : 231, "channel" : 4, "battery_ok" : 1, "temperature_C" : 21.300}
+{"time" : "@0.148892s", "model" : "Oregon-THN132N", "id" : 231, "channel" : 4, "battery_ok" : 1, "temperature_C" : 21.300}