From ddd0b3a7326d9efd8511b5785c72739997108d1a Mon Sep 17 00:00:00 2001 From: uvos Date: Fri, 11 Mar 2022 21:42:28 +0100 Subject: [PATCH] small cleanup --- src/items/auxitem.cpp | 19 ------------------- src/items/auxitem.h | 21 --------------------- src/microcontroller.h | 9 +-------- 3 files changed, 1 insertion(+), 48 deletions(-) delete mode 100644 src/items/auxitem.cpp delete mode 100644 src/items/auxitem.h diff --git a/src/items/auxitem.cpp b/src/items/auxitem.cpp deleted file mode 100644 index 860a121..0000000 --- a/src/items/auxitem.cpp +++ /dev/null @@ -1,19 +0,0 @@ -#include "auxitem.h" - -AuxItem::AuxItem(Microcontroller* micro, uint32_t itemIdIn, QString name, uint8_t value, - QObject* parent): Item(itemIdIn, name, value, parent), micro_(micro) -{ - -} - -void AuxItem::setValue(uint8_t value) -{ - Item::setValue(value); - micro_->setAuxPwm(value); -} - -void AuxItem::store(QJsonObject &json) -{ - json["Type"] = "Aux"; - Item::store(json); -} diff --git a/src/items/auxitem.h b/src/items/auxitem.h deleted file mode 100644 index 512144f..0000000 --- a/src/items/auxitem.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "item.h" -#include "../microcontroller.h" - -class AuxItem: public Item -{ - Q_OBJECT -private: - Microcontroller* micro_; - -public slots: - - virtual void setValue(uint8_t value); - -public: - AuxItem(Microcontroller* micro, uint32_t itemIdIn = QRandomGenerator::global()->generate(), QString name = "", - uint8_t value = 0, QObject* parent = nullptr); - - virtual void store(QJsonObject& json); -}; diff --git a/src/microcontroller.h b/src/microcontroller.h index 22e0c21..c49afd6 100644 --- a/src/microcontroller.h +++ b/src/microcontroller.h @@ -19,15 +19,8 @@ class Microcontroller : public QObject { - Q_OBJECT -public: - - static constexpr char AMP_RELAY = 0; - static constexpr char SENSOR_TEMPERATURE = 1; - static constexpr char SENSOR_DOOR = 0 ; - private: static constexpr int TRAIN_LIST = 1; @@ -80,7 +73,7 @@ signals: void textRecived(const QString string); void itemChanged(ItemData relay); void auxStateChanged(int value); - void gotItemList(std::vector< std::shared_ptr >&); + void gotItemList(std::vector>&); }; #endif // MICROCONTROLLER_H