eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

dangling pointer crash semi-fix, minor bug fixes, minor code correctness enhancements

Browse Source
This commit is contained in:
tmj-fstate
2018-07-16 02:40:53 +02:00
parent ed1e0d8a10
commit 3751c8a0a8
28 changed files with 895 additions and 946 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
uart.cpp
View File

@@ -95,7 +95,7 @@ uart_input::recall_bindings() {
auto const bindingtype { typelookup->second };
std::array<user_command, 2> bindingcommands { user_command::none, user_command::none };
auto const commandcount { ( bindingtype == toggle ? 2 : 1 ) };
auto const commandcount { ( bindingtype == input_type_t::toggle ? 2 : 1 ) };
for( int commandidx = 0; commandidx < commandcount; ++commandidx ) {
// grab command(s) associated with the input pin
auto const bindingcommandname { entryparser.getToken<std::string>() };
@@ -166,14 +166,14 @@ void uart_input::poll()
auto const type { std::get<input_type_t>( entry ) };
auto const action { (
type != impulse ?
type != input_type_t::impulse ?
GLFW_PRESS :
( true == state ?
GLFW_PRESS :
GLFW_RELEASE ) ) };
auto const command { (
type != toggle ?
type != input_type_t::toggle ?
std::get<2>( entry ) :
( true == state ?
std::get<2>( entry ) :