Skip to content
This repository has been archived by the owner on Jul 14, 2024. It is now read-only.

gogatsusai2024 に向けた PTCS の更新 #1

Merged
merged 44 commits into from
May 24, 2024
Merged
Show file tree
Hide file tree
Changes from 38 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
7d1f07b
gogatsusai2024 の路線図を追加
n4o847 May 5, 2024
461f109
頂点と辺の接続に基づく路線図抽出スクリプトを追加
n4o847 May 11, 2024
b4c9a68
UI の定義を移動
n4o847 May 11, 2024
baee28a
路線図データを更新
n4o847 May 11, 2024
20edbc6
抽出したデータを出力
n4o847 May 11, 2024
9330634
結果を ID 順にソート
n4o847 May 11, 2024
c2bd4ae
settings.json を更新
n4o847 May 11, 2024
4e26c8f
路線の定義を自動生成
n4o847 May 11, 2024
dcd8272
路線図 v3 を作成
n4o847 May 12, 2024
105a820
閉塞区間を踏まえて路線図 v3 を編集
n4o847 May 12, 2024
f6baf52
control と ui に路線図 v3 を適用
n4o847 May 12, 2024
e717fea
見た目を調整
n4o847 May 12, 2024
693c82a
閉塞区間を割り振り
n4o847 May 13, 2024
21809e6
システムを固定閉塞システムと移動閉塞システムに分割
n4o847 May 13, 2024
c43541e
とりあえず移動閉塞と同じように動かす
n4o847 May 13, 2024
e87e218
列車のセクション変化などのイベント通知機構を導入
n4o847 May 15, 2024
37099fc
(WIP) ポイント切り替えアルゴリズムを記述
n4o847 May 15, 2024
432b80d
センサー位置を設定
n4o847 May 16, 2024
a55b30b
列車の長さを調整
n4o847 May 16, 2024
4d2a825
自動生成するセクションの長さを調整
n4o847 May 16, 2024
84ab669
列車の駅停止判断を記述
n4o847 May 17, 2024
8950f78
ファイル名を変更(gogatsusai2024.py → gogatsusai2024_generated.py)
n4o847 May 17, 2024
b8c326c
ファイル名を変更(config.py → gogatsusai2024.py)
n4o847 May 17, 2024
73346ec
車両とポイントを設定(対応は未定)
n4o847 May 17, 2024
2849a93
Commit from GitHub Actions (Lint and format ptcs)
github-actions[bot] May 17, 2024
95f4f10
Commit from GitHub Actions (Build and commit ptcs_ui)
github-actions[bot] May 17, 2024
608ec63
3台まで動いた.ポイントが動かないが
Ryota-Nitto May 17, 2024
7e6b1d0
閉塞を計算する
n4o847 May 17, 2024
cf56510
ジャンクション j12, j14 を廃止
n4o847 May 17, 2024
31e34d0
Commit from GitHub Actions (Build and commit ptcs_ui)
github-actions[bot] May 17, 2024
06195da
ブリッジの設定に対応するコンポーネントが存在しないときに警告
n4o847 May 18, 2024
52d6f1c
合流点の 2 つ前のセクション終端で止まる不具合を修正
n4o847 May 18, 2024
224480e
駅停止をもっと急にする
n4o847 May 18, 2024
faf8d08
_calc_direction がエラーで止まっていたのを修正
n4o847 May 18, 2024
adc0be0
プロパティを修正(train.mileage → train.head_position.mileage)
n4o847 May 18, 2024
fb53346
CI が失敗するのを修正
n4o847 May 18, 2024
882b713
Commit from GitHub Actions (Lint and format ptcs)
github-actions[bot] May 18, 2024
f870392
1日目終了
Ryota-Nitto May 18, 2024
b8afdf4
Commit from GitHub Actions (Lint and format ptcs)
github-actions[bot] May 18, 2024
315aa07
路線図 v5 に更新
n4o847 May 18, 2024
d94e426
Commit from GitHub Actions (Build and commit ptcs_ui)
github-actions[bot] May 18, 2024
7402779
2日目朝安定動作版
Ryota-Nitto May 19, 2024
f136f45
駅停止機能を省く
n4o847 May 19, 2024
d46d3fc
2日目最終版
Ryota-Nitto May 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/ptcs-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
14 changes: 13 additions & 1 deletion point_switching/switch_point.py
Original file line number Diff line number Diff line change
Expand Up @@ -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_POINT0
#################################################

SERVICE_UUID = "2a4023a6-6079-efea-b79f-7c882319b83b"
Expand Down
2 changes: 1 addition & 1 deletion ptcs/.vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading