From 35419f7b56f5766b72b0cf99939322e6a069fb0d Mon Sep 17 00:00:00 2001 From: quintaye Date: Fri, 6 Nov 2026 02:38:50 -0700 Subject: [PATCH 1/3] Add TEL current message to cascadia.dbc --- dbc/cascadia.dbc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dbc/cascadia.dbc b/dbc/cascadia.dbc index 2382568e..2d1d9d3b 100644 --- a/dbc/cascadia.dbc +++ b/dbc/cascadia.dbc @@ -463,6 +463,12 @@ BO_ 931 DistCurrents: 5 DIST BO_ 932 DISTBranchId: 1 DIST SG_ DISTBranchId : 0|8@1+ (1,0) [0|255] "" Vector__XXX +BO_ 933 DIST_COMMIT_HASH_ID: 8 DIST + SG_ DIST_COMMIT_HASH_IDSig278 : 1|1@0+ (1,0) [0|1] "" Vector__XXX + +BO_ 934 DISTTelemetryCurrent: 1 DIST + SG_ TELCurrent : 1|1@0+ (1,0) [0|65535] "mA" Vector__XXX + BO_ 1025 MotorCommand: 5 DRD SG_ ThrottleDAC : 0|16@1+ (1,0) [0|1023] "" MDI SG_ RegenDAC : 16|16@1+ (1,0) [0|1023] "" MDI From 3ef821061956d852ca98aac84b78bcbfe006fdf5 Mon Sep 17 00:00:00 2001 From: quintaye Date: Mon, 9 Nov 2026 14:28:53 -0700 Subject: [PATCH 2/3] Update message SG to 2 bytes 16 bits --- dbc/cascadia.dbc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dbc/cascadia.dbc b/dbc/cascadia.dbc index 2d1d9d3b..f4b13834 100644 --- a/dbc/cascadia.dbc +++ b/dbc/cascadia.dbc @@ -466,8 +466,8 @@ BO_ 932 DISTBranchId: 1 DIST BO_ 933 DIST_COMMIT_HASH_ID: 8 DIST SG_ DIST_COMMIT_HASH_IDSig278 : 1|1@0+ (1,0) [0|1] "" Vector__XXX -BO_ 934 DISTTelemetryCurrent: 1 DIST - SG_ TELCurrent : 1|1@0+ (1,0) [0|65535] "mA" Vector__XXX +BO_ 934 DIST_TEL_CURRENT: 2 DIST + SG_ TEL_Current : 7|16@0+ (1,0) [0|65535] "mA" Vector__XXX BO_ 1025 MotorCommand: 5 DRD SG_ ThrottleDAC : 0|16@1+ (1,0) [0|1023] "" MDI From 6da1463d78d3f41a23b26cc7bf07f018e819b52d Mon Sep 17 00:00:00 2001 From: quintaye Date: Mon, 9 Nov 2026 14:56:00 -0700 Subject: [PATCH 3/3] Actually resolved merging conflict --- dbc/cascadia.dbc | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dbc/cascadia.dbc b/dbc/cascadia.dbc index b9600261..fbfb3986 100644 --- a/dbc/cascadia.dbc +++ b/dbc/cascadia.dbc @@ -480,17 +480,12 @@ BO_ 931 DistCurrents: 5 DIST BO_ 932 DISTBranchId: 1 DIST SG_ DISTBranchId : 0|8@1+ (1,0) [0|255] "" Vector__XXX -<<<<<<< HEAD -BO_ 933 DIST_COMMIT_HASH_ID: 8 DIST - SG_ DIST_COMMIT_HASH_IDSig278 : 1|1@0+ (1,0) [0|1] "" Vector__XXX - -BO_ 934 DIST_TEL_CURRENT: 2 DIST - SG_ TEL_Current : 7|16@0+ (1,0) [0|65535] "mA" Vector__XXX -======= BO_ 933 DISTCommitHash: 5 DIST SG_ DISTCommitHash : 7|32@0+ (1,0) [0|4.29497e+09] "" Vector__XXX SG_ DISTCommitDirty : 32|1@1+ (1,0) [0|1] "" Vector__XXX ->>>>>>> origin + +BO_ 934 DIST_TEL_CURRENT: 2 DIST + SG_ TEL_Current : 7|16@0+ (1,0) [0|65535] "mA" Vector__XXX BO_ 1025 MotorCommand: 5 DRD SG_ ThrottleDAC : 0|16@1+ (1,0) [0|1023] "" MDI