setChecked activates buttonToggled and already writes param!

pull/31792/head
Shane Smiskol 1 year ago
parent 0f93c04628
commit cb8dc633e9
  1. 4
      selfdrive/controls/lib/longitudinal_planner.py
  2. 2
      selfdrive/ui/qt/offroad/settings.cc
  3. 8
      selfdrive/ui/qt/widgets/controls.h

@ -74,9 +74,6 @@ class LongitudinalPlanner:
except (ValueError, TypeError): except (ValueError, TypeError):
self.personality = log.LongitudinalPersonality.standard self.personality = log.LongitudinalPersonality.standard
def write_param(self):
self.params.put('LongitudinalPersonality', self.personality)
@staticmethod @staticmethod
def parse_model(model_msg, model_error): def parse_model(model_msg, model_error):
if (len(model_msg.position.x) == 33 and if (len(model_msg.position.x) == 33 and
@ -101,7 +98,6 @@ class LongitudinalPlanner:
for m in messaging.drain_sock(carState_sock, wait_for_one=False): for m in messaging.drain_sock(carState_sock, wait_for_one=False):
if any(not be.pressed and be.type == ButtonType.gapAdjustCruise for be in m.carState.buttonEvents): if any(not be.pressed and be.type == ButtonType.gapAdjustCruise for be in m.carState.buttonEvents):
self.personality = (self.personality - 1) % 3 self.personality = (self.personality - 1) % 3
self.write_param()
self.param_read_counter += 1 self.param_read_counter += 1
self.mpc.mode = 'blended' if sm['controlsState'].experimentalMode else 'acc' self.mpc.mode = 'blended' if sm['controlsState'].experimentalMode else 'acc'

@ -129,6 +129,7 @@ void TogglesPanel::showEvent(QShowEvent *event) {
} }
void TogglesPanel::updatePersonalitySetting(int personality) { void TogglesPanel::updatePersonalitySetting(int personality) {
// Update the personality setting in the UI + write param
qDebug() << "updatePersonalitySetting" << personality; qDebug() << "updatePersonalitySetting" << personality;
long_personality_setting->setActiveButton(personality); long_personality_setting->setActiveButton(personality);
} }
@ -373,7 +374,6 @@ void SettingsWindow::updateState(const UIState &s) {
qDebug() << "Personality updated"; qDebug() << "Personality updated";
emit updatePersonalitySetting(static_cast<int>(personality)); emit updatePersonalitySetting(static_cast<int>(personality));
} }
// s.scene.personality = personality;
uiState()->scene.personality = personality; uiState()->scene.personality = personality;
} }
} }

@ -230,16 +230,16 @@ public:
}); });
} }
void setActiveButton(int id) {
button_group->button(id)->setChecked(true);
}
void setEnabled(bool enable) { void setEnabled(bool enable) {
for (auto btn : button_group->buttons()) { for (auto btn : button_group->buttons()) {
btn->setEnabled(enable); btn->setEnabled(enable);
} }
} }
void setActiveButton(int id) {
button_group->button(id)->setChecked(true);
}
private: private:
std::string key; std::string key;
Params params; Params params;

Loading…
Cancel
Save