uvos/TrainControllerUi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix feedback

Browse Source
This commit is contained in:
uvos
2022-02-01 22:47:15 +01:00
parent 3acc34d145
commit ee1baab3f6
6 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/items/train.cpp
View File

@ -1,11 +1,10 @@
#include "train.h" #include "train.h"
Train::Train(uint8_t id, uint8_t address, uint8_t functionMask): Train::Train(uint8_t id, uint8_t address, uint8_t functionMask, int8_t initalValue):
Item(address, QString("Train ")+QString::number(id), initalValue),
functionMask_(functionMask), functionMask_(functionMask),
train_id_(id) train_id_(id)
{ {
itemId_ = address;
name_ = QString("Train ")+QString::number(id);
} }
Microcontroller *Train::micro = nullptr; Microcontroller *Train::micro = nullptr;

2
src/items/train.h
View File

@ -12,7 +12,7 @@ class Train : public Item
public: public:
static Microcontroller *micro; static Microcontroller *micro;
Train(uint8_t id = 0, uint8_t address = 0, uint8_t functionMask = 0); Train(uint8_t id = 0, uint8_t address = 0, uint8_t functionMask = 0, int8_t initalValue = 0);
uint8_t getFunctionMask() {return functionMask_;} uint8_t getFunctionMask() {return functionMask_;}

5
src/items/turnout.cpp
View File

@ -2,8 +2,9 @@
Microcontroller *Turnout::micro = nullptr; Microcontroller *Turnout::micro = nullptr;
Turnout::Turnout(uint8_t id, uint8_t address, uint8_t subaddress) Turnout::Turnout(uint8_t id, uint8_t address, uint8_t subaddress, int8_t initalValue)
: subaddress_(subaddress), turnoutId_(id) : Item(address | (subaddress << 8), QString("Turnout ")+QString::number(id), initalValue),
subaddress_(subaddress), turnoutId_(id)
{ {
itemId_ = address | (subaddress << 8); itemId_ = address | (subaddress << 8);
name_ = QString("Turnout ")+QString::number(id); name_ = QString("Turnout ")+QString::number(id);

2
src/items/turnout.h
View File

@ -11,7 +11,7 @@ class Turnout : public Item
public: public:
static Microcontroller *micro; static Microcontroller *micro;
explicit Turnout(uint8_t id = 0, uint8_t address = 0, uint8_t subaddress = 0); explicit Turnout(uint8_t id = 0, uint8_t address = 0, uint8_t subaddress = 0, int8_t initalValue = 0);
virtual void setValue(int8_t value); virtual void setValue(int8_t value);
uint8_t getTurnoutId(){return turnoutId_;} uint8_t getTurnoutId(){return turnoutId_;}
}; };

1
src/main.cpp
View File

@ -94,6 +94,7 @@ int main(int argc, char *argv[])
ItemStore items; ItemStore items;
QObject::connect(&micro, &Microcontroller::gotItemList, &items, &ItemStore::addItems); QObject::connect(&micro, &Microcontroller::gotItemList, &items, &ItemStore::addItems);
QObject::connect(&micro, &Microcontroller::itemChanged, &items, &ItemStore::itemStateChanged);
//mainwindow //mainwindow
MainWindow w(&micro, &items); MainWindow w(&micro, &items);

4
src/microcontroller.cpp
View File

@ -150,7 +150,7 @@ void Microcontroller::processItemState(const QString& buffer)
{ {
if(_buffer.startsWith("TRAIN NUMBER:")) if(_buffer.startsWith("TRAIN NUMBER:"))
itemChanged(static_cast<ItemData>(*processTrainLine(buffer))); itemChanged(static_cast<ItemData>(*processTrainLine(buffer)));
else if(_buffer.startsWith("TRAIN NUMBER:")) else if(_buffer.startsWith("TURNOUT NUMBER:"))
itemChanged(static_cast<ItemData>(*processTurnoutLine(buffer))); itemChanged(static_cast<ItemData>(*processTurnoutLine(buffer)));
} }
@ -170,7 +170,7 @@ void Microcontroller::processMicroReturn()
{ {
listMode = TURNOUT_LIST; listMode = TURNOUT_LIST;
} }
else if(_buffer.startsWith("TRAIN NUMBER:") || _buffer.startsWith("TRAIN NUMBER:")) else if(_buffer.startsWith("TRAIN NUMBER:") || _buffer.startsWith("TURNOUT NUMBER:"))
{ {
processItemState(_buffer); processItemState(_buffer);
} }