From 2242a796345bceb301cf3e2094f2a4871cb81cb6 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期四, 13 八月 2020 18:22:25 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge

---
 app/src/main/assets/signal_config_file.json |  207 ++++++++++++++++++++++++++++-----------------------
 1 files changed, 115 insertions(+), 92 deletions(-)

diff --git a/app/src/main/assets/signal_config_file.json b/app/src/main/assets/signal_config_file.json
index a621e73..e25e67f 100644
--- a/app/src/main/assets/signal_config_file.json
+++ b/app/src/main/assets/signal_config_file.json
@@ -1,100 +1,8 @@
 [
-
-  {
-    "signalName": "闆剧伅",
-    "index":1,
-    "func_id":21,
-    "highLevel":1,
-    "mainBoard":2
-  },
-  {
-    "signalName": "涓夋。",
-    "index":15,
-    "func_id":11,
-    "highLevel":1,
-    "mainBoard":2
-  },
-  {
-    "signalName": "鎵嬪埞",
-    "index":3,
-    "func_id":3,
-    "highLevel":1,
-    "mainBoard":2
-  },
-  {
-    "signalName": "涓�妗�",
-    "index":8,
-    "func_id":9,
-    "highLevel":1,
-    "mainBoard":2
-  },
-  {
-    "signalName": "鍓埞",
-    "index":16,
-    "func_id":16,
-    "highLevel":1,
-    "mainBoard":2
-  },
   {
     "signalName": "瀹夊叏甯�",
     "index":6,
     "func_id":0,
-    "highLevel":1,
-    "mainBoard":2
-  },
-  {
-    "signalName": "浜屾。",
-    "index":7,
-    "func_id":10,
-    "highLevel":1,
-    "mainBoard":2
-  },
-  {
-    "signalName": "鑴氬埞",
-    "index":4,
-    "func_id":4,
-    "highLevel":1,
-    "mainBoard":2
-  },
-  {
-    "signalName": "绌烘尅",
-    "index":9,
-    "func_id":8,
-    "highLevel":1,
-    "mainBoard":2
-  },
-  {
-    "signalName": "闂ㄩ攣",
-    "func_id":7,
-    "index":10,
-    "highLevel":1,
-    "mainBoard":2
-  },
-  {
-    "signalName": "START浣�",
-    "func_id":15,
-    "highLevel":1,
-    "index":11,
-    "mainBoard":2
-  },
-  {
-    "signalName": "杩滃厜",
-    "index":12,
-    "func_id":6,
-    "highLevel":1,
-    "mainBoard":2
-  },
-  {
-    "signalName": "缁曡溅涓�",
-    "index":13,
-    "func_id":17,
-    "highLevel":1,
-    "mainBoard":2
-  },
-  {
-    "signalName": "杩戝厜",
-    "index":14,
-    "func_id":5,
     "highLevel":1,
     "mainBoard":2
   },
@@ -112,6 +20,103 @@
     "highLevel":1,
     "mainBoard":2
   },
+  {
+    "signalName": "鎵嬪埞",
+    "index":3,
+    "func_id":3,
+    "highLevel":1,
+    "mainBoard":2
+  },
+  {
+    "signalName": "鑴氬埞",
+    "index":4,
+    "func_id":4,
+    "highLevel":1,
+    "mainBoard":2
+  },
+  {
+    "signalName": "杩戝厜",
+    "index":14,
+    "func_id":5,
+    "highLevel":1,
+    "mainBoard":2
+  },
+  {
+    "signalName": "杩滃厜",
+    "index":12,
+    "func_id":6,
+    "highLevel":1,
+    "mainBoard":2
+  }
+, {
+  "signalName": "闂ㄩ攣",
+  "index":22,
+  "func_id":7,
+  "highLevel":1,
+  "mainBoard":2
+},
+
+  {
+    "signalName": "绌烘尅",
+    "index":9,
+    "func_id":8,
+    "highLevel":1,
+    "mainBoard":2
+  },
+  {
+    "signalName": "闆剧伅",
+    "index":1,
+    "func_id":21,
+    "highLevel":1,
+    "mainBoard":2
+  },
+  {
+    "signalName": "涓夋。",
+    "index":15,
+    "func_id":11,
+    "highLevel":1,
+    "mainBoard":2
+  },
+  {
+    "signalName": "涓�妗�",
+    "index":8,
+    "func_id":9,
+    "highLevel":1,
+    "mainBoard":2
+  },
+  {
+    "signalName": "鍓埞",
+    "index":16,
+    "func_id":16,
+    "highLevel":1,
+    "mainBoard":2
+  },
+
+  {
+    "signalName": "浜屾。",
+    "index":10,
+    "func_id":10,
+    "highLevel":1,
+    "mainBoard":2
+  },
+
+  {
+    "signalName": "START浣�",
+    "func_id":15,
+    "highLevel":1,
+    "index":11,
+    "mainBoard":2
+  },
+
+  {
+    "signalName": "缁曡溅涓�",
+    "index":13,
+    "func_id":17,
+    "highLevel":1,
+    "mainBoard":2
+  },
+
+
   {
     "signalName": "缁曡溅浜�",
     "index":17,
@@ -139,5 +144,23 @@
     "func_id":22,
     "highLevel":1,
     "mainBoard":2
+  }, {
+    "signalName": "鍥涙。",
+    "index":21,
+    "func_id":12,
+    "highLevel":1,
+    "mainBoard":2
+  }, {
+    "signalName": "浜旀。",
+    "index":23,
+    "func_id":13,
+    "highLevel":1,
+    "mainBoard":2
+  }, {
+    "signalName": "鍊掓。",
+    "index":7,
+    "func_id":14,
+    "highLevel":1,
+    "mainBoard":2
   }
 ]
\ No newline at end of file

--
Gitblit v1.8.0