Merge pull request #1 from plarailers/feature/ptcs-config-gogatsusai2024

[WIP] gogatsusai2024 に向けた PTCS の更新
plarailers · May 24, 2024 · 0c97e68 · 0c97e68
2 parents 92fa1df + d46d3fc
commit 0c97e68
Show file tree

Hide file tree

Showing 42 changed files with 9,379 additions and 746 deletions.
diff --git a/.github/workflows/ptcs-ci.yml b/.github/workflows/ptcs-ci.yml
@@ -20,7 +20,10 @@ jobs:
       run:
         working-directory: 'ptcs'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+          ref: ${{ github.event.pull_request.head.ref }}
 
       - uses: reviewdog/action-setup@v1
         with:

diff --git a/point_switching/switch_point.py b/point_switching/switch_point.py
@@ -7,16 +7,28 @@
 if platform.system() == "Windows":
     ADDRESS_POINT0 = '3c:71:bf:99:36:86'
     ADDRESS_POINT1 = '9c:9c:1f:cb:d9:f2'
+    ADDRESS_POINT2 = '08:3a:8d:14:7a:0e'
+    ADDRESS_POINT3 = '08:b6:1f:ee:3f:d6'
+    ADDRESS_POINT4 = '0c:b8:15:78:41:b2'
+    ADDRESS_POINT5 = '7c:9e:bd:93:2e:72'
+    ADDRESS_POINT6 = '24:62:ab:e3:67:9a'
+    ADDRESS_POINT7 = '9c:9c:1f:d1:68:26'
 
 elif platform.system() == "Darwin":
     ADDRESS_POINT0 = "9FA4916E-AD02-6C9C-686A-1B97D9E3427A"
     ADDRESS_POINT1 = "90386433-4331-50CF-1637-EFFA587DD6DB"
+    ADDRESS_POINT2 = "2E4CD350-F39B-03B1-295C-F98C728C15E4"
+    ADDRESS_POINT3 = "5365F30F-2457-DC22-903E-37C81D6DF486"
+    ADDRESS_POINT4 = "872E54C6-24D2-7E32-A123-9CA81C5AB8D7"
+    ADDRESS_POINT5 = "28652C68-A2CE-F0EF-93F1-857DCA3C7A4D"
+    ADDRESS_POINT6 = "4BE5DF57-4E86-18DB-E792-C5D2F118610E"
+    ADDRESS_POINT7 = "3D6ABB53-D496-8379-3274-4134F840D7D8"
 
 else:
     raise Exception(f"{platform.system()} not supported")
 
 ####### TODO: 車両のアドレスを指定してください #######
-address = ADDRESS_POINT1
+address = ADDRESS_POINT3
 #################################################
 
 SERVICE_UUID = "2a4023a6-6079-efea-b79f-7c882319b83b"

diff --git a/ptcs/.vscode/settings.json b/ptcs/.vscode/settings.json
@@ -3,7 +3,7 @@
         "editor.defaultFormatter": "ms-python.black-formatter",
         "editor.formatOnSave": true,
         "editor.codeActionsOnSave": {
-            "source.organizeImports": true
+            "source.organizeImports": "explicit"
         }
     },
     // "mypy-type-checker.args": ["--config-file=pyproject.toml"], // workaround