Skip to content

Merge web client improvements (layout/styling, functionality) and train additions (new trains added) and legacy arm binaries #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BLuedtke merged 33 commits into from
Oct 9, 2025
Merged

Merge web client improvements (layout/styling, functionality) and train additions (new trains added) and legacy arm binaries #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
5a59b17
add new trains and make sure formatting of all config bahn files is c…
BLuedtke Oct 30, 2024
65f5b91
Train Config updated weights, lengths, formatting
BLuedtke Oct 31, 2024
6e2bdf0
added new trains to game client selection (without picture updates)
Dec 10, 2024
495e005
fixed card title for perso sbb in driver game
Dec 10, 2024
4f9ccab
added train images
Dec 16, 2024
a3f15a3
added fix for not existing foto
Dec 17, 2024
18bb0eb
added cargo bayern to driver game
Dec 17, 2024
6088893
changed img naming format
Dec 17, 2024
6994f5b
fixed driver img typo
Dec 17, 2024
a315393
removed signal 44 for full
Dec 17, 2024
066550a
fix(driver-game): trainselection container fixed; train data updated
Dec 17, 2024
f7b255b
fix(driver-game_table-generator): added requirements.txt
Dec 17, 2024
3f4f9ea
fix(driver-game): image labels
Dec 17, 2024
6a95e25
Merge branch 'master' into 134-add-new-train-configurations
BLuedtke Dec 17, 2024
476fc2e
improved game client header formatting
BLuedtke Dec 18, 2024
3a0bf84
compressed game client train images to speed up loading
BLuedtke Dec 18, 2024
0db625e
Merge branch 'master' into 134-add-new-train-configurations
BLuedtke Jul 22, 2025
5071823
Game Train Selection View adjusted for Landscape mode
BLuedtke Jul 22, 2025
5e25e4f
driver game layout adjustments
BLuedtke Jul 22, 2025
cff2c5b
slight CSS adjustments and refactoring for game client
BLuedtke Jul 23, 2025
aeb4285
html client styling added, driver added new trains
BLuedtke Jul 23, 2025
0bf90fe
driver game html formatting and train order fixes
BLuedtke Jul 25, 2025
d65ebe7
client html formatting
BLuedtke Jul 25, 2025
29eba73
Merge branch 'master' into 135-revise-game-client-layout
BLuedtke Sep 25, 2025
33fa31c
properly hide the destination selection
BLuedtke Sep 25, 2025
7dcb157
wip driver game styling improvements
uniba-swt-management Sep 25, 2025
b869dd2
improve game client header and button formatting/css
uniba-swt-management Sep 25, 2025
d3a06f8
speed factor per train added
uniba-swt-management Sep 25, 2025
7c41e60
prep dynamic signal loading
BLuedtke Sep 26, 2025
a0754e2
improved train overview styling
uniba-swt-management Sep 26, 2025
2ab25a3
rework web client styling, dynamically load accessories, and fix veri…
uniba-swt-management Sep 26, 2025
bb9a750
fixed tests and added legacy binaries to use on rPi4 and older
BLuedtke Sep 26, 2025
4631682
PR requested changes
BLuedtke Sep 29, 2025
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
52 changes: 46 additions & 6 deletions configurations/swtbahn-full/bidib_train_config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ trains:
- id: cabin_light
bit: 0
initial: 1
weight: 100.0g
weight: 77.0g
length: 13.0cm
type: cargo
- id: cargo_bayern
Expand All @@ -43,7 +43,7 @@ trains:
- id: cabin_light
bit: 0
initial: 1
weight: 100.0g
weight: 72.0g
length: 13.0cm
type: cargo
- id: cargo_green
Expand All @@ -63,7 +63,7 @@ trains:
- id: head_light
bit: 4
initial: 1
weight: 100.0g
weight: 80.0g
length: 13.0cm
type: cargo
- id: regional_odeg
Expand All @@ -86,7 +86,7 @@ trains:
- id: cabin_light
bit: 0
initial: 1
weight: 100.0g
weight: 194.0g
length: 25.0cm
type: passenger
- id: regional_brengdirect
Expand All @@ -109,6 +109,46 @@ trains:
- id: cabin_light
bit: 0
initial: 1
weight: 100.0g
length: 23.0cm
weight: 236.0g
length: 35.0cm
type: passenger
- id: cargo_g1000bb
dcc-address: 0x0050
dcc-speed-steps: 126
calibration:
- 5
- 15
- 30
- 45
- 60
- 75
- 90
- 105
- 120
peripherals:
- id: head_light
bit: 4
initial: 1
weight: 35.0g
length: 10.0cm
type: cargo
- id: perso_sbb
dcc-address: 0x004F
dcc-speed-steps: 126
calibration:
- 5
- 15
- 30
- 45
- 60
- 75
- 90
- 105
- 120
peripherals:
- id: head_light
bit: 4
initial: 1
weight: 81.0g
length: 12.0cm
type: passenger
54 changes: 32 additions & 22 deletions configurations/swtbahn-full/config.bahn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,21 +806,21 @@ module SWTbahnFull

trains
cargo_db 0x007F # addr high | addr low
steps 126
calibration
5
15
30
45
60
75
90
105
120
end
weight 100g
length 13cm
type cargo
steps 126
calibration
5
15
30
45
60
75
90
105
120
end
weight 77g
length 13cm
type cargo
peripherals
head_light
bit 4 # a value in range 0..31
Expand All @@ -829,28 +829,38 @@ module SWTbahnFull
bit 0 # a value in range 0..31
initial 1
end
cargo_bayern 0x0070 steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 100g length 13cm type cargo

cargo_bayern 0x0070 steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 72g length 13cm type cargo
peripherals
head_light bit 4 initial 1
cabin_light bit 0 initial 1
end
cargo_green 0x006F steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 100g length 13cm type cargo

cargo_green 0x006F steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 80g length 13cm type cargo
peripherals
head_light bit 4 initial 1
end

regional_odeg 0x0060 steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 100g length 25cm type passenger
regional_odeg 0x0060 steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 194g length 25cm type passenger
peripherals
head_light bit 4 initial 1
cabin_light bit 0 initial 1
end
regional_brengdirect 0x005F steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 100g length 23cm type passenger

regional_brengdirect 0x005F steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 236g length 35cm type passenger
peripherals
head_light bit 4 initial 1
cabin_light bit 0 initial 1
end

cargo_g1000bb 0x0050 steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 35g length 10cm type cargo
peripherals
head_light bit 4 initial 1
end

perso_sbb 0x004F steps 126 calibration 5 15 30 45 60 75 90 105 120 end weight 81g length 12cm type passenger
peripherals
head_light bit 4 initial 1
end
end
end
52 changes: 46 additions & 6 deletions configurations/swtbahn-lite/bidib_train_config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ trains:
- id: cabin_light
bit: 0
initial: 1
weight: 100.0g
weight: 77.0g
length: 13.0cm
type: cargo
- id: cargo_bayern
Expand All @@ -43,7 +43,7 @@ trains:
- id: cabin_light
bit: 0
initial: 1
weight: 100.0g
weight: 72.0g
length: 13.0cm
type: cargo
- id: cargo_green
Expand All @@ -63,7 +63,7 @@ trains:
- id: head_light
bit: 4
initial: 1
weight: 100.0g
weight: 80.0g
length: 13.0cm
type: cargo
- id: regional_odeg
Expand All @@ -86,7 +86,7 @@ trains:
- id: cabin_light
bit: 0
initial: 1
weight: 100.0g
weight: 194.0g
length: 25.0cm
type: passenger
- id: regional_brengdirect
Expand All @@ -109,6 +109,46 @@ trains:
- id: cabin_light
bit: 0
initial: 1
weight: 100.0g
length: 23.0cm
weight: 236.0g
length: 35.0cm
type: passenger
- id: cargo_g1000bb
dcc-address: 0x0050
dcc-speed-steps: 126
calibration:
- 5
- 15
- 30
- 45
- 60
- 75
- 90
- 105
- 120
peripherals:
- id: head_light
bit: 4
initial: 1
weight: 35.0g
length: 10.0cm
type: cargo
- id: perso_sbb
dcc-address: 0x004F
dcc-speed-steps: 126
calibration:
- 5
- 15
- 30
- 45
- 60
- 75
- 90
- 105
- 120
peripherals:
- id: head_light
bit: 4
initial: 1
weight: 81.0g
length: 12.0cm
type: passenger
Loading