zhudongjer/carrot
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

add mazda info

Browse Source
This commit is contained in:
机械小鸽 2025-03-01 22:05:16 +08:00 committed by GitHub
parent 4483bb7a73
commit aacaef9a2c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
opendbc_repo/opendbc/car/mazda/carstate.py
View File

@ -21,9 +21,10 @@ class CarState(CarStateBase):
self.low_speed_alert = False self.low_speed_alert = False
self.lkas_allowed_speed = False self.lkas_allowed_speed = False
self.lkas_disabled = False self.lkas_disabled = False
self.prev_distance_button = 0 self.prev_distance_button = 0
self.distance_button = 0 self.distance_button = 0
self.pcmCruiseGap = 0 # copy from Hyundai
def update(self, can_parsers) -> structs.CarState: def update(self, can_parsers) -> structs.CarState:
cp = can_parsers[Bus.pt] cp = can_parsers[Bus.pt]
@ -33,7 +34,7 @@ class CarState(CarStateBase):
self.prev_distance_button = self.distance_button self.prev_distance_button = self.distance_button
self.distance_button = cp.vl["CRZ_BTNS"]["DISTANCE_LESS"] self.distance_button = cp.vl["CRZ_BTNS"]["DISTANCE_LESS"]
self.prev_cruise_buttons = self.cruise_buttons self.prev_cruise_buttons = self.cruise_buttons
if bool(cp.vl["CRZ_BTNS"]["SET_P"]): if bool(cp.vl["CRZ_BTNS"]["SET_P"]):
@ -44,7 +45,7 @@ class CarState(CarStateBase):
self.cruise_buttons = Buttons.RESUME self.cruise_buttons = Buttons.RESUME
else: else:
self.cruise_buttons = Buttons.NONE self.cruise_buttons = Buttons.NONE
ret.wheelSpeeds = self.get_wheel_speeds( ret.wheelSpeeds = self.get_wheel_speeds(
cp.vl["WHEEL_SPEEDS"]["FL"], cp.vl["WHEEL_SPEEDS"]["FL"],
cp.vl["WHEEL_SPEEDS"]["FR"], cp.vl["WHEEL_SPEEDS"]["FR"],
@ -61,6 +62,9 @@ class CarState(CarStateBase):
can_gear = int(cp.vl["GEAR"]["GEAR"]) can_gear = int(cp.vl["GEAR"]["GEAR"])
ret.gearShifter = self.parse_gear_shifter(self.shifter_values.get(can_gear, None)) ret.gearShifter = self.parse_gear_shifter(self.shifter_values.get(can_gear, None))
ret.gearStep = cp.vl["GEAR"]["GEAR_BOX"] ret.gearStep = cp.vl["GEAR"]["GEAR_BOX"]
ret.engineRpm = cp.vl["ENGINE_DATA"]["RPM"] # for mazda RPM
ret.pcmCruiseGap = cp.vl["CRZ_CTRL"]["DISTANCE_SETTING"] # copy from Hyundai
ret.genericToggle = bool(cp.vl["BLINK_INFO"]["HIGH_BEAMS"]) ret.genericToggle = bool(cp.vl["BLINK_INFO"]["HIGH_BEAMS"])
ret.leftBlindspot = cp.vl["BSM"]["LEFT_BS_STATUS"] != 0 ret.leftBlindspot = cp.vl["BSM"]["LEFT_BS_STATUS"] != 0
@ -135,7 +139,7 @@ class CarState(CarStateBase):
self.lkas_previously_enabled = self.lkas_enabled self.lkas_previously_enabled = self.lkas_enabled
self.lkas_enabled = not self.lkas_disabled self.lkas_enabled = not self.lkas_disabled
# TODO: add button types for inc and dec # TODO: add button types for inc and dec
#ret.buttonEvents = create_button_events(self.distance_button, prev_distance_button, {1: ButtonType.gapAdjustCruise}) #ret.buttonEvents = create_button_events(self.distance_button, prev_distance_button, {1: ButtonType.gapAdjustCruise})
ret.buttonEvents = [ ret.buttonEvents = [

2
selfdrive/frogpilot/fleetmanager/fleet_manager.py
View File

@ -490,7 +490,7 @@ def carinfo():
"Running Status": "Moving" if is_car_started else "Stopped", "Running Status": "Moving" if is_car_started else "Stopped",
"Cruise System": "Enabled" if is_car_engaged else "Disabled", "Cruise System": "Enabled" if is_car_engaged else "Disabled",
"Current Speed": f"{CS.vEgo * 3.6:.1f} km/h", "Current Speed": f"{CS.vEgo * 3.6:.1f} km/h",
"Engine RPM": f"{CS.engineRPM:.0f} RPM" if hasattr(CS, 'engineRPM') and CS.engineRPM > 0 else "Unknown", "Engine RPM": f"{CS.engineRpm:.0f} RPM" if hasattr(CS, 'engineRpm') and CS.engineRpm > 0 else "Unknown", # Rpm, not RPM
"Gear Position": str(CS.gearShifter) if hasattr(CS, 'gearShifter') else "Unknown" "Gear Position": str(CS.gearShifter) if hasattr(CS, 'gearShifter') else "Unknown"
}, },
"Basic Information": { "Basic Information": {