mirror of
https://github.com/firestar5683/StarPilot.git
synced 2026-08-31 05:03:42 +08:00
Compare commits
77 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 4676f5040e | |||
| 157f2e87bb | |||
| 30292fc0c6 | |||
| 6e1a7c31b3 | |||
| 8442ffe591 | |||
| 447b0bb45e | |||
| 79134158d9 | |||
| 99474cee8e | |||
| 8dd6090ef3 | |||
| d95713f4d1 | |||
| 83cb43b89b | |||
| ea45cbe017 | |||
| 63d383b25d | |||
| b4062aee1e | |||
| d5370e728e | |||
| 8a250d2858 | |||
| c3e1e7288d | |||
| 0b9580bef9 | |||
| 5bad879e55 | |||
| a074f21a22 | |||
| e48ba846f2 | |||
| fb925bed9e | |||
| f5defdaf2b | |||
| 99bbbdecc7 | |||
| 234d0fd839 | |||
| 53f07efbea | |||
| 326d151c22 | |||
| 0e804a744d | |||
| 4198a0b5b3 | |||
| 7a9cad491e | |||
| 5b2a526187 | |||
| f6a713430f | |||
| 57df9bcb8f | |||
| 0ad3c7d2ad | |||
| 8730738d75 | |||
| 5add756e0b | |||
| 0561c28111 | |||
| 7d0ad593f8 | |||
| 8630c5d515 | |||
| 9f24290bfd | |||
| 35b2647d5f | |||
| 0cc453e26b | |||
| a49352e93d | |||
| e45f9f0c71 | |||
| 7fa7f1e9f7 | |||
| 60bd28ff13 | |||
| c71f77ad83 | |||
| 2db997763b | |||
| a22f6f8a9f | |||
| a248ab5af4 | |||
| a7b04eb17a | |||
| 0566438f2b | |||
| 07deeea206 | |||
| 2379303a47 | |||
| 52881ebf63 | |||
| 3b744c4a1b | |||
| 5ed463c519 | |||
| d5eff476f8 | |||
| c7ca8a893e | |||
| 06bf8e1f68 | |||
| 56514aecf4 | |||
| 7664f0286e | |||
| a8ab890526 | |||
| 6a9beeffab | |||
| 377e358a2d | |||
| 334cb46f6a | |||
| 123989746d | |||
| 376aeb5abd | |||
| bb15212f7a | |||
| 9cc903bd0f | |||
| 7bbc404d7a | |||
| d10305b1df | |||
| 8399fbf4d5 | |||
| e87c44079c | |||
| 499330da52 | |||
| 6bc3bf50d8 | |||
| 2fa7f4e625 |
Binary file not shown.
|
Before Width: | Height: | Size: 858 KiB After Width: | Height: | Size: 503 KiB |
@@ -620,9 +620,9 @@ class FrogPilotVariables:
|
||||
toggle.steer_offset = np.clip(params.get_float("SteerOffset"), -0.2, 0.2) if advanced_lateral_tuning and tuning_level >= level["SteerOffset"] and toggle.car_make == "gm" else 0.0
|
||||
toggle.use_custom_friction = bool(round(toggle.friction, 2) != round(friction, 2)) and is_torque_car and not toggle.force_auto_tune or toggle.force_auto_tune_off
|
||||
toggle.steerKp = [[0], [np.clip(params.get_float("SteerKP"), steerKp * 0.5, steerKp * 1.5) if advanced_lateral_tuning and is_torque_car and tuning_level >= level["SteerKP"] else steerKp]]
|
||||
toggle.latAccelFactor = np.clip(params.get_float("SteerLatAccel"), latAccelFactor * 0.5, latAccelFactor * 1.25) if advanced_lateral_tuning and tuning_level >= level["SteerLatAccel"] else latAccelFactor
|
||||
toggle.latAccelFactor = np.clip(params.get_float("SteerLatAccel"), latAccelFactor * 0.75, latAccelFactor * 1.25) if advanced_lateral_tuning and tuning_level >= level["SteerLatAccel"] else latAccelFactor
|
||||
toggle.use_custom_latAccelFactor = bool(round(toggle.latAccelFactor, 2) != round(latAccelFactor, 2)) and is_torque_car and not toggle.force_auto_tune or toggle.force_auto_tune_off
|
||||
toggle.steerRatio = np.clip(params.get_float("SteerRatio"), steerRatio * 0.25, steerRatio * 1.5) if advanced_lateral_tuning and tuning_level >= level["SteerRatio"] else steerRatio
|
||||
toggle.steerRatio = np.clip(params.get_float("SteerRatio"), steerRatio * 0.5, steerRatio * 1.5) if advanced_lateral_tuning and tuning_level >= level["SteerRatio"] else steerRatio
|
||||
toggle.use_custom_steerRatio = bool(round(toggle.steerRatio, 2) != round(steerRatio, 2)) and not toggle.force_auto_tune or toggle.force_auto_tune_off
|
||||
|
||||
advanced_longitudinal_tuning = params.get_bool("AdvancedLongitudinalTune") if tuning_level >= level["AdvancedLongitudinalTune"] else default.get_bool("AdvancedLongitudinalTune")
|
||||
|
||||
@@ -96,10 +96,10 @@ FrogPilotLateralPanel::FrogPilotLateralPanel(FrogPilotSettingsWindow *parent) :
|
||||
lateralToggle = new FrogPilotParamValueButtonControl(param, title, desc, icon, parent->steerKp * 0.5, parent->steerKp * 1.5, QString(), std::map<float, QString>(), 0.01, false, {}, steerKPButton, false, false);
|
||||
} else if (param == "SteerLatAccel") {
|
||||
std::vector<QString> steerLatAccelButton{"Reset"};
|
||||
lateralToggle = new FrogPilotParamValueButtonControl(param, title, desc, icon, parent->latAccelFactor * 0.5, parent->latAccelFactor * 1.25, QString(), std::map<float, QString>(), 0.01, false, {}, steerLatAccelButton, false, false);
|
||||
lateralToggle = new FrogPilotParamValueButtonControl(param, title, desc, icon, parent->latAccelFactor * 0.75, parent->latAccelFactor * 1.25, QString(), std::map<float, QString>(), 0.01, false, {}, steerLatAccelButton, false, false);
|
||||
} else if (param == "SteerRatio") {
|
||||
std::vector<QString> steerRatioButton{"Reset"};
|
||||
lateralToggle = new FrogPilotParamValueButtonControl(param, title, desc, icon, parent->steerRatio * 0.25, parent->steerRatio * 1.5, QString(), std::map<float, QString>(), 0.01, false, {}, steerRatioButton, false, false);
|
||||
lateralToggle = new FrogPilotParamValueButtonControl(param, title, desc, icon, parent->steerRatio * 0.5, parent->steerRatio * 1.5, QString(), std::map<float, QString>(), 0.01, false, {}, steerRatioButton, false, false);
|
||||
|
||||
} else if (param == "AlwaysOnLateral") {
|
||||
FrogPilotManageControl *aolToggle = new FrogPilotManageControl(param, title, desc, icon);
|
||||
@@ -271,9 +271,9 @@ void FrogPilotLateralPanel::showEvent(QShowEvent *event) {
|
||||
steerKPToggle->setTitle(QString(tr("Kp Factor (Default: %1)")).arg(QString::number(parent->steerKp, 'f', 2)));
|
||||
steerKPToggle->updateControl(parent->steerKp * 0.5, parent->steerKp * 1.5);
|
||||
steerLatAccelToggle->setTitle(QString(tr("Lateral Accel (Default: %1)")).arg(QString::number(parent->latAccelFactor, 'f', 2)));
|
||||
steerLatAccelToggle->updateControl(parent->latAccelFactor * 0.5, parent->latAccelFactor * 1.25);
|
||||
steerLatAccelToggle->updateControl(parent->latAccelFactor * 0.75, parent->latAccelFactor * 1.25);
|
||||
steerRatioToggle->setTitle(QString(tr("Steer Ratio (Default: %1)")).arg(QString::number(parent->steerRatio, 'f', 2)));
|
||||
steerRatioToggle->updateControl(parent->steerRatio * 0.25, parent->steerRatio * 1.5);
|
||||
steerRatioToggle->updateControl(parent->steerRatio * 0.5, parent->steerRatio * 1.5);
|
||||
|
||||
updateToggles();
|
||||
}
|
||||
|
||||
@@ -233,7 +233,7 @@ BO_ 715 ASCMGasRegenCmd: 8 K124_ASCM
|
||||
SG_ GasRegenCmdActive : 0|1@0+ (1,0) [0|0] "" NEO
|
||||
SG_ RollingCounter : 7|2@0+ (1,0) [0|0] "" NEO
|
||||
SG_ GasRegenAlwaysOne3 : 23|1@0+ (1,0) [0|1] "" NEO
|
||||
SG_ GasRegenCmd : 22|12@0+ (1,0) [0|0] "" NEO
|
||||
SG_ GasRegenCmd : 8|14@0+ (1,0) [0|0] "" NEO
|
||||
|
||||
BO_ 717 ASCM_2CD: 5 K124_ASCM
|
||||
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 671 KiB After Width: | Height: | Size: 418 KiB |
@@ -43,7 +43,7 @@ legend = ["LAT_ACCEL_FACTOR", "MAX_LAT_ACCEL_MEASURED", "FRICTION"]
|
||||
"CADILLAC_ESCALADE" = [1.899999976158142, 1.842270016670227, 0.1120000034570694]
|
||||
"CADILLAC_ESCALADE_ESV_2019" = [1.15, 1.3, 0.2]
|
||||
"CADILLAC_XT4" = [1.45, 1.6, 0.2]
|
||||
"CHEVROLET_BOLT_EUV" = [2.0, 2.0, 0.09]
|
||||
"CHEVROLET_BOLT_EUV" = [2.0, 2.0, 0.05]
|
||||
"CHEVROLET_MALIBU_CC" = [1.85, 1.85, 0.075]
|
||||
"CHEVROLET_SILVERADO" = [1.9, 1.9, 0.112]
|
||||
"CHEVROLET_TRAILBLAZER" = [1.33, 1.9, 0.16]
|
||||
|
||||
@@ -135,7 +135,7 @@ def main():
|
||||
CP = msg
|
||||
cloudlog.info("paramsd got CarParams")
|
||||
|
||||
min_sr, max_sr = 0.25 * CP.steerRatio, 2.0 * CP.steerRatio
|
||||
min_sr, max_sr = 0.5 * CP.steerRatio, 2.0 * CP.steerRatio
|
||||
|
||||
params = params_reader.get("LiveParameters")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user