diff --git a/board/boards/board_declarations.h b/board/boards/board_declarations.h index 623870a2..9655fc35 100644 --- a/board/boards/board_declarations.h +++ b/board/boards/board_declarations.h @@ -51,7 +51,6 @@ struct board { // These should match the enums in cereal/log.capnp and __init__.py #define HW_TYPE_UNKNOWN 0U #define HW_TYPE_RED_PANDA 7U -#define HW_TYPE_RED_PANDA_V2 8U #define HW_TYPE_TRES 9U #define HW_TYPE_CUATRO 10U diff --git a/board/drivers/fan_declarations.h b/board/drivers/fan_declarations.h index 4b7c1dc9..f130bc43 100644 --- a/board/drivers/fan_declarations.h +++ b/board/drivers/fan_declarations.h @@ -6,9 +6,6 @@ struct fan_state_t { uint16_t target_rpm; uint8_t power; float error_integral; - uint8_t stall_counter; - uint8_t stall_threshold; - uint8_t total_stall_count; uint8_t cooldown_counter; }; extern struct fan_state_t fan_state; diff --git a/board/jungle/__init__.py b/board/jungle/__init__.py index d3c8efec..b2d63f5d 100644 --- a/board/jungle/__init__.py +++ b/board/jungle/__init__.py @@ -37,6 +37,7 @@ class PandaJungle(Panda): HW_TYPE_V2 = b'\x02' H7_DEVICES = [HW_TYPE_V2, ] + SUPPORTED_DEVICES = H7_DEVICES HEALTH_PACKET_VERSION = 1 HEALTH_STRUCT = struct.Struct("get_button(); diff --git a/board/main.c b/board/main.c index 9bbe76e1..bb20c070 100644 --- a/board/main.c +++ b/board/main.c @@ -160,7 +160,7 @@ static void tick_handler(void) { #endif // set green LED to be controls allowed - led_set(LED_GREEN, controls_allowed | green_led_enabled); + led_set(LED_GREEN, controls_allowed); // turn off the blue LED, turned on by CAN // unless we are in power saving mode diff --git a/board/main_comms.h b/board/main_comms.h index 3be5c4af..5ea01ef1 100644 --- a/board/main_comms.h +++ b/board/main_comms.h @@ -300,10 +300,6 @@ int comms_control_handler(ControlPacket_t *req, uint8_t *resp) { case 0xf6: siren_enabled = (req->param1 != 0U); break; - // **** 0xf7: set green led enabled - case 0xf7: - green_led_enabled = (req->param1 != 0U); - break; // **** 0xf8: disable heartbeat checks case 0xf8: if (!is_car_safety_mode(current_safety_mode)) { diff --git a/board/main_declarations.h b/board/main_declarations.h index 227563a9..52aaa6c1 100644 --- a/board/main_declarations.h +++ b/board/main_declarations.h @@ -12,7 +12,6 @@ void pwm_set(TIM_TypeDef *TIM, uint8_t channel, uint8_t percentage); extern uint8_t hw_type; extern board *current_board; extern uint32_t uptime_cnt; -extern bool green_led_enabled; // heartbeat state extern uint32_t heartbeat_counter; diff --git a/board/main_definitions.h b/board/main_definitions.h index 137d9873..83c91090 100644 --- a/board/main_definitions.h +++ b/board/main_definitions.h @@ -4,7 +4,6 @@ uint8_t hw_type = 0; board *current_board; uint32_t uptime_cnt = 0; -bool green_led_enabled = false; // heartbeat state uint32_t heartbeat_counter = 0; diff --git a/python/__init__.py b/python/__init__.py index 3c5826ff..cde75637 100644 --- a/python/__init__.py +++ b/python/__init__.py @@ -127,9 +127,9 @@ class Panda: CAN_HEALTH_STRUCT = struct.Struct("