From 81491dc57f5080c602a0be58dd5f9feba2fa31b9 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Mon, 3 May 2021 17:53:11 +0800 Subject: [PATCH] c++ cleanup: standardize file extensions to .cc and .h (#20800) * c++ cleanup: standardize file extensions to .cc and .h * cleanup files_common --- release/files_common | 10 +++++----- selfdrive/locationd/locationd.h | 2 +- selfdrive/sensord/sensors/bmx055_accel.cc | 2 +- .../{bmx055_accel.hpp => bmx055_accel.h} | 2 +- selfdrive/sensord/sensors/bmx055_gyro.cc | 2 +- .../{bmx055_gyro.hpp => bmx055_gyro.h} | 2 +- selfdrive/sensord/sensors/bmx055_magn.cc | 2 +- .../{bmx055_magn.hpp => bmx055_magn.h} | 2 +- selfdrive/sensord/sensors/bmx055_temp.cc | 4 ++-- .../{bmx055_temp.hpp => bmx055_temp.h} | 4 ++-- .../sensors/{constants.hpp => constants.h} | 0 selfdrive/sensord/sensors/file_sensor.cc | 2 +- .../{file_sensor.hpp => file_sensor.h} | 2 +- selfdrive/sensord/sensors/i2c_sensor.cc | 2 +- .../sensors/{i2c_sensor.hpp => i2c_sensor.h} | 4 ++-- selfdrive/sensord/sensors/light_sensor.cc | 4 ++-- .../{light_sensor.hpp => light_sensor.h} | 2 +- selfdrive/sensord/sensors/lsm6ds3_accel.cc | 2 +- .../{lsm6ds3_accel.hpp => lsm6ds3_accel.h} | 2 +- selfdrive/sensord/sensors/lsm6ds3_gyro.cc | 2 +- .../{lsm6ds3_gyro.hpp => lsm6ds3_gyro.h} | 2 +- selfdrive/sensord/sensors/lsm6ds3_temp.cc | 2 +- .../{lsm6ds3_temp.hpp => lsm6ds3_temp.h} | 2 +- .../sensord/sensors/{sensor.hpp => sensor.h} | 0 selfdrive/sensord/sensors_qcom2.cc | 20 +++++++++---------- selfdrive/ui/SConscript | 4 ++-- selfdrive/ui/main.cc | 4 ++-- selfdrive/ui/paint.cc | 4 ++-- selfdrive/ui/{paint.hpp => paint.h} | 2 +- selfdrive/ui/qt/api.cc | 2 +- selfdrive/ui/qt/{api.hpp => api.h} | 0 selfdrive/ui/qt/home.cc | 6 +++--- selfdrive/ui/qt/{home.hpp => home.h} | 8 ++++---- selfdrive/ui/qt/offroad/networking.cc | 4 ++-- .../offroad/{networking.hpp => networking.h} | 8 ++++---- selfdrive/ui/qt/offroad/onboarding.cc | 4 ++-- .../offroad/{onboarding.hpp => onboarding.h} | 0 selfdrive/ui/qt/offroad/settings.cc | 18 ++++++++--------- .../qt/offroad/{settings.hpp => settings.h} | 2 +- selfdrive/ui/qt/offroad/wifiManager.cc | 2 +- .../{wifiManager.hpp => wifiManager.h} | 0 selfdrive/ui/qt/onroad.cc | 4 ++-- selfdrive/ui/qt/{onroad.hpp => onroad.h} | 2 +- .../ui/qt/{qt_window.hpp => qt_window.h} | 0 selfdrive/ui/qt/request_repeater.cc | 2 +- ...equest_repeater.hpp => request_repeater.h} | 4 ++-- selfdrive/ui/qt/setup/reset.cc | 2 +- selfdrive/ui/qt/setup/setup.cc | 8 ++++---- selfdrive/ui/qt/setup/{setup.hpp => setup.h} | 0 selfdrive/ui/qt/setup/wifi.cc | 8 ++++---- selfdrive/ui/qt/setup/{wifi.hpp => wifi.h} | 0 selfdrive/ui/qt/sidebar.cc | 4 ++-- selfdrive/ui/qt/{sidebar.hpp => sidebar.h} | 2 +- selfdrive/ui/qt/sound.cc | 2 +- selfdrive/ui/qt/{sound.hpp => sound.h} | 0 selfdrive/ui/qt/spinner.cc | 4 ++-- selfdrive/ui/qt/{spinner.hpp => spinner.h} | 0 selfdrive/ui/qt/text.cc | 4 ++-- selfdrive/ui/qt/widgets/controls.cc | 2 +- .../qt/widgets/{controls.hpp => controls.h} | 2 +- selfdrive/ui/qt/widgets/drive_stats.cc | 4 ++-- .../{drive_stats.hpp => drive_stats.h} | 0 selfdrive/ui/qt/widgets/input.cc | 4 ++-- .../ui/qt/widgets/{input.hpp => input.h} | 2 +- selfdrive/ui/qt/widgets/keyboard.cc | 2 +- .../qt/widgets/{keyboard.hpp => keyboard.h} | 0 selfdrive/ui/qt/widgets/offroad_alerts.cc | 2 +- .../{offroad_alerts.hpp => offroad_alerts.h} | 2 +- selfdrive/ui/qt/widgets/scrollview.cc | 2 +- .../widgets/{scrollview.hpp => scrollview.h} | 0 selfdrive/ui/qt/widgets/setup.cc | 4 ++-- .../ui/qt/widgets/{setup.hpp => setup.h} | 2 +- selfdrive/ui/qt/widgets/ssh_keys.cc | 4 ++-- .../qt/widgets/{ssh_keys.hpp => ssh_keys.h} | 2 +- selfdrive/ui/qt/widgets/toggle.cc | 2 +- .../ui/qt/widgets/{toggle.hpp => toggle.h} | 0 selfdrive/ui/qt/window.cc | 2 +- selfdrive/ui/qt/{window.hpp => window.h} | 8 ++++---- .../replay/{FileReader.cpp => FileReader.cc} | 2 +- .../replay/{FileReader.hpp => FileReader.h} | 0 .../ui/replay/{Unlogger.cpp => Unlogger.cc} | 2 +- .../ui/replay/{Unlogger.hpp => Unlogger.h} | 2 +- selfdrive/ui/replay/main.cc | 2 +- selfdrive/ui/replay/replay.cc | 2 +- selfdrive/ui/replay/{replay.hpp => replay.h} | 6 +++--- selfdrive/ui/ui.cc | 6 +++--- selfdrive/ui/{ui.hpp => ui.h} | 2 +- 87 files changed, 132 insertions(+), 132 deletions(-) rename selfdrive/sensord/sensors/{bmx055_accel.hpp => bmx055_accel.h} (96%) rename selfdrive/sensord/sensors/{bmx055_gyro.hpp => bmx055_gyro.h} (96%) rename selfdrive/sensord/sensors/{bmx055_magn.hpp => bmx055_magn.h} (98%) rename selfdrive/sensord/sensors/{bmx055_temp.hpp => bmx055_temp.h} (76%) rename selfdrive/sensord/sensors/{constants.hpp => constants.h} (100%) rename selfdrive/sensord/sensors/{file_sensor.hpp => file_sensor.h} (91%) rename selfdrive/sensord/sensors/{i2c_sensor.hpp => i2c_sensor.h} (89%) rename selfdrive/sensord/sensors/{light_sensor.hpp => light_sensor.h} (87%) rename selfdrive/sensord/sensors/{lsm6ds3_accel.hpp => lsm6ds3_accel.h} (94%) rename selfdrive/sensord/sensors/{lsm6ds3_gyro.hpp => lsm6ds3_gyro.h} (94%) rename selfdrive/sensord/sensors/{lsm6ds3_temp.hpp => lsm6ds3_temp.h} (93%) rename selfdrive/sensord/sensors/{sensor.hpp => sensor.h} (100%) rename selfdrive/ui/{paint.hpp => paint.h} (96%) rename selfdrive/ui/qt/{api.hpp => api.h} (100%) rename selfdrive/ui/qt/{home.hpp => home.h} (89%) rename selfdrive/ui/qt/offroad/{networking.hpp => networking.h} (92%) rename selfdrive/ui/qt/offroad/{onboarding.hpp => onboarding.h} (100%) rename selfdrive/ui/qt/offroad/{settings.hpp => settings.h} (95%) rename selfdrive/ui/qt/offroad/{wifiManager.hpp => wifiManager.h} (100%) rename selfdrive/ui/qt/{onroad.hpp => onroad.h} (95%) rename selfdrive/ui/qt/{qt_window.hpp => qt_window.h} (100%) rename selfdrive/ui/qt/{request_repeater.hpp => request_repeater.h} (83%) rename selfdrive/ui/qt/setup/{setup.hpp => setup.h} (100%) rename selfdrive/ui/qt/setup/{wifi.hpp => wifi.h} (100%) rename selfdrive/ui/qt/{sidebar.hpp => sidebar.h} (98%) rename selfdrive/ui/qt/{sound.hpp => sound.h} (100%) rename selfdrive/ui/qt/{spinner.hpp => spinner.h} (100%) rename selfdrive/ui/qt/widgets/{controls.hpp => controls.h} (99%) rename selfdrive/ui/qt/widgets/{drive_stats.hpp => drive_stats.h} (100%) rename selfdrive/ui/qt/widgets/{input.hpp => input.h} (98%) rename selfdrive/ui/qt/widgets/{keyboard.hpp => keyboard.h} (100%) rename selfdrive/ui/qt/widgets/{offroad_alerts.hpp => offroad_alerts.h} (94%) rename selfdrive/ui/qt/widgets/{scrollview.hpp => scrollview.h} (100%) rename selfdrive/ui/qt/widgets/{setup.hpp => setup.h} (98%) rename selfdrive/ui/qt/widgets/{ssh_keys.hpp => ssh_keys.h} (96%) rename selfdrive/ui/qt/widgets/{toggle.hpp => toggle.h} (100%) rename selfdrive/ui/qt/{window.hpp => window.h} (83%) rename selfdrive/ui/replay/{FileReader.cpp => FileReader.cc} (99%) rename selfdrive/ui/replay/{FileReader.hpp => FileReader.h} (100%) rename selfdrive/ui/replay/{Unlogger.cpp => Unlogger.cc} (99%) rename selfdrive/ui/replay/{Unlogger.hpp => Unlogger.h} (97%) rename selfdrive/ui/replay/{replay.hpp => replay.h} (91%) rename selfdrive/ui/{ui.hpp => ui.h} (99%) diff --git a/release/files_common b/release/files_common index d1a0a61f..2c265be3 100644 --- a/release/files_common +++ b/release/files_common @@ -331,7 +331,7 @@ selfdrive/sensord/libdiag.h selfdrive/sensord/sensors_qcom.cc selfdrive/sensord/sensors_qcom2.cc selfdrive/sensord/sensors/*.cc -selfdrive/sensord/sensors/*.hpp +selfdrive/sensord/sensors/*.h selfdrive/sensord/sensord selfdrive/thermald/thermald.py @@ -346,18 +346,18 @@ selfdrive/test/test_onroad.py selfdrive/ui/.gitignore selfdrive/ui/SConscript selfdrive/ui/*.cc -selfdrive/ui/*.hpp +selfdrive/ui/*.h selfdrive/ui/ui selfdrive/ui/text selfdrive/ui/spinner selfdrive/ui/qt/*.cc -selfdrive/ui/qt/*.hpp +selfdrive/ui/qt/*.h selfdrive/ui/qt/offroad/*.cc -selfdrive/ui/qt/offroad/*.hpp +selfdrive/ui/qt/offroad/*.h selfdrive/ui/qt/offroad/*.qml selfdrive/ui/qt/widgets/*.cc -selfdrive/ui/qt/widgets/*.hpp +selfdrive/ui/qt/widgets/*.h selfdrive/ui/qt/spinner_aarch64 selfdrive/ui/qt/text_aarch64 diff --git a/selfdrive/locationd/locationd.h b/selfdrive/locationd/locationd.h index 6c00a43a..f6d8d6f9 100755 --- a/selfdrive/locationd/locationd.h +++ b/selfdrive/locationd/locationd.h @@ -13,7 +13,7 @@ #include "common/timing.h" #include "common/transformations/coordinates.hpp" #include "common/transformations/orientation.hpp" -#include "selfdrive/sensord/sensors/constants.hpp" +#include "selfdrive/sensord/sensors/constants.h" #include "models/live_kf.h" diff --git a/selfdrive/sensord/sensors/bmx055_accel.cc b/selfdrive/sensord/sensors/bmx055_accel.cc index 23e6d071..5b0fadaf 100644 --- a/selfdrive/sensord/sensors/bmx055_accel.cc +++ b/selfdrive/sensord/sensors/bmx055_accel.cc @@ -2,7 +2,7 @@ #include "common/swaglog.h" #include "common/timing.h" -#include "bmx055_accel.hpp" +#include "bmx055_accel.h" BMX055_Accel::BMX055_Accel(I2CBus *bus) : I2CSensor(bus) {} diff --git a/selfdrive/sensord/sensors/bmx055_accel.hpp b/selfdrive/sensord/sensors/bmx055_accel.h similarity index 96% rename from selfdrive/sensord/sensors/bmx055_accel.hpp rename to selfdrive/sensord/sensors/bmx055_accel.h index 2c9173f9..085dcbbe 100644 --- a/selfdrive/sensord/sensors/bmx055_accel.hpp +++ b/selfdrive/sensord/sensors/bmx055_accel.h @@ -1,6 +1,6 @@ #pragma once -#include "sensors/i2c_sensor.hpp" +#include "sensors/i2c_sensor.h" // Address of the chip on the bus #define BMX055_ACCEL_I2C_ADDR 0x18 diff --git a/selfdrive/sensord/sensors/bmx055_gyro.cc b/selfdrive/sensord/sensors/bmx055_gyro.cc index d7bf0040..7397d860 100644 --- a/selfdrive/sensord/sensors/bmx055_gyro.cc +++ b/selfdrive/sensord/sensors/bmx055_gyro.cc @@ -2,7 +2,7 @@ #include #include "common/swaglog.h" -#include "bmx055_gyro.hpp" +#include "bmx055_gyro.h" #define DEG2RAD(x) ((x) * M_PI / 180.0) diff --git a/selfdrive/sensord/sensors/bmx055_gyro.hpp b/selfdrive/sensord/sensors/bmx055_gyro.h similarity index 96% rename from selfdrive/sensord/sensors/bmx055_gyro.hpp rename to selfdrive/sensord/sensors/bmx055_gyro.h index f808139f..97efeea1 100644 --- a/selfdrive/sensord/sensors/bmx055_gyro.hpp +++ b/selfdrive/sensord/sensors/bmx055_gyro.h @@ -1,6 +1,6 @@ #pragma once -#include "sensors/i2c_sensor.hpp" +#include "sensors/i2c_sensor.h" // Address of the chip on the bus #define BMX055_GYRO_I2C_ADDR 0x68 diff --git a/selfdrive/sensord/sensors/bmx055_magn.cc b/selfdrive/sensord/sensors/bmx055_magn.cc index 41b41467..830865d0 100644 --- a/selfdrive/sensord/sensors/bmx055_magn.cc +++ b/selfdrive/sensord/sensors/bmx055_magn.cc @@ -6,7 +6,7 @@ #include "common/swaglog.h" #include "common/util.h" -#include "bmx055_magn.hpp" +#include "bmx055_magn.h" static int16_t compensate_x(trim_data_t trim_data, int16_t mag_data_x, uint16_t data_rhall) { uint16_t process_comp_x0 = data_rhall; diff --git a/selfdrive/sensord/sensors/bmx055_magn.hpp b/selfdrive/sensord/sensors/bmx055_magn.h similarity index 98% rename from selfdrive/sensord/sensors/bmx055_magn.hpp rename to selfdrive/sensord/sensors/bmx055_magn.h index 0e11934e..3a0b7b2a 100644 --- a/selfdrive/sensord/sensors/bmx055_magn.hpp +++ b/selfdrive/sensord/sensors/bmx055_magn.h @@ -1,7 +1,7 @@ #pragma once #include -#include "sensors/i2c_sensor.hpp" +#include "sensors/i2c_sensor.h" // Address of the chip on the bus #define BMX055_MAGN_I2C_ADDR 0x10 diff --git a/selfdrive/sensord/sensors/bmx055_temp.cc b/selfdrive/sensord/sensors/bmx055_temp.cc index 86f7d4f0..520c4f68 100644 --- a/selfdrive/sensord/sensors/bmx055_temp.cc +++ b/selfdrive/sensord/sensors/bmx055_temp.cc @@ -2,8 +2,8 @@ #include "common/swaglog.h" #include "common/timing.h" -#include "bmx055_temp.hpp" -#include "bmx055_accel.hpp" +#include "bmx055_temp.h" +#include "bmx055_accel.h" BMX055_Temp::BMX055_Temp(I2CBus *bus) : I2CSensor(bus) {} diff --git a/selfdrive/sensord/sensors/bmx055_temp.hpp b/selfdrive/sensord/sensors/bmx055_temp.h similarity index 76% rename from selfdrive/sensord/sensors/bmx055_temp.hpp rename to selfdrive/sensord/sensors/bmx055_temp.h index 8b7119a6..c0fbf319 100644 --- a/selfdrive/sensord/sensors/bmx055_temp.hpp +++ b/selfdrive/sensord/sensors/bmx055_temp.h @@ -1,7 +1,7 @@ #pragma once -#include "sensors/i2c_sensor.hpp" -#include "sensors/bmx055_accel.hpp" +#include "sensors/i2c_sensor.h" +#include "sensors/bmx055_accel.h" class BMX055_Temp : public I2CSensor { diff --git a/selfdrive/sensord/sensors/constants.hpp b/selfdrive/sensord/sensors/constants.h similarity index 100% rename from selfdrive/sensord/sensors/constants.hpp rename to selfdrive/sensord/sensors/constants.h diff --git a/selfdrive/sensord/sensors/file_sensor.cc b/selfdrive/sensord/sensors/file_sensor.cc index 6d03ef1b..869b8630 100644 --- a/selfdrive/sensord/sensors/file_sensor.cc +++ b/selfdrive/sensord/sensors/file_sensor.cc @@ -1,7 +1,7 @@ #include #include -#include "file_sensor.hpp" +#include "file_sensor.h" FileSensor::FileSensor(std::string filename) : file(filename) { } diff --git a/selfdrive/sensord/sensors/file_sensor.hpp b/selfdrive/sensord/sensors/file_sensor.h similarity index 91% rename from selfdrive/sensord/sensors/file_sensor.hpp rename to selfdrive/sensord/sensors/file_sensor.h index 25a6f203..34bf4b15 100644 --- a/selfdrive/sensord/sensors/file_sensor.hpp +++ b/selfdrive/sensord/sensors/file_sensor.h @@ -4,7 +4,7 @@ #include #include "cereal/gen/cpp/log.capnp.h" -#include "sensors/sensor.hpp" +#include "sensors/sensor.h" class FileSensor : public Sensor { diff --git a/selfdrive/sensord/sensors/i2c_sensor.cc b/selfdrive/sensord/sensors/i2c_sensor.cc index e3000c8b..dcd6c5f6 100644 --- a/selfdrive/sensord/sensors/i2c_sensor.cc +++ b/selfdrive/sensord/sensors/i2c_sensor.cc @@ -1,5 +1,5 @@ #include -#include "i2c_sensor.hpp" +#include "i2c_sensor.h" int16_t read_12_bit(uint8_t lsb, uint8_t msb){ uint16_t combined = (uint16_t(msb) << 8) | uint16_t(lsb & 0xF0); diff --git a/selfdrive/sensord/sensors/i2c_sensor.hpp b/selfdrive/sensord/sensors/i2c_sensor.h similarity index 89% rename from selfdrive/sensord/sensors/i2c_sensor.hpp rename to selfdrive/sensord/sensors/i2c_sensor.h index 39ef79cf..d1300370 100644 --- a/selfdrive/sensord/sensors/i2c_sensor.hpp +++ b/selfdrive/sensord/sensors/i2c_sensor.h @@ -3,8 +3,8 @@ #include #include "cereal/gen/cpp/log.capnp.h" #include "common/i2c.h" -#include "sensors/sensor.hpp" -#include "sensors/constants.hpp" +#include "sensors/sensor.h" +#include "sensors/constants.h" int16_t read_12_bit(uint8_t lsb, uint8_t msb); int16_t read_16_bit(uint8_t lsb, uint8_t msb); diff --git a/selfdrive/sensord/sensors/light_sensor.cc b/selfdrive/sensord/sensors/light_sensor.cc index eb3eb05f..34b29939 100644 --- a/selfdrive/sensord/sensors/light_sensor.cc +++ b/selfdrive/sensord/sensors/light_sensor.cc @@ -3,8 +3,8 @@ #include "common/timing.h" -#include "light_sensor.hpp" -#include "constants.hpp" +#include "light_sensor.h" +#include "constants.h" void LightSensor::get_event(cereal::SensorEventData::Builder &event){ uint64_t start_time = nanos_since_boot(); diff --git a/selfdrive/sensord/sensors/light_sensor.hpp b/selfdrive/sensord/sensors/light_sensor.h similarity index 87% rename from selfdrive/sensord/sensors/light_sensor.hpp rename to selfdrive/sensord/sensors/light_sensor.h index 7c98cb29..faf901d4 100644 --- a/selfdrive/sensord/sensors/light_sensor.hpp +++ b/selfdrive/sensord/sensors/light_sensor.h @@ -1,5 +1,5 @@ #pragma once -#include "file_sensor.hpp" +#include "file_sensor.h" class LightSensor : public FileSensor { public: diff --git a/selfdrive/sensord/sensors/lsm6ds3_accel.cc b/selfdrive/sensord/sensors/lsm6ds3_accel.cc index 15a18672..9674d247 100644 --- a/selfdrive/sensord/sensors/lsm6ds3_accel.cc +++ b/selfdrive/sensord/sensors/lsm6ds3_accel.cc @@ -2,7 +2,7 @@ #include "common/swaglog.h" #include "common/timing.h" -#include "lsm6ds3_accel.hpp" +#include "lsm6ds3_accel.h" LSM6DS3_Accel::LSM6DS3_Accel(I2CBus *bus) : I2CSensor(bus) {} diff --git a/selfdrive/sensord/sensors/lsm6ds3_accel.hpp b/selfdrive/sensord/sensors/lsm6ds3_accel.h similarity index 94% rename from selfdrive/sensord/sensors/lsm6ds3_accel.hpp rename to selfdrive/sensord/sensors/lsm6ds3_accel.h index 314dcf8b..62f5087c 100644 --- a/selfdrive/sensord/sensors/lsm6ds3_accel.hpp +++ b/selfdrive/sensord/sensors/lsm6ds3_accel.h @@ -1,6 +1,6 @@ #pragma once -#include "sensors/i2c_sensor.hpp" +#include "sensors/i2c_sensor.h" // Address of the chip on the bus #define LSM6DS3_ACCEL_I2C_ADDR 0x6A diff --git a/selfdrive/sensord/sensors/lsm6ds3_gyro.cc b/selfdrive/sensord/sensors/lsm6ds3_gyro.cc index 4c983e54..a04138b6 100644 --- a/selfdrive/sensord/sensors/lsm6ds3_gyro.cc +++ b/selfdrive/sensord/sensors/lsm6ds3_gyro.cc @@ -3,7 +3,7 @@ #include "common/swaglog.h" #include "common/timing.h" -#include "lsm6ds3_gyro.hpp" +#include "lsm6ds3_gyro.h" #define DEG2RAD(x) ((x) * M_PI / 180.0) diff --git a/selfdrive/sensord/sensors/lsm6ds3_gyro.hpp b/selfdrive/sensord/sensors/lsm6ds3_gyro.h similarity index 94% rename from selfdrive/sensord/sensors/lsm6ds3_gyro.hpp rename to selfdrive/sensord/sensors/lsm6ds3_gyro.h index 13cec204..89047421 100644 --- a/selfdrive/sensord/sensors/lsm6ds3_gyro.hpp +++ b/selfdrive/sensord/sensors/lsm6ds3_gyro.h @@ -1,6 +1,6 @@ #pragma once -#include "sensors/i2c_sensor.hpp" +#include "sensors/i2c_sensor.h" // Address of the chip on the bus #define LSM6DS3_GYRO_I2C_ADDR 0x6A diff --git a/selfdrive/sensord/sensors/lsm6ds3_temp.cc b/selfdrive/sensord/sensors/lsm6ds3_temp.cc index 04b0d3d4..32935cfb 100644 --- a/selfdrive/sensord/sensors/lsm6ds3_temp.cc +++ b/selfdrive/sensord/sensors/lsm6ds3_temp.cc @@ -2,7 +2,7 @@ #include "common/swaglog.h" #include "common/timing.h" -#include "lsm6ds3_temp.hpp" +#include "lsm6ds3_temp.h" LSM6DS3_Temp::LSM6DS3_Temp(I2CBus *bus) : I2CSensor(bus) {} diff --git a/selfdrive/sensord/sensors/lsm6ds3_temp.hpp b/selfdrive/sensord/sensors/lsm6ds3_temp.h similarity index 93% rename from selfdrive/sensord/sensors/lsm6ds3_temp.hpp rename to selfdrive/sensord/sensors/lsm6ds3_temp.h index eea5ff4a..8bb7b30a 100644 --- a/selfdrive/sensord/sensors/lsm6ds3_temp.hpp +++ b/selfdrive/sensord/sensors/lsm6ds3_temp.h @@ -1,6 +1,6 @@ #pragma once -#include "sensors/i2c_sensor.hpp" +#include "sensors/i2c_sensor.h" // Address of the chip on the bus #define LSM6DS3_TEMP_I2C_ADDR 0x6A diff --git a/selfdrive/sensord/sensors/sensor.hpp b/selfdrive/sensord/sensors/sensor.h similarity index 100% rename from selfdrive/sensord/sensors/sensor.hpp rename to selfdrive/sensord/sensors/sensor.h diff --git a/selfdrive/sensord/sensors_qcom2.cc b/selfdrive/sensord/sensors_qcom2.cc index 1cc685fe..bbc3321d 100644 --- a/selfdrive/sensord/sensors_qcom2.cc +++ b/selfdrive/sensord/sensors_qcom2.cc @@ -9,19 +9,19 @@ #include "common/util.h" #include "common/swaglog.h" -#include "sensors/sensor.hpp" -#include "sensors/constants.hpp" +#include "sensors/sensor.h" +#include "sensors/constants.h" -#include "sensors/bmx055_accel.hpp" -#include "sensors/bmx055_gyro.hpp" -#include "sensors/bmx055_magn.hpp" -#include "sensors/bmx055_temp.hpp" +#include "sensors/bmx055_accel.h" +#include "sensors/bmx055_gyro.h" +#include "sensors/bmx055_magn.h" +#include "sensors/bmx055_temp.h" -#include "sensors/lsm6ds3_accel.hpp" -#include "sensors/lsm6ds3_gyro.hpp" -#include "sensors/lsm6ds3_temp.hpp" +#include "sensors/lsm6ds3_accel.h" +#include "sensors/lsm6ds3_gyro.h" +#include "sensors/lsm6ds3_temp.h" -#include "sensors/light_sensor.hpp" +#include "sensors/light_sensor.h" #define I2C_BUS_IMU 1 diff --git a/selfdrive/ui/SConscript b/selfdrive/ui/SConscript index 3ecec79b..b56972ae 100644 --- a/selfdrive/ui/SConscript +++ b/selfdrive/ui/SConscript @@ -63,8 +63,8 @@ if arch == 'x86_64' and os.path.exists(Dir("#tools/").get_abspath()): qt_env['CPPPATH'] += ["#tools/clib"] qt_env['CXXFLAGS'] += ["-Wno-deprecated-declarations"] - replay_lib_src = ["replay/replay.cc", "replay/Unlogger.cpp", - "replay/FileReader.cpp", "#tools/clib/FrameReader.cpp"] + replay_lib_src = ["replay/replay.cc", "replay/Unlogger.cc", + "replay/FileReader.cc", "#tools/clib/FrameReader.cpp"] replay_lib = qt_env.Library("qt_replay", replay_lib_src, LIBS=base_libs) replay_libs = [replay_lib, 'avutil', 'avcodec', 'avformat', 'swscale', 'bz2'] + qt_libs diff --git a/selfdrive/ui/main.cc b/selfdrive/ui/main.cc index a60e7233..5bc7b814 100644 --- a/selfdrive/ui/main.cc +++ b/selfdrive/ui/main.cc @@ -1,8 +1,8 @@ #include #include -#include "qt/window.hpp" -#include "qt/qt_window.hpp" +#include "qt/window.h" +#include "qt/qt_window.h" int main(int argc, char *argv[]) { QSurfaceFormat fmt; diff --git a/selfdrive/ui/paint.cc b/selfdrive/ui/paint.cc index bedafa12..5d40f721 100644 --- a/selfdrive/ui/paint.cc +++ b/selfdrive/ui/paint.cc @@ -1,7 +1,7 @@ #include #include -#include "ui.hpp" +#include "ui.h" #ifdef __APPLE__ #include #define NANOVG_GL3_IMPLEMENTATION @@ -18,7 +18,7 @@ #define NANOVG_GLES3_IMPLEMENTATION #include "nanovg_gl.h" #include "nanovg_gl_utils.h" -#include "paint.hpp" +#include "paint.h" // TODO: this is also hardcoded in common/transformations/camera.py // TODO: choose based on frame input size diff --git a/selfdrive/ui/paint.hpp b/selfdrive/ui/paint.h similarity index 96% rename from selfdrive/ui/paint.hpp rename to selfdrive/ui/paint.h index 66633a9f..a9dc4166 100644 --- a/selfdrive/ui/paint.hpp +++ b/selfdrive/ui/paint.h @@ -1,6 +1,6 @@ #pragma once -#include "ui.hpp" +#include "ui.h" void ui_draw(UIState *s, int w, int h); void ui_draw_image(const UIState *s, const Rect &r, const char *name, float alpha); diff --git a/selfdrive/ui/qt/api.cc b/selfdrive/ui/qt/api.cc index 1763a839..11bff6b2 100644 --- a/selfdrive/ui/qt/api.cc +++ b/selfdrive/ui/qt/api.cc @@ -10,7 +10,7 @@ #include #include -#include "api.hpp" +#include "api.h" #include "common/params.h" #include "common/util.h" diff --git a/selfdrive/ui/qt/api.hpp b/selfdrive/ui/qt/api.h similarity index 100% rename from selfdrive/ui/qt/api.hpp rename to selfdrive/ui/qt/api.h diff --git a/selfdrive/ui/qt/home.cc b/selfdrive/ui/qt/home.cc index d2e8aab9..71be002e 100644 --- a/selfdrive/ui/qt/home.cc +++ b/selfdrive/ui/qt/home.cc @@ -8,9 +8,9 @@ #include "common/timing.h" #include "common/swaglog.h" -#include "home.hpp" -#include "widgets/drive_stats.hpp" -#include "widgets/setup.hpp" +#include "home.h" +#include "widgets/drive_stats.h" +#include "widgets/setup.h" // HomeWindow: the container for the offroad and onroad UIs diff --git a/selfdrive/ui/qt/home.hpp b/selfdrive/ui/qt/home.h similarity index 89% rename from selfdrive/ui/qt/home.hpp rename to selfdrive/ui/qt/home.h index d51c9772..f2fbf3e9 100644 --- a/selfdrive/ui/qt/home.hpp +++ b/selfdrive/ui/qt/home.h @@ -7,10 +7,10 @@ #include #include -#include "sidebar.hpp" -#include "onroad.hpp" -#include "ui/ui.hpp" -#include "widgets/offroad_alerts.hpp" +#include "sidebar.h" +#include "onroad.h" +#include "ui/ui.h" +#include "widgets/offroad_alerts.h" class OffroadHome : public QFrame { Q_OBJECT diff --git a/selfdrive/ui/qt/offroad/networking.cc b/selfdrive/ui/qt/offroad/networking.cc index 9a4a0138..be452830 100644 --- a/selfdrive/ui/qt/offroad/networking.cc +++ b/selfdrive/ui/qt/offroad/networking.cc @@ -3,8 +3,8 @@ #include #include -#include "networking.hpp" -#include "widgets/scrollview.hpp" +#include "networking.h" +#include "widgets/scrollview.h" void clearLayout(QLayout* layout) { while (QLayoutItem* item = layout->takeAt(0)) { diff --git a/selfdrive/ui/qt/offroad/networking.hpp b/selfdrive/ui/qt/offroad/networking.h similarity index 92% rename from selfdrive/ui/qt/offroad/networking.hpp rename to selfdrive/ui/qt/offroad/networking.h index 1eaa413d..42d09039 100644 --- a/selfdrive/ui/qt/offroad/networking.hpp +++ b/selfdrive/ui/qt/offroad/networking.h @@ -6,10 +6,10 @@ #include #include -#include "wifiManager.hpp" -#include "widgets/input.hpp" -#include "widgets/ssh_keys.hpp" -#include "widgets/toggle.hpp" +#include "wifiManager.h" +#include "widgets/input.h" +#include "widgets/ssh_keys.h" +#include "widgets/toggle.h" class WifiUI : public QWidget { Q_OBJECT diff --git a/selfdrive/ui/qt/offroad/onboarding.cc b/selfdrive/ui/qt/offroad/onboarding.cc index 39aaf648..23b0f31d 100644 --- a/selfdrive/ui/qt/offroad/onboarding.cc +++ b/selfdrive/ui/qt/offroad/onboarding.cc @@ -6,8 +6,8 @@ #include #include "common/params.h" -#include "onboarding.hpp" -#include "home.hpp" +#include "onboarding.h" +#include "home.h" #include "util.h" diff --git a/selfdrive/ui/qt/offroad/onboarding.hpp b/selfdrive/ui/qt/offroad/onboarding.h similarity index 100% rename from selfdrive/ui/qt/offroad/onboarding.hpp rename to selfdrive/ui/qt/offroad/onboarding.h diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc index eb3667ee..e1a8913d 100644 --- a/selfdrive/ui/qt/offroad/settings.cc +++ b/selfdrive/ui/qt/offroad/settings.cc @@ -4,19 +4,19 @@ #include #ifndef QCOM -#include "networking.hpp" +#include "networking.h" #endif -#include "settings.hpp" -#include "widgets/input.hpp" -#include "widgets/toggle.hpp" -#include "widgets/offroad_alerts.hpp" -#include "widgets/scrollview.hpp" -#include "widgets/controls.hpp" -#include "widgets/ssh_keys.hpp" +#include "settings.h" +#include "widgets/input.h" +#include "widgets/toggle.h" +#include "widgets/offroad_alerts.h" +#include "widgets/scrollview.h" +#include "widgets/controls.h" +#include "widgets/ssh_keys.h" #include "common/params.h" #include "common/util.h" #include "selfdrive/hardware/hw.h" -#include "ui.hpp" +#include "ui.h" TogglesPanel::TogglesPanel(QWidget *parent) : QWidget(parent) { QVBoxLayout *toggles_list = new QVBoxLayout(); diff --git a/selfdrive/ui/qt/offroad/settings.hpp b/selfdrive/ui/qt/offroad/settings.h similarity index 95% rename from selfdrive/ui/qt/offroad/settings.hpp rename to selfdrive/ui/qt/offroad/settings.h index bb8428f3..34447829 100644 --- a/selfdrive/ui/qt/offroad/settings.hpp +++ b/selfdrive/ui/qt/offroad/settings.h @@ -9,7 +9,7 @@ #include #include -#include "selfdrive/ui/qt/widgets/controls.hpp" +#include "selfdrive/ui/qt/widgets/controls.h" // ********** settings window + top-level panels ********** diff --git a/selfdrive/ui/qt/offroad/wifiManager.cc b/selfdrive/ui/qt/offroad/wifiManager.cc index 8caf6f6d..f704bbac 100644 --- a/selfdrive/ui/qt/offroad/wifiManager.cc +++ b/selfdrive/ui/qt/offroad/wifiManager.cc @@ -5,7 +5,7 @@ #include "common/params.h" #include "common/swaglog.h" -#include "wifiManager.hpp" +#include "wifiManager.h" /** * We are using a NetworkManager DBUS API : https://developer.gnome.org/NetworkManager/1.26/spec.html diff --git a/selfdrive/ui/qt/offroad/wifiManager.hpp b/selfdrive/ui/qt/offroad/wifiManager.h similarity index 100% rename from selfdrive/ui/qt/offroad/wifiManager.hpp rename to selfdrive/ui/qt/offroad/wifiManager.h diff --git a/selfdrive/ui/qt/onroad.cc b/selfdrive/ui/qt/onroad.cc index 460d7553..c58011c3 100644 --- a/selfdrive/ui/qt/onroad.cc +++ b/selfdrive/ui/qt/onroad.cc @@ -3,8 +3,8 @@ #include "common/timing.h" #include "common/swaglog.h" -#include "onroad.hpp" -#include "paint.hpp" +#include "onroad.h" +#include "paint.h" OnroadWindow::~OnroadWindow() { makeCurrent(); diff --git a/selfdrive/ui/qt/onroad.hpp b/selfdrive/ui/qt/onroad.h similarity index 95% rename from selfdrive/ui/qt/onroad.hpp rename to selfdrive/ui/qt/onroad.h index 5fdb8871..b68bffc8 100644 --- a/selfdrive/ui/qt/onroad.hpp +++ b/selfdrive/ui/qt/onroad.h @@ -4,7 +4,7 @@ #include #include -#include "ui/ui.hpp" +#include "ui/ui.h" // container window for the NVG UI class OnroadWindow : public QOpenGLWidget, protected QOpenGLFunctions { diff --git a/selfdrive/ui/qt/qt_window.hpp b/selfdrive/ui/qt/qt_window.h similarity index 100% rename from selfdrive/ui/qt/qt_window.hpp rename to selfdrive/ui/qt/qt_window.h diff --git a/selfdrive/ui/qt/request_repeater.cc b/selfdrive/ui/qt/request_repeater.cc index 651efd18..ee6680cc 100644 --- a/selfdrive/ui/qt/request_repeater.cc +++ b/selfdrive/ui/qt/request_repeater.cc @@ -1,4 +1,4 @@ -#include "request_repeater.hpp" +#include "request_repeater.h" RequestRepeater::RequestRepeater(QObject *parent, const QString &requestURL, const QString &cacheKey, int period) : HttpRequest(parent, requestURL, cacheKey) { diff --git a/selfdrive/ui/qt/request_repeater.hpp b/selfdrive/ui/qt/request_repeater.h similarity index 83% rename from selfdrive/ui/qt/request_repeater.hpp rename to selfdrive/ui/qt/request_repeater.h index ab4489c3..ff80300f 100644 --- a/selfdrive/ui/qt/request_repeater.hpp +++ b/selfdrive/ui/qt/request_repeater.h @@ -1,5 +1,5 @@ -#include "api.hpp" -#include "ui.hpp" +#include "api.h" +#include "ui.h" class RequestRepeater : public HttpRequest { public: diff --git a/selfdrive/ui/qt/setup/reset.cc b/selfdrive/ui/qt/setup/reset.cc index 5cd430da..4c246fc6 100644 --- a/selfdrive/ui/qt/setup/reset.cc +++ b/selfdrive/ui/qt/setup/reset.cc @@ -5,7 +5,7 @@ #include #include -#include "qt_window.hpp" +#include "qt_window.h" #define USERDATA "/dev/disk/by-partlabel/userdata" #define NVME "/dev/nvme0n1" diff --git a/selfdrive/ui/qt/setup/setup.cc b/selfdrive/ui/qt/setup/setup.cc index 92691f4c..b8447e42 100644 --- a/selfdrive/ui/qt/setup/setup.cc +++ b/selfdrive/ui/qt/setup/setup.cc @@ -6,10 +6,10 @@ #include #include -#include "setup.hpp" -#include "offroad/networking.hpp" -#include "widgets/input.hpp" -#include "qt_window.hpp" +#include "setup.h" +#include "offroad/networking.h" +#include "widgets/input.h" +#include "qt_window.h" #define USER_AGENT "AGNOSSetup-0.1" diff --git a/selfdrive/ui/qt/setup/setup.hpp b/selfdrive/ui/qt/setup/setup.h similarity index 100% rename from selfdrive/ui/qt/setup/setup.hpp rename to selfdrive/ui/qt/setup/setup.h diff --git a/selfdrive/ui/qt/setup/wifi.cc b/selfdrive/ui/qt/setup/wifi.cc index 7abd267e..222379fb 100644 --- a/selfdrive/ui/qt/setup/wifi.cc +++ b/selfdrive/ui/qt/setup/wifi.cc @@ -6,10 +6,10 @@ #include #include -#include "wifi.hpp" -#include "offroad/networking.hpp" -#include "widgets/input.hpp" -#include "qt_window.hpp" +#include "wifi.h" +#include "offroad/networking.h" +#include "widgets/input.h" +#include "qt_window.h" void WifiSetup::finish() { qApp->exit(); diff --git a/selfdrive/ui/qt/setup/wifi.hpp b/selfdrive/ui/qt/setup/wifi.h similarity index 100% rename from selfdrive/ui/qt/setup/wifi.hpp rename to selfdrive/ui/qt/setup/wifi.h diff --git a/selfdrive/ui/qt/sidebar.cc b/selfdrive/ui/qt/sidebar.cc index a077168d..e024d8cf 100644 --- a/selfdrive/ui/qt/sidebar.cc +++ b/selfdrive/ui/qt/sidebar.cc @@ -1,6 +1,6 @@ #include "common/util.h" -#include "sidebar.hpp" -#include "qt_window.hpp" +#include "sidebar.h" +#include "qt_window.h" StatusWidget::StatusWidget(QString label, QString msg, QColor c, QWidget* parent) : QFrame(parent) { layout.setSpacing(0); diff --git a/selfdrive/ui/qt/sidebar.hpp b/selfdrive/ui/qt/sidebar.h similarity index 98% rename from selfdrive/ui/qt/sidebar.hpp rename to selfdrive/ui/qt/sidebar.h index d2a8a9e4..982f7515 100644 --- a/selfdrive/ui/qt/sidebar.hpp +++ b/selfdrive/ui/qt/sidebar.h @@ -2,7 +2,7 @@ #include -#include +#include #define COLOR_GOOD QColor(255, 255, 255) #define COLOR_WARNING QColor(218, 202, 37) diff --git a/selfdrive/ui/qt/sound.cc b/selfdrive/ui/qt/sound.cc index 641ffb22..682fb880 100644 --- a/selfdrive/ui/qt/sound.cc +++ b/selfdrive/ui/qt/sound.cc @@ -1,5 +1,5 @@ #include -#include "sound.hpp" +#include "sound.h" Sound::Sound() { for (auto &kv : sound_map) { diff --git a/selfdrive/ui/qt/sound.hpp b/selfdrive/ui/qt/sound.h similarity index 100% rename from selfdrive/ui/qt/sound.hpp rename to selfdrive/ui/qt/sound.h diff --git a/selfdrive/ui/qt/spinner.cc b/selfdrive/ui/qt/spinner.cc index 31b5f839..6e2c7bb1 100644 --- a/selfdrive/ui/qt/spinner.cc +++ b/selfdrive/ui/qt/spinner.cc @@ -8,8 +8,8 @@ #include #include -#include "spinner.hpp" -#include "qt_window.hpp" +#include "spinner.h" +#include "qt_window.h" #include "selfdrive/hardware/hw.h" TrackWidget::TrackWidget(QWidget *parent) : QWidget(parent) { diff --git a/selfdrive/ui/qt/spinner.hpp b/selfdrive/ui/qt/spinner.h similarity index 100% rename from selfdrive/ui/qt/spinner.hpp rename to selfdrive/ui/qt/spinner.h diff --git a/selfdrive/ui/qt/text.cc b/selfdrive/ui/qt/text.cc index 4a19fb65..205b94ea 100644 --- a/selfdrive/ui/qt/text.cc +++ b/selfdrive/ui/qt/text.cc @@ -5,9 +5,9 @@ #include #include -#include "qt_window.hpp" +#include "qt_window.h" #include "selfdrive/hardware/hw.h" -#include "widgets/scrollview.hpp" +#include "widgets/scrollview.h" int main(int argc, char *argv[]) { QApplication a(argc, argv); diff --git a/selfdrive/ui/qt/widgets/controls.cc b/selfdrive/ui/qt/widgets/controls.cc index 882e8cd7..24c58611 100644 --- a/selfdrive/ui/qt/widgets/controls.cc +++ b/selfdrive/ui/qt/widgets/controls.cc @@ -1,4 +1,4 @@ -#include "controls.hpp" +#include "controls.h" QFrame *horizontal_line(QWidget *parent) { QFrame *line = new QFrame(parent); diff --git a/selfdrive/ui/qt/widgets/controls.hpp b/selfdrive/ui/qt/widgets/controls.h similarity index 99% rename from selfdrive/ui/qt/widgets/controls.hpp rename to selfdrive/ui/qt/widgets/controls.h index 62fff672..65800718 100644 --- a/selfdrive/ui/qt/widgets/controls.hpp +++ b/selfdrive/ui/qt/widgets/controls.h @@ -7,7 +7,7 @@ #include #include "common/params.h" -#include "toggle.hpp" +#include "toggle.h" QFrame *horizontal_line(QWidget *parent = nullptr); diff --git a/selfdrive/ui/qt/widgets/drive_stats.cc b/selfdrive/ui/qt/widgets/drive_stats.cc index 6f810765..2d7debb2 100644 --- a/selfdrive/ui/qt/widgets/drive_stats.cc +++ b/selfdrive/ui/qt/widgets/drive_stats.cc @@ -4,8 +4,8 @@ #include #include "common/params.h" -#include "drive_stats.hpp" -#include "request_repeater.hpp" +#include "drive_stats.h" +#include "request_repeater.h" const double MILE_TO_KM = 1.60934; diff --git a/selfdrive/ui/qt/widgets/drive_stats.hpp b/selfdrive/ui/qt/widgets/drive_stats.h similarity index 100% rename from selfdrive/ui/qt/widgets/drive_stats.hpp rename to selfdrive/ui/qt/widgets/drive_stats.h diff --git a/selfdrive/ui/qt/widgets/input.cc b/selfdrive/ui/qt/widgets/input.cc index d5f4300d..07f5bf91 100644 --- a/selfdrive/ui/qt/widgets/input.cc +++ b/selfdrive/ui/qt/widgets/input.cc @@ -1,7 +1,7 @@ #include -#include "input.hpp" -#include "qt_window.hpp" +#include "input.h" +#include "qt_window.h" InputDialog::InputDialog(const QString &prompt_text, QWidget *parent) : QDialog(parent) { layout = new QVBoxLayout(); diff --git a/selfdrive/ui/qt/widgets/input.hpp b/selfdrive/ui/qt/widgets/input.h similarity index 98% rename from selfdrive/ui/qt/widgets/input.hpp rename to selfdrive/ui/qt/widgets/input.h index 1004469a..9dab208a 100644 --- a/selfdrive/ui/qt/widgets/input.hpp +++ b/selfdrive/ui/qt/widgets/input.h @@ -7,7 +7,7 @@ #include #include -#include "keyboard.hpp" +#include "keyboard.h" class InputDialog : public QDialog { Q_OBJECT diff --git a/selfdrive/ui/qt/widgets/keyboard.cc b/selfdrive/ui/qt/widgets/keyboard.cc index 0eda100e..ba2000eb 100644 --- a/selfdrive/ui/qt/widgets/keyboard.cc +++ b/selfdrive/ui/qt/widgets/keyboard.cc @@ -5,7 +5,7 @@ #include #include -#include "keyboard.hpp" +#include "keyboard.h" const int DEFAULT_STRETCH = 1; const int SPACEBAR_STRETCH = 3; diff --git a/selfdrive/ui/qt/widgets/keyboard.hpp b/selfdrive/ui/qt/widgets/keyboard.h similarity index 100% rename from selfdrive/ui/qt/widgets/keyboard.hpp rename to selfdrive/ui/qt/widgets/keyboard.h diff --git a/selfdrive/ui/qt/widgets/offroad_alerts.cc b/selfdrive/ui/qt/widgets/offroad_alerts.cc index 0e34d951..e395d1cf 100644 --- a/selfdrive/ui/qt/widgets/offroad_alerts.cc +++ b/selfdrive/ui/qt/widgets/offroad_alerts.cc @@ -3,7 +3,7 @@ #include #include -#include "offroad_alerts.hpp" +#include "offroad_alerts.h" #include "selfdrive/hardware/hw.h" #include "selfdrive/common/util.h" diff --git a/selfdrive/ui/qt/widgets/offroad_alerts.hpp b/selfdrive/ui/qt/widgets/offroad_alerts.h similarity index 94% rename from selfdrive/ui/qt/widgets/offroad_alerts.hpp rename to selfdrive/ui/qt/widgets/offroad_alerts.h index a7883623..ae6c03b3 100644 --- a/selfdrive/ui/qt/widgets/offroad_alerts.hpp +++ b/selfdrive/ui/qt/widgets/offroad_alerts.h @@ -6,7 +6,7 @@ #include #include "common/params.h" -#include "widgets/scrollview.hpp" +#include "widgets/scrollview.h" class OffroadAlert : public QFrame { Q_OBJECT diff --git a/selfdrive/ui/qt/widgets/scrollview.cc b/selfdrive/ui/qt/widgets/scrollview.cc index 9aab2b72..e3abae44 100644 --- a/selfdrive/ui/qt/widgets/scrollview.cc +++ b/selfdrive/ui/qt/widgets/scrollview.cc @@ -1,5 +1,5 @@ #include -#include "scrollview.hpp" +#include "scrollview.h" ScrollView::ScrollView(QWidget *w, QWidget *parent) : QScrollArea(parent){ setWidget(w); diff --git a/selfdrive/ui/qt/widgets/scrollview.hpp b/selfdrive/ui/qt/widgets/scrollview.h similarity index 100% rename from selfdrive/ui/qt/widgets/scrollview.hpp rename to selfdrive/ui/qt/widgets/scrollview.h diff --git a/selfdrive/ui/qt/widgets/setup.cc b/selfdrive/ui/qt/widgets/setup.cc index 183b80c0..342c2ff4 100644 --- a/selfdrive/ui/qt/widgets/setup.cc +++ b/selfdrive/ui/qt/widgets/setup.cc @@ -8,9 +8,9 @@ #include #include "QrCode.hpp" -#include "request_repeater.hpp" +#include "request_repeater.h" #include "common/params.h" -#include "setup.hpp" +#include "setup.h" using qrcodegen::QrCode; diff --git a/selfdrive/ui/qt/widgets/setup.hpp b/selfdrive/ui/qt/widgets/setup.h similarity index 98% rename from selfdrive/ui/qt/widgets/setup.hpp rename to selfdrive/ui/qt/widgets/setup.h index 2c5f51bc..5259d92e 100644 --- a/selfdrive/ui/qt/widgets/setup.hpp +++ b/selfdrive/ui/qt/widgets/setup.h @@ -5,7 +5,7 @@ #include #include -#include "api.hpp" +#include "api.h" class PairingQRWidget : public QWidget { Q_OBJECT diff --git a/selfdrive/ui/qt/widgets/ssh_keys.cc b/selfdrive/ui/qt/widgets/ssh_keys.cc index 5eeb22a8..42f77c47 100644 --- a/selfdrive/ui/qt/widgets/ssh_keys.cc +++ b/selfdrive/ui/qt/widgets/ssh_keys.cc @@ -1,7 +1,7 @@ #include #include -#include "widgets/input.hpp" -#include "widgets/ssh_keys.hpp" +#include "widgets/input.h" +#include "widgets/ssh_keys.h" #include "common/params.h" diff --git a/selfdrive/ui/qt/widgets/ssh_keys.hpp b/selfdrive/ui/qt/widgets/ssh_keys.h similarity index 96% rename from selfdrive/ui/qt/widgets/ssh_keys.hpp rename to selfdrive/ui/qt/widgets/ssh_keys.h index 24deee95..04eba835 100644 --- a/selfdrive/ui/qt/widgets/ssh_keys.hpp +++ b/selfdrive/ui/qt/widgets/ssh_keys.h @@ -4,7 +4,7 @@ #include #include -#include "widgets/controls.hpp" +#include "widgets/controls.h" #include "selfdrive/hardware/hw.h" // SSH enable toggle diff --git a/selfdrive/ui/qt/widgets/toggle.cc b/selfdrive/ui/qt/widgets/toggle.cc index 551630dd..d4eb215d 100644 --- a/selfdrive/ui/qt/widgets/toggle.cc +++ b/selfdrive/ui/qt/widgets/toggle.cc @@ -1,4 +1,4 @@ -#include "toggle.hpp" +#include "toggle.h" Toggle::Toggle(QWidget *parent) : QAbstractButton(parent), _height(80), diff --git a/selfdrive/ui/qt/widgets/toggle.hpp b/selfdrive/ui/qt/widgets/toggle.h similarity index 100% rename from selfdrive/ui/qt/widgets/toggle.hpp rename to selfdrive/ui/qt/widgets/toggle.h diff --git a/selfdrive/ui/qt/window.cc b/selfdrive/ui/qt/window.cc index 5c5e2179..5f5d84bd 100644 --- a/selfdrive/ui/qt/window.cc +++ b/selfdrive/ui/qt/window.cc @@ -1,4 +1,4 @@ -#include "window.hpp" +#include "window.h" #include "selfdrive/hardware/hw.h" MainWindow::MainWindow(QWidget *parent) : QWidget(parent) { diff --git a/selfdrive/ui/qt/window.hpp b/selfdrive/ui/qt/window.h similarity index 83% rename from selfdrive/ui/qt/window.hpp rename to selfdrive/ui/qt/window.h index fa1ab2c3..a079e1a6 100644 --- a/selfdrive/ui/qt/window.hpp +++ b/selfdrive/ui/qt/window.h @@ -3,10 +3,10 @@ #include #include -#include "offroad/settings.hpp" -#include "offroad/onboarding.hpp" -#include "home.hpp" -#include "../ui.hpp" +#include "offroad/settings.h" +#include "offroad/onboarding.h" +#include "home.h" +#include "../ui.h" class MainWindow : public QWidget { Q_OBJECT diff --git a/selfdrive/ui/replay/FileReader.cpp b/selfdrive/ui/replay/FileReader.cc similarity index 99% rename from selfdrive/ui/replay/FileReader.cpp rename to selfdrive/ui/replay/FileReader.cc index 84176e70..21653799 100644 --- a/selfdrive/ui/replay/FileReader.cpp +++ b/selfdrive/ui/replay/FileReader.cc @@ -1,4 +1,4 @@ -#include "FileReader.hpp" +#include "FileReader.h" #include "FrameReader.hpp" #include diff --git a/selfdrive/ui/replay/FileReader.hpp b/selfdrive/ui/replay/FileReader.h similarity index 100% rename from selfdrive/ui/replay/FileReader.hpp rename to selfdrive/ui/replay/FileReader.h diff --git a/selfdrive/ui/replay/Unlogger.cpp b/selfdrive/ui/replay/Unlogger.cc similarity index 99% rename from selfdrive/ui/replay/Unlogger.cpp rename to selfdrive/ui/replay/Unlogger.cc index 5eaebdb5..9ee0fa2b 100644 --- a/selfdrive/ui/replay/Unlogger.cpp +++ b/selfdrive/ui/replay/Unlogger.cc @@ -10,7 +10,7 @@ #include "cereal/gen/cpp/legacy.capnp.c++" #include "cereal/services.h" -#include "Unlogger.hpp" +#include "Unlogger.h" #include #include diff --git a/selfdrive/ui/replay/Unlogger.hpp b/selfdrive/ui/replay/Unlogger.h similarity index 97% rename from selfdrive/ui/replay/Unlogger.hpp rename to selfdrive/ui/replay/Unlogger.h index 9ba77c06..923d41e2 100644 --- a/selfdrive/ui/replay/Unlogger.hpp +++ b/selfdrive/ui/replay/Unlogger.h @@ -4,7 +4,7 @@ #include #include "clutil.h" #include "messaging.hpp" -#include "FileReader.hpp" +#include "FileReader.h" #include "FrameReader.hpp" #include "visionipc_server.h" diff --git a/selfdrive/ui/replay/main.cc b/selfdrive/ui/replay/main.cc index f7db95c0..88615806 100644 --- a/selfdrive/ui/replay/main.cc +++ b/selfdrive/ui/replay/main.cc @@ -1,6 +1,6 @@ #include -#include "replay.hpp" +#include "replay.h" int main(int argc, char *argv[]){ QApplication a(argc, argv); diff --git a/selfdrive/ui/replay/replay.cc b/selfdrive/ui/replay/replay.cc index 5ee02b77..d633b094 100644 --- a/selfdrive/ui/replay/replay.cc +++ b/selfdrive/ui/replay/replay.cc @@ -1,4 +1,4 @@ -#include "replay.hpp" +#include "replay.h" Replay::Replay(QString route_, int seek) : route(route_) { unlogger = new Unlogger(&events, &events_lock, &frs, seek); diff --git a/selfdrive/ui/replay/replay.hpp b/selfdrive/ui/replay/replay.h similarity index 91% rename from selfdrive/ui/replay/replay.hpp rename to selfdrive/ui/replay/replay.h index 46e7c01c..ea6f0e6a 100644 --- a/selfdrive/ui/replay/replay.hpp +++ b/selfdrive/ui/replay/replay.h @@ -8,9 +8,9 @@ #include -#include "qt/api.hpp" -#include "Unlogger.hpp" -#include "FileReader.hpp" +#include "qt/api.h" +#include "Unlogger.h" +#include "FileReader.h" #include "FrameReader.hpp" #include "visionipc_server.h" diff --git a/selfdrive/ui/ui.cc b/selfdrive/ui/ui.cc index 2369a6d9..0e9c87fc 100644 --- a/selfdrive/ui/ui.cc +++ b/selfdrive/ui/ui.cc @@ -9,9 +9,9 @@ #include "common/visionimg.h" #include "common/watchdog.h" #include "hardware/hw.h" -#include "ui.hpp" -#include "paint.hpp" -#include "qt_window.hpp" +#include "ui.h" +#include "paint.h" +#include "qt_window.h" #define BACKLIGHT_DT 0.25 #define BACKLIGHT_TS 2.00 diff --git a/selfdrive/ui/ui.hpp b/selfdrive/ui/ui.h similarity index 99% rename from selfdrive/ui/ui.hpp rename to selfdrive/ui/ui.h index c23525b6..2de42a29 100644 --- a/selfdrive/ui/ui.hpp +++ b/selfdrive/ui/ui.h @@ -20,7 +20,7 @@ #include "visionipc.h" #include "visionipc_client.h" -#include "qt/sound.hpp" +#include "qt/sound.h" #include #include