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

radio channel selection tweak, minor bug fixes

Browse Source
This commit is contained in:
tmj-fstate
2020-07-26 13:49:25 +02:00
parent f80a41d3dd
commit 138b793f5a
12 changed files with 47 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ladderlogic.cpp
View File

@@ -152,7 +152,7 @@ basic_controller::deserialize_operation( cParser &Input ) -> bool {
}
if( false == operationparameter.empty() ) {
auto const parameter{ split_index( operationparameter ) };
auto const parameter{ split_string_and_number( operationparameter ) };
operation.parameter1 = static_cast<short>( parameter.second );
}
@@ -379,7 +379,7 @@ basic_controller::log_error( std::string const &Error, int const Line ) const {
auto
basic_controller::guess_element_type_from_name( std::string const &Name ) const -> basic_element::type_e {
auto const name { split_index( Name ) };
auto const name { split_string_and_number( Name ) };
if( ( name.first == "t" ) || ( name.first == "ton" ) || ( name.first.find( "timer." ) == 0 ) ) {
return basic_element::type_e::timer;