mirror of
https://github.com/MoreTore/openpilot.git
synced 2026-09-27 01:44:01 +08:00
manual transmission
This commit is contained in:
@@ -573,6 +573,7 @@ std::unordered_map<std::string, uint32_t> keys = {
|
||||
{"ExperimentalLongTune", PERSISTENT},
|
||||
{"LongOutputGain", PERSISTENT},
|
||||
{"BlendedACC", PERSISTENT},
|
||||
{"ManualTransmission", PERSISTENT},
|
||||
};
|
||||
|
||||
} // namespace
|
||||
|
||||
@@ -457,10 +457,10 @@ BO_ 533 WHEEL_SPEEDS: 8 XXX
|
||||
BO_ 535 SPEED: 8 XXX
|
||||
SG_ SPEED : 39|16@0+ (0.01,0) [0|65535] "" XXX
|
||||
|
||||
BO_ 537 NEW_MSG_38: 8 XXX
|
||||
BO_ 537 MANUAL_GEAR: 8 XXX
|
||||
SG_ NEW_SIGNAL_2 : 7|16@0+ (1,0) [0|65535] "" XXX
|
||||
SG_ NEW_SIGNAL_3 : 23|16@0+ (1,0) [0|65535] "" XXX
|
||||
SG_ GEAR_RELATED : 39|8@0+ (1,0) [0|255] "" XXX
|
||||
SG_ GEAR : 33|2@0+ (1,0) [0|255] "" XXX
|
||||
SG_ NEW_SIGNAL_4 : 55|16@0+ (1,0) [0|65535] "" XXX
|
||||
|
||||
BO_ 544 ACC: 8 XXX
|
||||
@@ -630,6 +630,7 @@ BO_ 1868 EPS_FEEDBACK3: 8 XXX
|
||||
CM_ SG_ 31 GEAR "13-P, 12-R, 11-N, 1-6-D";
|
||||
VAL_ 31 GEAR 13 "P" 12 "R" 11 "N" 1 "D" 2 "D" 3 "D" 4 "D" 5 "D" 6 "D";
|
||||
VAL_ 552 GEAR 13 "P" 12 "R" 11 "N" 1 "D" 2 "D" 3 "D" 4 "D" 5 "D" 6 "D";
|
||||
VAL_ 537 GEAR 0 "P" 1 "D" 2 "R";
|
||||
VAL_ 552 GEAR_SHIFT 6 "6th" 5 "5th" 4 "4th" 3 "3rd" 2 "2nd" 1 "1st" 14 "Shift" 13 "Park" 11 "Neutral" 12 "Reverse";
|
||||
VAL_ 1098 CRZ_STATE 0 "CRUISE_DISABLED" 1 "CRUISE_READY" 2 "CRUISE_ENABLED" 4 "GAS_OVERRIDE";
|
||||
VAL_ 1098 DISTANCE_SETTING 4 "CLOSE" 3 "MEDIUM_CLOSE" 2 "MEDIUM_FAR" 1 "FAR" 0 "ACC_DISABLED";
|
||||
|
||||
@@ -12,6 +12,8 @@ class CarState(CarStateBase):
|
||||
|
||||
can_define = CANDefine(DBC[CP.carFingerprint]["pt"])
|
||||
self.shifter_values = can_define.dv["GEAR"]["GEAR"]
|
||||
if CP.flags & MazdaFlags.MANUAL_TRANSMISSION:
|
||||
self.shifter_values = can_define.dv["MANUAL_GEAR"]["GEAR"]
|
||||
|
||||
self.crz_btns_counter = 0
|
||||
self.acc_active_last = False
|
||||
@@ -303,6 +305,11 @@ class CarState(CarStateBase):
|
||||
("SPEED", 50),
|
||||
]
|
||||
|
||||
if CP.flags & MazdaFlags.MANUAL_TRANSMISSION:
|
||||
messages += [
|
||||
("MANUAL_GEAR", 50)
|
||||
]
|
||||
|
||||
return CANParser(DBC[CP.carFingerprint]["pt"], messages, 2)
|
||||
|
||||
@staticmethod
|
||||
|
||||
@@ -45,6 +45,8 @@ class CarInterface(CarInterfaceBase):
|
||||
if p.get_bool("NoFSC"): # No Front Sensing Camera
|
||||
ret.flags |= MazdaFlags.NO_FSC.value
|
||||
ret.safetyConfigs[0].safetyParam |= Panda.FLAG_MAZDA_NO_FSC
|
||||
if p.get_bool("ManualTransmission"):
|
||||
ret.flags |= MazdaFlags.MANUAL_TRANSMISSION.value
|
||||
|
||||
ret.steerActuatorDelay = 0.1
|
||||
|
||||
|
||||
@@ -66,6 +66,7 @@ class MazdaFlags(IntFlag):
|
||||
RADAR_INTERCEPTOR = 8
|
||||
NO_FSC = 16
|
||||
NO_MRCC = 32
|
||||
MANUAL_TRANSMISSION = 64
|
||||
|
||||
@dataclass
|
||||
class MazdaPlatformConfig(PlatformConfig):
|
||||
|
||||
@@ -84,6 +84,12 @@ TogglesPanel::TogglesPanel(SettingsWindow *parent) : ListWidget(parent) {
|
||||
tr("Enable if your car does not have stock FSC."),
|
||||
"../assets/offroad/icon_openpilot.png",
|
||||
},
|
||||
{
|
||||
"ManualTransmission",
|
||||
tr("Manual Transmission"),
|
||||
tr("Enable if your is a manual."),
|
||||
"../assets/offroad/icon_openpilot.png",
|
||||
},
|
||||
{
|
||||
"DisengageOnAccelerator",
|
||||
tr("Disengage on Accelerator Pedal"),
|
||||
|
||||
Reference in New Issue
Block a user