Skip to content
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.

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

Add a few new frames, fix typos and started to add German #13

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
437 changes: 292 additions & 145 deletions .gitignore

Large diffs are not rendered by default.

56 changes: 56 additions & 0 deletions architectures.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,37 @@ AEE2001:
comment:
en: 'VAN+CAN, 1st gen'
fr: 'VAN+CAN, 1ere generation'
de: 'VAN+CAN, 1ste Generation'
networks:
CAN_HS:
IS:
protocol: 'CAN'
# bitrate is probably 500 but i dont know for sure
display_name:
en: 'Inter-systems'
fr: 'Inter-systemes'
de: 'Interne Systeme'
comment:
en: 'CAN Bus for main nodes'
fr: 'Bus CAN des noeuds principaux'
de: 'CAN-Bus für Hauptsysteme'
VAN_LS:
CONF:
protocol: 'VAN'
display_name:
en: 'Comfort'
fr: 'Confort'
de: 'Komfort'
comment:
en: 'VAN Bus for infotainement and comfort nodes'
fr: 'Bus VAN pour les noeuds habitacle'
de: 'VAN Bus für Infotainment und Komfort'
CAR:
protocol: 'VAN'
display_name:
en: 'Body'
fr: 'Carrosserie'
de: 'Karosserie'
protocols:
- 'VAN'
- 'CAN'
Expand All @@ -39,32 +49,46 @@ AEE2004:
comment:
en: 'Full-CAN, 1st gen'
fr: 'Full-CAN, 1ere generation'
de: 'Voll-CAN, 1ste Generation'
networks:
HS:
IS:
protocol: 'CAN'
bitrate: 500
display_name:
en: 'Inter-systems'
fr: 'Inter-systemes'
de: 'Interne Systeme'
comment:
en: 'CAN Bus for main nodes'
fr: 'Bus CAN des noeuds principaux'
de: 'CAN-Bus für Hauptsysteme'
LS:
CONF:
protocol: 'CAN'
bitrate: 125
display_name:
en: 'Comfort bus'
fr: 'Bus confort'
de: 'Komfort Bus'
comment:
en: 'Infotainement and comfort nodes'
fr: 'Bus pour les noeuds habitacle'
de: 'Infotainment und Komfortsysteme'
CAR:
protocol: 'CAN'
bitrate: 125
display_name:
en: 'Body'
fr: 'Carrosserie'
de: 'Karosserie'
LIN:
LIN:
protocol: 'LIN'
display_name:
en: 'LIN'
fr: 'LIN'
de: 'LIN'
protocols:
- 'CAN'
- 'LIN'
Expand All @@ -85,66 +109,98 @@ AEE2010:
comment:
en: 'Full-CAN, 2nd gen'
fr: 'Full-CAN, 2eme generation'
de: 'Voll-CAN, 2te Generation'
networks:
HS:
IS:
protocol: 'CAN'
# bitrate is probably 500 but i dont know for sure
display_name:
en: 'Inter-systems'
fr: 'Inter-systemes'
de: 'Interne Systeme'
comment:
en: 'CAN Bus for main nodes'
fr: 'Bus CAN des noeuds principaux'
de: 'CAN-Bus für Hauptsysteme'
LAS:
protocol: 'CAN'
# bitrate is probably 500 but i dont know for sure
dispaly_name:
en: 'Suspension Systems'
fr: 'Liaison Au Sol'
de: 'Federungssysteme'
comment:
en: 'Bus for secondary IS nodes'
fr: 'Bus pour noeuds IS secondaires'
de: 'Bus für zweitrangige Hauptsysteme'
LS:
CONF:
protocol: 'CAN'
# bitrate is probably 125 but i dont know for sure
display_name:
en: 'Comfort'
fr: 'Confort'
de: 'Komfort'
INFO-DIV:
protocol: 'CAN'
# bitrate is probably 125 but i dont know for sure
display_name:
en: 'Infotainement'
fr: 'Info-Divertissement'
de: 'Infotainment'
CAR:
protocol: 'CAN'
# bitrate is probably 125 but i dont know for sure
display_name:
en: 'Body'
fr: 'Carrosserie'
de: 'Karosserie'
LIN:
LIN:
protocol: 'LIN'
display_name:
en: 'LIN'
fr: 'LIN'
de: 'LIN'

# Economy variant
eco:
comment:
en: 'Economy variant'
fr: 'Economy variant'
de: 'Economy Variante'
networks:
HS:
IS:
protocol: 'CAN'
# bitrate is probably 500 but i dont know for sure
display_name:
en: 'Inter-systems'
fr: 'Inter-systemes'
de: 'Interne Systeme'
LS:
HABITACLE:
protocol: 'CAN'
# bitrate is probably 125 but i dont know for sure
display_name:
en: 'Passenger compartment'
fr: 'Habitacle'
de: 'Fahrzeuginnenraum'
INFO-DIV:
protocol: 'CAN'
# bitrate is probably 125 but i dont know for sure
display_name:
en: 'Infotainement'
fr: 'Info-Divertissement'
de: 'Infotainment'
LIN:
LIN:
protocol: 'LIN'
display_name:
en: 'LIN'
fr: 'LIN'
de: 'LIN'

# Electric vehicles variant
ev:
Expand Down
4 changes: 4 additions & 0 deletions buses/AEE2004.full/HS.IS/072.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ length: 5
comment:
en: 'Immobilizer unlock request'
fr: 'Demande de debloquage anti-demarrage'
de: Wegfahrsperre Entsperranfrage
type: 'can'
periodicity: 'trigger'
senders:
Expand All @@ -19,13 +20,16 @@ signals:
0x00:
en: 'Unlocked'
fr: 'Deverouille'
de: Entsperrt
0x02:
en: 'Challenge'
fr: 'Challenge'
de: Aufgabe

SEED:
bits: '2.7-5.0'
type: 'uint'
comment:
en: 'Random seed'
fr: 'Challenge random'
de: Zufällige Aufgabe
43 changes: 43 additions & 0 deletions buses/AEE2004.full/HS.IS/092.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
id: 0x092
name: DIAGNOSTIC_DATA
length: 1
type: 'can'
periodicity: 100
comment:
fr: Cette trame est destinée à tous les ECU sur le bus IS qui ont besoin de savoir si les diagnostics sont actifs ou d'effacer les défauts
en: This can frame is for all ecus on the is bus which need to know if diagnostics are active or to clear faults
de: Dieser CAN-Frame dient dazu alle Steuergeräte am IS-Bus über diagnostische Informationen zu informieren um zum Beispiel alle Fehlercodes zu löschen.
senders:
- BSI
receivers: # Pretty much everything that has an fault storage / can have fault codes
- CMM
- ABS
- DAE

signals:
UNKNOWN_1:
bits: '1.7'
DIAGNOSTIC_MODE:
bits: '1.6'
values:
0x00:
en: Allowed
fr: Permis
de: Erlaubt
0x01:
en: Inhibited
fr: Inhibition
de: Verboten
UNKNOWN_2:
bits: 1.5-1.1
FAULT_CLEARING:
bits: '1.0'
values:
0x00:
en: Inactive
fr: Inactive
de: Inaktiv
0x01:
en: Clear fault memory
fr: Effacement memoire des defauts
de: Fehlerspeicher löschen
3 changes: 3 additions & 0 deletions buses/AEE2004.full/HS.IS/0A8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ length: 5
comment:
en: 'Immobilizer response request'
fr: 'Reponse anti-demarrage'
de: Wegfahrsperre Entsperrantwort
type: 'can'
periodicity: 'trigger'
senders:
Expand All @@ -19,10 +20,12 @@ signals:
0x00:
en: 'Response'
fr: 'Reponse'
de: Antwort

RESPONSE:
bits: '2.7-5.0'
type: 'uint'
comment:
en: 'Response = F(SEED)'
fr: 'Reponse = F(SEED)'
de: Antwort = F(SEED)
88 changes: 88 additions & 0 deletions buses/AEE2004.full/HS.IS/208.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
# TODO: check by someone whose french; this is mostly google translate
id: 0x208
name: GENERIC_ENGINE_DATA
alt_names: []
length: 8
comment:
en: 'Generic Engine Data'
fr: 'Données moteur génériques'
de: "Generelle Motordaten"
type: 'can'
periodicity: 10
senders:
- 'CMM' # logically its the only thing that has direct access to the sensors
receivers:
- 'BSI' # needs to gateway it to other buses

signals:
ENGINE_RPM:
bits: '1.7-2.0'
type: 'uint'
factor: 0.125
comment:
en: "Engine rotations per minute"
fr: "Regime moteur"
de: "Motordrehzahl"
min: 0
max: 8196
units: 'rpm'
UNKNOWN_1:
bits: '3.7-3.0'
THROTTLE_PERCENTAGE:
bits: '4.7-4.0'
type: 'uint'
factor: 0.5
comment:
en: "Throttle percentage"
fr: "Pourcentage d'accélération du volonte conducteur"
de: "Prozent an Motordrosselung"
min: 0
max: 100
UNKNOWN_2:
bits: '5.7-5.4'
CRUISE_CONTROL_STATUS:
bits: '5.3-5.2'
type: 'uint'
comment:
en: "Cruise control status"
fr: "État du régulateur de vitesse"
de: "Tempomat Status"
values:
0x0:
en: "Cruise control off"
fr: "régulateur de vitesse off"
de: "Tempomat aus"
0x1:
en: "Pedal mode"
fr: "Reprise pedale"
de: "Tempomat Pedal Modus"
0x2:
en: "Cruise control on"
fr: "régulateur de vitesse on"
de: "Tempomat an"
0x3:
en: "Not allowed"
fr: "Inhibee"
de: "Tempomat nicht erlaubt"
BREAKS_PRESSED:
bits: '5.1'
type: 'bool'
comment:
en: "Breake pressed"
fr: "Frein pressé"
de: "Bremse betätigt"
values:
0x0:
en: "Breakes released"
fr: "Frein relache"
de: "Bremse ausgelassen"
0x1:
en: "Breakes applied"
fr: "Frein appuye"
de: "Bremse angezogen"
UNKNOWN_3:
bits: '6.7-6.0'
UNKNOWN_4:
bits: '7.7-7.0'
UNKNOWN_5:
bits: '8.7-8.0'
33 changes: 33 additions & 0 deletions buses/AEE2004.full/HS.IS/2F5.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
id: 0x092
name: POWER_STEERING_STATUS
length: 7
type: 'can'
periodicity: 100
comment:
fr: Cadre pour les informations générales sur la direction assistée
en: Frame for general power steering information
de: Generelle Informationen über die elektronische Servolenkung
senders:
- DAE
receivers:
- BSI
# Maybe ABS because ESP uses steering information directly to allow for better correction or it may use 0x305

signals:
UNKNOWN_1:
bits: '1.7-1.0'
EXTERNAL_TORQUE_APPLYED:
bits: '2.7-2.0'
comment:
en: External Torque applied to the steering wheel f.e. from the driver
fr: Couple externe appliqué au volant, par exemple par le conducteur
de: Externes Drehmoment welches auf das Lenkrad wirkt. z.B. vom Fahrer
UNKNOWN_2:
bits: '3.7-3.0'
STEERING_COLUMN_ANGLE:
bits: '4.7-5.0'
UNKNOWN_3:
bits: '6.7-6.0'
UNKNOWN_4:
bits: '7.7-7.0'

Loading