16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 04:39:18 +02:00

Merge branch 'milek-dev' into gfx-work

This commit is contained in:
milek7
2019-07-13 01:30:49 +02:00
34 changed files with 1703 additions and 1086 deletions

View File

@@ -70,7 +70,7 @@ init() {
"Name: %s%s\nLoad: %.0f %s\nStatus: %s%s\nCouplers:\n front: %s\n rear: %s",
", owned by: ",
"none",
"Devices: %c%c%c%c%c%c%c%c%c%c%c%c%c%c%s%s\nPower transfers: %.0f@%.0f%s%s%s%.0f@%.0f",
"Devices: %c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%s%s\nPower transfers: %.0f@%.0f%s%s[%.0f]%s%s%.0f@%.0f",
" radio: ",
" oil pressure: ",
"Controllers:\n master: %d(%d), secondary: %s\nEngine output: %.1f, current: %.0f\nRevolutions:\n engine: %.0f, motors: %.0f\n engine fans: %.0f, motor fans: %.0f+%.0f, cooling fans: %.0f+%.0f",
@@ -185,6 +185,7 @@ init() {
"radio channel",
"radiostop test",
"radiostop",
"radio call 3",
"pantograph A",
"pantograph B",
"pantograph A",
@@ -264,7 +265,7 @@ init() {
u8"Nazwa: %s%s\nŁadunek: %.0f %s\nStatus: %s%s\nSprzęgi:\n przedni: %s\n tylny: %s",
u8", wlaściciel: ",
u8"wolny",
u8"Urządzenia: %c%c%c%c%c%c%c%c%c%c%c%c%c%c%s%s\nPrzepływ prądu: %.0f@%.0f%s%s%s%.0f@%.0f",
u8"Urządzenia: %c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%s%s\nTransfer prądów: %.0f@%.0f%s%s[%.0f]%s%s%.0f@%.0f",
u8" radio: ",
u8" cisń. oleju: ",
u8"Nastawniki:\n glówny: %d(%d), dodatkowy: %s\nMoc silnika: %.1f, prąd silnika: %.0f\nObroty:\n silnik: %.0f, motory: %.0f, went.silnika: %.0f, went.chłodnicy: %.0f+%.0f",
@@ -379,6 +380,7 @@ init() {
u8"kanał radia",
u8"test radiostopu",
u8"radiostop",
u8"zew 3",
u8"pantograf A",
u8"pantograf B",
u8"pantograf A",
@@ -498,6 +500,7 @@ init() {
"radiochannelnext_sw:",
"radiotest_sw:",
"radiostop_sw:",
"radiocall3_sw:",
"pantfront_sw:",
"pantrear_sw:",
"pantfrontoff_sw:",