Skip to content

Commit 8cc3a35

Browse files
remove cadillac (#496)
1 parent 62e4d3c commit 8cc3a35

File tree

7 files changed

+0
-347
lines changed

7 files changed

+0
-347
lines changed

board/drivers/can.h

-5
Original file line numberDiff line numberDiff line change
@@ -361,11 +361,6 @@ void ignition_can_hook(CAN_FIFOMailBox_TypeDef *to_push) {
361361
// GTW_status
362362
ignition_can = (GET_BYTE(to_push, 0) & 0x1) != 0;
363363
}
364-
// Cadillac exception
365-
if ((addr == 0x160) && (len == 5)) {
366-
// this message isn't all zeros when ignition is on
367-
ignition_can = GET_BYTES_04(to_push) != 0;
368-
}
369364
}
370365
}
371366

board/safety.h

-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#include "safety/safety_gm_ascm.h"
99
#include "safety/safety_gm.h"
1010
#include "safety/safety_ford.h"
11-
#include "safety/safety_cadillac.h"
1211
#include "safety/safety_hyundai.h"
1312
#include "safety/safety_chrysler.h"
1413
#include "safety/safety_subaru.h"
@@ -25,7 +24,6 @@
2524
#define SAFETY_GM 4U
2625
#define SAFETY_HONDA_BOSCH_GIRAFFE 5U
2726
#define SAFETY_FORD 6U
28-
#define SAFETY_CADILLAC 7U
2927
#define SAFETY_HYUNDAI 8U
3028
#define SAFETY_CHRYSLER 9U
3129
#define SAFETY_TESLA 10U
@@ -216,7 +214,6 @@ const safety_hook_config safety_hook_registry[] = {
216214
{SAFETY_VOLKSWAGEN_PQ, &volkswagen_pq_hooks},
217215
{SAFETY_NOOUTPUT, &nooutput_hooks},
218216
#ifdef ALLOW_DEBUG
219-
{SAFETY_CADILLAC, &cadillac_hooks},
220217
{SAFETY_TESLA, &tesla_hooks},
221218
{SAFETY_NISSAN, &nissan_hooks},
222219
{SAFETY_ALLOUTPUT, &alloutput_hooks},

board/safety/safety_cadillac.h

-125
This file was deleted.

python/__init__.py

-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ class Panda(object):
117117
SAFETY_GM = 4
118118
SAFETY_HONDA_BOSCH_GIRAFFE = 5
119119
SAFETY_FORD = 6
120-
SAFETY_CADILLAC = 7
121120
SAFETY_HYUNDAI = 8
122121
SAFETY_CHRYSLER = 9
123122
SAFETY_TESLA = 10

tests/safety/libpandasafety_py.py

-5
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,6 @@
6262
void set_honda_alt_brake_msg(bool);
6363
int get_honda_hw(void);
6464
65-
void init_tests_cadillac(void);
66-
void set_cadillac_desired_torque_last(int t);
67-
void set_cadillac_rt_torque_last(int t);
68-
void set_cadillac_torque_driver(int min, int max);
69-
7065
void init_tests_gm(void);
7166
void set_gm_desired_torque_last(int t);
7267
void set_gm_rt_torque_last(int t);

tests/safety/test.c

-24
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ typedef struct
2424
} TIM_TypeDef;
2525

2626
struct sample_t toyota_torque_meas;
27-
struct sample_t cadillac_torque_driver;
2827
struct sample_t gm_torque_driver;
2928
struct sample_t hyundai_torque_driver;
3029
struct sample_t chrysler_torque_meas;
@@ -147,11 +146,6 @@ void set_toyota_torque_meas(int min, int max){
147146
toyota_torque_meas.max = max;
148147
}
149148

150-
void set_cadillac_torque_driver(int min, int max){
151-
cadillac_torque_driver.min = min;
152-
cadillac_torque_driver.max = max;
153-
}
154-
155149
void set_gm_torque_driver(int min, int max){
156150
gm_torque_driver.min = min;
157151
gm_torque_driver.max = max;
@@ -200,10 +194,6 @@ void set_toyota_rt_torque_last(int t){
200194
toyota_rt_torque_last = t;
201195
}
202196

203-
void set_cadillac_rt_torque_last(int t){
204-
cadillac_rt_torque_last = t;
205-
}
206-
207197
void set_gm_rt_torque_last(int t){
208198
gm_rt_torque_last = t;
209199
}
@@ -228,10 +218,6 @@ void set_toyota_desired_torque_last(int t){
228218
toyota_desired_torque_last = t;
229219
}
230220

231-
void set_cadillac_desired_torque_last(int t){
232-
for (int i = 0; i < 4; i++) cadillac_desired_torque_last[i] = t;
233-
}
234-
235221
void set_gm_desired_torque_last(int t){
236222
gm_desired_torque_last = t;
237223
}
@@ -295,16 +281,6 @@ void init_tests_toyota(void){
295281
set_timer(0);
296282
}
297283

298-
void init_tests_cadillac(void){
299-
init_tests();
300-
cadillac_torque_driver.min = 0;
301-
cadillac_torque_driver.max = 0;
302-
for (int i = 0; i < 4; i++) cadillac_desired_torque_last[i] = 0;
303-
cadillac_rt_torque_last = 0;
304-
cadillac_ts_last = 0;
305-
set_timer(0);
306-
}
307-
308284
void init_tests_gm(void){
309285
init_tests();
310286
gm_torque_driver.min = 0;

0 commit comments

Comments
 (0)