eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 22:39:18 +02:00
Code Issues 121 Wiki Activity

Merge branch 'gfx-work' into sim

Browse Source
This commit is contained in:
milek7
2019-04-15 12:10:11 +02:00
parent 491debdd5e b40505715b
commit aae73106f4
34 changed files with 489 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivermode.cpp
View File

@@ -45,9 +45,11 @@ driver_mode::drivermode_input::poll() {
if( true == Global.InputGamepad ) {
gamepad.poll();
}
#ifdef WITH_UART
if( uart != nullptr ) {
uart->poll();
}
#endif
/*
// TBD, TODO: wrap current command in object, include other input sources?
input::command = (
@@ -67,10 +69,12 @@ driver_mode::drivermode_input::init() {
if( true == Global.InputGamepad ) {
gamepad.init();
}
#ifdef WITH_UART
if( true == Global.uart_conf.enable ) {
uart = std::make_unique<uart_input>();
uart->init();
}
#endif
if (Global.motiontelemetry_conf.enable)
telemetry = std::make_unique<motiontelemetry>();