Revert "Add device_type to class Hardware (#20535)"

This reverts commit 9922688f8b.
pull/20539/head
Willem Melching 4 years ago
parent 9922688f8b
commit 7372b9bba5
  1. 3
      selfdrive/hardware/base.h
  2. 2
      selfdrive/hardware/eon/hardware.h
  3. 1
      selfdrive/hardware/tici/hardware.h
  4. 3
      selfdrive/ui/qt/home.cc

@ -2,14 +2,13 @@
#include <cstdlib> #include <cstdlib>
#include <fstream> #include <fstream>
#include "cereal/gen/cpp/log.capnp.h"
// no-op base hw class // no-op base hw class
class HardwareNone { class HardwareNone {
public: public:
static constexpr float MAX_VOLUME = 0; static constexpr float MAX_VOLUME = 0;
static constexpr float MIN_VOLUME = 0; static constexpr float MIN_VOLUME = 0;
static const cereal::InitData::DeviceType device_type = cereal::InitData::DeviceType::PC;
static std::string get_os_version() { return "openpilot for PC"; }; static std::string get_os_version() { return "openpilot for PC"; };

@ -14,8 +14,6 @@ class HardwareEon : public HardwareNone {
public: public:
static constexpr float MAX_VOLUME = 1.0; static constexpr float MAX_VOLUME = 1.0;
static constexpr float MIN_VOLUME = 0.5; static constexpr float MIN_VOLUME = 0.5;
static constexpr float MIN_VOLUME = 0.5;
static const cereal::InitData::DeviceType device_type = cereal::InitData::DeviceType::EON;
static std::string get_os_version() { static std::string get_os_version() {
return "NEOS " + util::read_file("/VERSION"); return "NEOS " + util::read_file("/VERSION");

@ -11,7 +11,6 @@ class HardwareTici : public HardwareNone {
public: public:
static constexpr float MAX_VOLUME = 0.5; static constexpr float MAX_VOLUME = 0.5;
static constexpr float MIN_VOLUME = 0.4; static constexpr float MIN_VOLUME = 0.4;
static const cereal::InitData::DeviceType device_type = cereal::InitData::DeviceType::TICI;
static std::string get_os_version() { static std::string get_os_version() {
return "AGNOS " + util::read_file("/VERSION"); return "AGNOS " + util::read_file("/VERSION");

@ -199,8 +199,7 @@ static void handle_display_state(UIState* s, bool user_input) {
constexpr float accel_samples = 5*UI_FREQ; constexpr float accel_samples = 5*UI_FREQ;
static float accel_prev = 0., gyro_prev = 0.; static float accel_prev = 0., gyro_prev = 0.;
bool should_wake = s->scene.started || s->scene.ignition || bool should_wake = s->scene.started || s->scene.ignition || user_input;
user_input || Hardware::device_type == cereal::InitData::DeviceType::PC;
if (!should_wake) { if (!should_wake) {
// tap detection while display is off // tap detection while display is off
bool accel_trigger = abs(s->scene.accel_sensor - accel_prev) > 0.2; bool accel_trigger = abs(s->scene.accel_sensor - accel_prev) > 0.2;

Loading…
Cancel
Save