16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 00:09:18 +02:00

Merge branch 'gfx-work' into sim

This commit is contained in:
milek7
2019-09-07 02:53:57 +02:00
26 changed files with 2320 additions and 630 deletions

3
uart.h
View File

@@ -27,6 +27,8 @@ public:
float hvuart = 65535.0f;
float currentmax = 10000.0f;
float currentuart = 65535.0f;
float lvmax = 150.0f;
float lvuart = 65535.0f;
float tachoscale = 1.0f;
bool mainenable = true;
@@ -67,4 +69,5 @@ private:
std::chrono::time_point<std::chrono::high_resolution_clock> last_update;
conf_t conf;
bool data_pending = false;
std::uint8_t m_trainstatecab { 0 }; // helper, keeps track of last active cab. 0: front cab, 1: rear cab
};