Skip to content

Commit bf70f51

Browse files
author
Commaremote
committed
Safety: increase buffer for sampled signals. TBD a violation feedback from board to prevent car faults
1 parent b0541a8 commit bf70f51

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

board/safety.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// sample struct that keeps 3 samples in memory
22
struct sample_t {
3-
int values[3];
3+
int values[6];
44
int min;
55
int max;
6-
} sample_t_default = {{0, 0, 0}, 0, 0};
6+
} sample_t_default = {{0}, 0, 0};
77

88
void safety_rx_hook(CAN_FIFOMailBox_TypeDef *to_push);
99
int safety_tx_hook(CAN_FIFOMailBox_TypeDef *to_send);

board/safety/safety_cadillac.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ static void cadillac_rx_hook(CAN_FIFOMailBox_TypeDef *to_push) {
3030
if (addr == 356) {
3131
int torque_driver_new = ((to_push->RDLR & 0x7) << 8) | ((to_push->RDLR >> 8) & 0xFF);
3232
torque_driver_new = to_signed(torque_driver_new, 11);
33-
34-
// update array of sample
33+
// update array of samples
3534
update_sample(&cadillac_torque_driver, torque_driver_new);
3635
}
3736

tests/safety/test_toyota.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def _torque_driver_msg(self, torque):
6262
return to_send
6363

6464
def _torque_driver_msg_array(self, torque):
65-
for i in range(3):
65+
for i in range(6):
6666
self.safety.toyota_ipas_rx_hook(self._torque_driver_msg(torque))
6767

6868
def _angle_meas_msg(self, angle):
@@ -74,7 +74,7 @@ def _angle_meas_msg(self, angle):
7474
return to_send
7575

7676
def _angle_meas_msg_array(self, angle):
77-
for i in range(3):
77+
for i in range(6):
7878
self.safety.toyota_ipas_rx_hook(self._angle_meas_msg(angle))
7979

8080
def _torque_msg(self, torque):
@@ -229,6 +229,9 @@ def test_torque_measurements(self):
229229
self.safety.toyota_rx_hook(self._torque_meas_msg(50))
230230
self.safety.toyota_rx_hook(self._torque_meas_msg(-50))
231231
self.safety.toyota_rx_hook(self._torque_meas_msg(0))
232+
self.safety.toyota_rx_hook(self._torque_meas_msg(0))
233+
self.safety.toyota_rx_hook(self._torque_meas_msg(0))
234+
self.safety.toyota_rx_hook(self._torque_meas_msg(0))
232235

233236
self.assertEqual(-51, self.safety.get_torque_meas_min())
234237
self.assertEqual(51, self.safety.get_torque_meas_max())

0 commit comments

Comments
 (0)