brianhansonxyz/clearpilot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Your Name
2024-05-17 10:46:45 -05:00
parent 4815ffd989
commit 54a65f1697
2 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
selfdrive/ui/qt/sidebar.cc
View File

@@ -28,7 +28,7 @@ Sidebar::Sidebar(QWidget *parent) : QFrame(parent), onroad(false), flag_pressed(
home_img = loadPixmap("../assets/images/button_home.png", home_btn.size()); home_img = loadPixmap("../assets/images/button_home.png", home_btn.size());
flag_img = loadPixmap("../assets/images/button_flag.png", home_btn.size()); flag_img = loadPixmap("../assets/images/button_flag.png", home_btn.size());
settings_img = loadPixmap("../assets/images/button_settings.png", settings_btn.size(), Qt::IgnoreAspectRatio); settings_img = loadPixmap("../assets/images/button_settings.png", settings_btn.size(), Qt::IgnoreAspectRatio);
currentColors = QColor(255, 255, 255); currentColor = QColor(255, 255, 255);
connect(this, &Sidebar::valueChanged, [=] { update(); }); connect(this, &Sidebar::valueChanged, [=] { update(); });
@@ -148,19 +148,6 @@ void Sidebar::updateState(const UIState &s) {
int strength = (int)deviceState.getNetworkStrength(); int strength = (int)deviceState.getNetworkStrength();
setProperty("netStrength", strength > 0 ? strength + 1 : 0); setProperty("netStrength", strength > 0 ? strength + 1 : 0);
// FrogPilot properties
if (scene.current_holiday_theme != 0) {
home_img = holiday_home_imgs[scene.current_holiday_theme];
flag_img = holiday_flag_imgs[scene.current_holiday_theme];
settings_img = holiday_settings_imgs[scene.current_holiday_theme];
currentColors = holidayThemeConfiguration[scene.current_holiday_theme].second;
} else {
home_img = home_imgs[scene.custom_icons];
flag_img = flag_imgs[scene.custom_icons];
settings_img = settings_imgs[scene.custom_icons];
currentColors = themeConfiguration[scene.custom_colors].second;
}
auto frogpilotDeviceState = sm["frogpilotDeviceState"].getFrogpilotDeviceState(); auto frogpilotDeviceState = sm["frogpilotDeviceState"].getFrogpilotDeviceState();
bool isNumericalTemp = scene.numerical_temp; bool isNumericalTemp = scene.numerical_temp;
@@ -180,7 +167,7 @@ void Sidebar::updateState(const UIState &s) {
QString metric = isGPU ? gpu : cpu; QString metric = isGPU ? gpu : cpu;
int usage = isGPU ? gpu_usage : cpu_usage; int usage = isGPU ? gpu_usage : cpu_usage;
ItemStatus cpuStatus = {{isGPU ? tr("GPU") : tr("CPU"), metric}, currentColors[0]}; ItemStatus cpuStatus = {{isGPU ? tr("GPU") : tr("CPU"), metric}, currentColor};
if (usage >= 85) { if (usage >= 85) {
cpuStatus = {{isGPU ? tr("GPU") : tr("CPU"), metric}, danger_color}; cpuStatus = {{isGPU ? tr("GPU") : tr("CPU"), metric}, danger_color};
} else if (usage >= 70) { } else if (usage >= 70) {
@@ -198,7 +185,7 @@ void Sidebar::updateState(const UIState &s) {
QString storage = QString::number(isStorageLeft ? storage_left : storage_used) + tr(" GB"); QString storage = QString::number(isStorageLeft ? storage_left : storage_used) + tr(" GB");
if (isMemoryUsage) { if (isMemoryUsage) {
ItemStatus memoryStatus = {{tr("MEMORY"), memory}, currentColors[0]}; ItemStatus memoryStatus = {{tr("MEMORY"), memory}, currentColor};
if (memory_usage >= 85) { if (memory_usage >= 85) {
memoryStatus = {{tr("MEMORY"), memory}, danger_color}; memoryStatus = {{tr("MEMORY"), memory}, danger_color};
} else if (memory_usage >= 70) { } else if (memory_usage >= 70) {
@@ -206,7 +193,7 @@ void Sidebar::updateState(const UIState &s) {
} }
setProperty("memoryStatus", QVariant::fromValue(memoryStatus)); setProperty("memoryStatus", QVariant::fromValue(memoryStatus));
} else { } else {
ItemStatus storageStatus = {{isStorageLeft ? tr("LEFT") : tr("USED"), storage}, currentColors[0]}; ItemStatus storageStatus = {{isStorageLeft ? tr("LEFT") : tr("USED"), storage}, currentColor};
if (25 > storage_left && storage_left >= 10) { if (25 > storage_left && storage_left >= 10) {
storageStatus = {{isStorageLeft ? tr("LEFT") : tr("USED"), storage}, warning_color}; storageStatus = {{isStorageLeft ? tr("LEFT") : tr("USED"), storage}, warning_color};
} else if (10 > storage_left) { } else if (10 > storage_left) {
@@ -222,7 +209,7 @@ void Sidebar::updateState(const UIState &s) {
connectStatus = ItemStatus{{tr("CONNECT"), tr("OFFLINE")}, warning_color}; connectStatus = ItemStatus{{tr("CONNECT"), tr("OFFLINE")}, warning_color};
} else { } else {
connectStatus = nanos_since_boot() - last_ping < 80e9 connectStatus = nanos_since_boot() - last_ping < 80e9
? ItemStatus{{tr("CONNECT"), tr("ONLINE")}, currentColors[0]} ? ItemStatus{{tr("CONNECT"), tr("ONLINE")}, currentColor}
: ItemStatus{{tr("CONNECT"), tr("ERROR")}, danger_color}; : ItemStatus{{tr("CONNECT"), tr("ERROR")}, danger_color};
} }
setProperty("connectStatus", QVariant::fromValue(connectStatus)); setProperty("connectStatus", QVariant::fromValue(connectStatus));
@@ -230,13 +217,13 @@ void Sidebar::updateState(const UIState &s) {
ItemStatus tempStatus = {{tr("TEMP"), isNumericalTemp ? max_temp : tr("HIGH")}, danger_color}; ItemStatus tempStatus = {{tr("TEMP"), isNumericalTemp ? max_temp : tr("HIGH")}, danger_color};
auto ts = deviceState.getThermalStatus(); auto ts = deviceState.getThermalStatus();
if (ts == cereal::DeviceState::ThermalStatus::GREEN) { if (ts == cereal::DeviceState::ThermalStatus::GREEN) {
tempStatus = {{tr("TEMP"), isNumericalTemp ? max_temp : tr("GOOD")}, currentColors[0]}; tempStatus = {{tr("TEMP"), isNumericalTemp ? max_temp : tr("GOOD")}, currentColor};
} else if (ts == cereal::DeviceState::ThermalStatus::YELLOW) { } else if (ts == cereal::DeviceState::ThermalStatus::YELLOW) {
tempStatus = {{tr("TEMP"), isNumericalTemp ? max_temp : tr("OK")}, warning_color}; tempStatus = {{tr("TEMP"), isNumericalTemp ? max_temp : tr("OK")}, warning_color};
} }
setProperty("tempStatus", QVariant::fromValue(tempStatus)); setProperty("tempStatus", QVariant::fromValue(tempStatus));
ItemStatus pandaStatus = {{tr("VEHICLE"), tr("ONLINE")}, currentColors[0]}; ItemStatus pandaStatus = {{tr("VEHICLE"), tr("ONLINE")}, currentColor};
if (s.scene.pandaType == cereal::PandaState::PandaType::UNKNOWN) { if (s.scene.pandaType == cereal::PandaState::PandaType::UNKNOWN) {
pandaStatus = {{tr("NO"), tr("PANDA")}, danger_color}; pandaStatus = {{tr("NO"), tr("PANDA")}, danger_color};
} else if (s.scene.started && !sm["liveLocationKalman"].getLiveLocationKalman().getGpsOK()) { } else if (s.scene.started && !sm["liveLocationKalman"].getLiveLocationKalman().getGpsOK()) {

2
selfdrive/ui/qt/sidebar.h
View File

@@ -89,5 +89,5 @@ private:
std::unordered_map<int, QPixmap> holiday_home_imgs; std::unordered_map<int, QPixmap> holiday_home_imgs;
std::unordered_map<int, QPixmap> holiday_settings_imgs; std::unordered_map<int, QPixmap> holiday_settings_imgs;
std::vector<QColor> currentColors; QColor currentColor;
}; };