mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-10-17 03:59:19 +02:00
* refactor(sonar): use override instead of redundant virtual (cpp:S3471) * refactor(sonar): remove empty statements, one declaration per statement (cpp:S1116, cpp:S1659) * refactor(sonar): drop redundant lambda return types (cpp:S3574) * refactor(sonar): prefer using over typedef (cpp:S5416) * refactor(sonar): use =default for trivial special members (cpp:S3490) * refactor(sonar): use nullptr literal (cpp:S4962) * refactor(sonar): remove redundant access specifiers (cpp:S3539) * refactor(sonar): remove redundant casts (cpp:S1905) * refactor(sonar): use std::scoped_lock instead of std::lock_guard (cpp:S5997) * refactor(sonar): construct elements in place with emplace_back (cpp:S6003) * refactor(sonar): make narrowing conversions explicit (cpp:S5276) * refactor(sonar): mark unused parameters (cpp:S1172) Unused names are commented out; parameters used only on some platforms are marked [[maybe_unused]]. * refactor(sonar): declare non-mutating member functions const (cpp:S5817) Virtual functions are left untouched so overrides keep matching. * refactor(sonar): merge collapsible nested if statements (cpp:S1066) Comments that preceded the inner if are kept above the merged statement. * refactor(sonar): scope single-use variables in if init-statements (cpp:S6004) * fix(sonar): give polymorphic base classes virtual destructors (cpp:S1235) * refactor(sonar): use try_emplace for map insertion (cpp:S6030) * refactor(sonar): use auto where the type is spelled out on the right (cpp:S5827) * refactor(sonar): remove redundant parentheses (cpp:S1110) * refactor(sonar): document intentionally empty functions (cpp:S1186) * refactor(sonar): remove dead stores (cpp:S1854) Side effects (e.g. LISTLINE++) are kept. * refactor(sonar): remove unused variables, captures and private fields (cpp:S1481, cpp:S1068) * refactor(sonar): use structured bindings for pair access (cpp:S6005) * refactor(sonar): use range-based loops and ranges algorithms (cpp:S5566) * refactor(sonar): split chained assignments (cpp:S1121) * refactor(sonar): add default cases to switch statements (cpp:S3562) * refactor(sonar): use std::size for array lengths (cpp:S7127) * refactor(sonar): use std::ranges algorithms and std::erase(_if) (cpp:S6197) * refactor(sonar): access static members through the class (cpp:S2209) * refactor(sonar): add braces around nested if-else (cpp:S5261) * refactor(sonar): avoid side effects inside typeid operands (cpp:S5279) * refactor(sonar): drop top-level const from by-value return types (cpp:S5951) * refactor(sonar): declare variables separately from their type definitions (cpp:S3646) * refactor(sonar): declare loop counters in the for statement (cpp:S5955) * refactor(sonar): rely on class template argument deduction (cpp:S6012) * refactor(sonar): inherit base constructors instead of forwarding them (cpp:S5952) * refactor(sonar): rename locals that shadow outer declarations (cpp:S1117) Only local variables and definition parameters are renamed; shadowing struct fields and enumerators in headers are left for a separate change. * refactor(sonar): reduce enum qualification with using enum (cpp:S6177) Applied only where no unqualified name in the block could be captured by the introduced enumerators. * refactor(sonar): mark converting constructors explicit (cpp:S1709) sound_source and the gl::object conversion operators stay implicit; they are relied upon by copy-list-initialisation and GL calls. * refactor(sonar): initialise members in initialiser lists or declarations (cpp:S3230) * refactor(sonar): make read-only local references and pointers const (cpp:S5350) * refactor(sonar): take read-only pointer and reference parameters as const (cpp:S995) TTrain command handlers keep their signature, it is fixed by the handler table. * refactor(sonar): pass expensive-to-copy parameters by const reference (cpp:S1238) Signatures declared in files touched by PR 206 (Driver.h, EU07.cpp) and virtual overrides are left unchanged. * refactor(sonar): use transparent comparators for string-keyed maps (cpp:S6045) std::unordered_map instances and map types exposed in headers used by other modules are left as they are. * fix(sonar): do not use UI text as a printf format string (cpp:S5281) Text lines containing '%' would otherwise be interpreted as format specifiers by ImGui::TextColored. * refactor(sonar): use std::bind_front for callbacks (cpp:S5995) * refactor(sonar): drop const_cast on string literals passed to the Python C API (cpp:S859) * refactor(sonar): take read-only string parameters as std::string_view (cpp:S6009) The Windows messaging helpers keep std::string, they need c_str(). * refactor(sonar): make read-only global tables const (cpp:S5421) Mutable global state (flags, timers, singletons) is left as is. * refactor(sonar): replace single-case switch statements with if (cpp:S1301) * refactor(sonar): format UUIDs and log timestamps with std::format (cpp:S6494, cpp:S5945) * refactor(sonar): use std::array for local fixed-size arrays (cpp:S5945) Arrays that are class members or part of headers are left unchanged. * fix(sonar): test the bearing damage bit, not bit 0 (cpp:S872) 'DamageFlag & dtrain_bearing > 0' parsed as 'DamageFlag & (dtrain_bearing > 0)', i.e. DamageFlag & 1, so bearing friction reacted to the wrong damage flag. * refactor(sonar): assorted small fixes - empty() instead of size() comparisons (cpp:S1155) - member initialisers in declaration order (cpp:S3229) - no redundant c_str() when a std::string is accepted (cpp:S7121) - contains() on associative containers (cpp:S6171) - const reference instead of a copying range-for (cpp:S6032) - starts_with() for prefix checks (cpp:S6178) - no std::move on temporaries (cpp:S5274) - has_value() on std::optional (cpp:S7172) - bool literals for bool members (cpp:S5820) - inline only on the definition (cpp:S3548) - explicit base access specifier (cpp:S5965) - explicit element access instead of dereferencing an array (cpp:S7116) - rely on the C++20 rewritten operator!= (cpp:S6186) * refactor(sonar): more small fixes - std::format instead of iostream manipulators in to_string/to_hex_str (cpp:S6495); output verified identical, negative hex values keep the unsigned form - remove an empty compound statement (cpp:S108) - drop an always-false unsigned < 0 branch (cpp:S1768) - explicit lambda capture (cpp:S3608) - std::make_unique (cpp:S5950) * chore: strip stray carriage returns left in TTrain constructor comments * fix: keep quantize() in its own value type The S5276 change cast the result of the generic quantize<Type_>() to unsigned int, which truncated float/double callers (shadow angle slider, editor rotation snapping, AI speed control steps) and broke negative values. * fix(sonar): use integer loop counters in segment sampling (cpp:S2193) * refactor(sonar): clean up issues reported on PR 209 - remove locals left unused after the dead-store cleanup (cpp:S1481, cpp:S1854) - unnamed unused parameter (cpp:S1172) - single-use declarations moved into if init-statements (cpp:S6004) - auto for casted initialisers (cpp:S5827) - const references and pointers where nothing is modified (cpp:S5350) - rename structured bindings shadowed by inner declarations (cpp:S1117)
406 lines
14 KiB
C++
406 lines
14 KiB
C++
/*
|
|
This Source Code Form is subject to the
|
|
terms of the Mozilla Public License, v.
|
|
2.0. If a copy of the MPL was not
|
|
distributed with this file, You can
|
|
obtain one at
|
|
http://mozilla.org/MPL/2.0/.
|
|
*/
|
|
|
|
#include "stdafx.h"
|
|
#include "scripting/ladderlogic.h"
|
|
|
|
#include "utilities/parser.h"
|
|
#include "utilities/utilities.h"
|
|
#include "utilities/Logs.h"
|
|
|
|
namespace plc {
|
|
|
|
int basic_element::blank = -1;
|
|
|
|
auto
|
|
basic_element::input() -> int & {
|
|
|
|
switch( (basic_element::type_e)data.index() ) {
|
|
case basic_element::type_e::variable: {
|
|
return std::get<variable>(data).value;
|
|
}
|
|
case basic_element::type_e::timer: {
|
|
return std::get<timer>(data).value;
|
|
}
|
|
case basic_element::type_e::counter: {
|
|
return std::get<counter>(data).value;
|
|
}
|
|
}
|
|
|
|
return blank; // not reachable
|
|
}
|
|
|
|
auto
|
|
basic_element::output() const -> int {
|
|
|
|
switch( (basic_element::type_e)data.index() ) {
|
|
case basic_element::type_e::variable: {
|
|
return std::get<variable>(data).value;
|
|
}
|
|
case basic_element::type_e::timer: {
|
|
return std::get<timer>(data).time_elapsed >= std::get<timer>(data).time_preset ? std::get<timer>(data).value : 0;
|
|
}
|
|
case basic_element::type_e::counter: {
|
|
return std::get<counter>(data).count_value >= std::get<counter>(data).count_limit ? 1 : 0;
|
|
}
|
|
}
|
|
|
|
return -1; // not reachable
|
|
}
|
|
|
|
auto
|
|
basic_controller::input( element_handle const Element ) -> int & {
|
|
|
|
return m_elements[ Element - 1 ].input();
|
|
}
|
|
|
|
auto
|
|
basic_controller::output( element_handle const Element ) const -> int {
|
|
|
|
return m_elements[ Element - 1 ].output();
|
|
}
|
|
|
|
auto
|
|
basic_controller::load( std::string_view Filename) -> bool {
|
|
|
|
m_program.clear();
|
|
m_updateaccumulator = 0.0;
|
|
|
|
m_programfilename = Filename;
|
|
cParser input( m_programfilename, cParser::buffer_FILE );
|
|
bool result { false };
|
|
while( true == deserialize_operation( input ) ) {
|
|
result = true; // once would suffice but, eh
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
auto
|
|
basic_controller::update( double const Timestep ) -> int {
|
|
|
|
if( false == m_timerhandles.empty() ) {
|
|
// update timers
|
|
m_updateaccumulator += Timestep;
|
|
auto const updatecount = std::floor( m_updateaccumulator / m_updaterate );
|
|
if( updatecount > 0 ) {
|
|
auto const updateamount = static_cast<short>( updatecount * 1000 * m_updaterate );
|
|
for( auto const timerhandle : m_timerhandles ) {
|
|
auto &timer{ element( timerhandle ) };
|
|
auto &timerdata{ std::get<basic_element::timer>(timer.data) };
|
|
if( timer.input() > 0 ) {
|
|
timerdata.time_elapsed =
|
|
std::min<short>(
|
|
timerdata.time_preset,
|
|
timerdata.time_elapsed + updateamount );
|
|
}
|
|
else {
|
|
timerdata.time_elapsed = 0;
|
|
}
|
|
}
|
|
m_updateaccumulator -= m_updaterate * updatecount;
|
|
}
|
|
}
|
|
|
|
return run();
|
|
}
|
|
|
|
std::map<std::string, basic_controller::opcode_e, std::less<>> const basic_controller::m_operationcodemap = {
|
|
{ "ld", opcode_e::op_ld }, { "ldi", opcode_e::op_ldi },
|
|
{ "and", opcode_e::op_and }, { "ani", opcode_e::op_ani }, { "anb", opcode_e::op_anb },
|
|
{ "or", opcode_e::op_or }, { "ori", opcode_e::op_ori }, { "orb", opcode_e::op_orb },
|
|
{ "out", opcode_e::op_out }, { "set", opcode_e::op_set }, { "rst", opcode_e::op_rst },
|
|
{ "end", opcode_e::op_nop }
|
|
};
|
|
|
|
auto
|
|
basic_controller::deserialize_operation( cParser &Input ) -> bool {
|
|
|
|
auto operationdata{ Input.getToken<std::string>( true, "\n\r" ) };
|
|
if( true == operationdata.empty() ) { return false; }
|
|
|
|
operation operation = { opcode_e::op_nop, 0, 0, 0 };
|
|
|
|
cParser operationparser( operationdata, cParser::buffer_TEXT );
|
|
// HACK: operation potentially contains 1-2 parameters so we try to grab the whole set
|
|
operationparser.getTokens( 3, "\t " );
|
|
std::string operationname;
|
|
std::string operationelement;
|
|
std::string operationparameter;
|
|
operationparser
|
|
>> operationname
|
|
>> operationelement
|
|
>> operationparameter;
|
|
|
|
auto const lookup { m_operationcodemap.find( operationname ) };
|
|
operation.code = lookup != m_operationcodemap.end() ? lookup->second : opcode_e::op_nop;
|
|
if( lookup == m_operationcodemap.end() ) {
|
|
log_error( "contains unknown command \"" + operationname + "\"", static_cast<int>(Input.Line() - 1) );
|
|
}
|
|
|
|
if( operation.code == opcode_e::op_nop ) { return true; }
|
|
|
|
if( false == operationelement.empty() ) {
|
|
operation.element =
|
|
find_or_insert(
|
|
operationelement,
|
|
guess_element_type_from_name( operationelement ) );
|
|
}
|
|
|
|
if( false == operationparameter.empty() ) {
|
|
auto const [parametertype, parameterindex]{ split_string_and_number( operationparameter ) };
|
|
operation.parameter1 = static_cast<short>( parameterindex );
|
|
}
|
|
|
|
m_program.emplace_back( operation );
|
|
|
|
return true;
|
|
}
|
|
|
|
auto
|
|
basic_controller::insert( std::string const &Name, basic_element Element ) -> element_handle {
|
|
|
|
m_elements.push_back( Element );
|
|
m_elementnames.push_back( Name );
|
|
|
|
auto const elementhandle{ static_cast<short>( m_elements.size() ) };
|
|
|
|
// for timers make note of the element in the timer list
|
|
if( (basic_element::type_e)Element.data.index() == basic_element::type_e::timer ) {
|
|
m_timerhandles.push_back( elementhandle );
|
|
}
|
|
|
|
return elementhandle;
|
|
}
|
|
|
|
// runs one cycle of current program
|
|
auto
|
|
basic_controller::run() -> int {
|
|
|
|
m_accumulator.clear();
|
|
m_popstack = false;
|
|
auto programline { 1 };
|
|
|
|
for( auto const &operation : m_program ) {
|
|
// TBD: replace switch with function table for better readability/maintenance?
|
|
switch( operation.code ) {
|
|
|
|
case opcode_e::op_ld: {
|
|
if( m_popstack ) {
|
|
if( false == m_accumulator.empty() ) {
|
|
m_accumulator.pop_back();
|
|
}
|
|
m_popstack = false;
|
|
}
|
|
m_accumulator.emplace_back( output( operation.element ) );
|
|
break;
|
|
}
|
|
|
|
case opcode_e::op_ldi: {
|
|
if( m_popstack ) {
|
|
if( false == m_accumulator.empty() ) {
|
|
m_accumulator.pop_back();
|
|
}
|
|
m_popstack = false;
|
|
}
|
|
m_accumulator.emplace_back( inverse( output( operation.element ) ) );
|
|
break;
|
|
}
|
|
|
|
case opcode_e::op_and: {
|
|
if( m_accumulator.empty() ) {
|
|
log_error( "attempted AND with empty accumulator", programline );
|
|
break;
|
|
}
|
|
m_accumulator.back() &= output( operation.element );
|
|
break;
|
|
}
|
|
|
|
case opcode_e::op_ani: {
|
|
if( m_accumulator.empty() ) {
|
|
log_error( "attempted ANI with empty accumulator", programline );
|
|
break;
|
|
}
|
|
m_accumulator.back() &= inverse( output( operation.element ) );
|
|
break;
|
|
}
|
|
|
|
case opcode_e::op_anb: {
|
|
if( m_accumulator.size() < 2 ) {
|
|
log_error( "attempted ANB with empty stack", programline );
|
|
break;
|
|
}
|
|
auto const operand { m_accumulator.back() };
|
|
m_accumulator.pop_back();
|
|
m_accumulator.back() &= operand;
|
|
break;
|
|
}
|
|
|
|
case opcode_e::op_or: {
|
|
if( m_accumulator.empty() ) {
|
|
log_error( "attempted OR with empty accumulator", programline );
|
|
break;
|
|
}
|
|
m_accumulator.back() |= output( operation.element );
|
|
break;
|
|
}
|
|
|
|
case opcode_e::op_ori : {
|
|
if( m_accumulator.empty() ) {
|
|
log_error( "attempted ORI with empty accumulator", programline );
|
|
break;
|
|
}
|
|
m_accumulator.back() |= inverse( output( operation.element ) );
|
|
break;
|
|
}
|
|
|
|
case opcode_e::op_orb: {
|
|
if( m_accumulator.size() < 2 ) {
|
|
log_error( "attempted ORB with empty stack", programline );
|
|
break;
|
|
}
|
|
auto const operand{ m_accumulator.back() };
|
|
m_accumulator.pop_back();
|
|
m_accumulator.back() |= operand;
|
|
break;
|
|
}
|
|
|
|
case opcode_e::op_out: {
|
|
if( m_accumulator.empty() ) {
|
|
log_error( "attempted OUT with empty accumulator", programline );
|
|
break;
|
|
}
|
|
auto &target { element( operation.element ) };
|
|
auto const initialstate { target.input() };
|
|
target.input() = m_accumulator.back();
|
|
// additional operations for advanced element types
|
|
switch( (basic_element::type_e)target.data.index() ) {
|
|
case basic_element::type_e::timer: {
|
|
std::get<basic_element::timer>(target.data).time_preset = operation.parameter1;
|
|
break;
|
|
}
|
|
case basic_element::type_e::counter: {
|
|
std::get<basic_element::counter>(target.data).count_limit = operation.parameter1;
|
|
// increase counter value on input activation
|
|
if( initialstate == 0 && target.input() != 0 ) {
|
|
/*
|
|
// TBD: use overflow-prone version instead of safe one?
|
|
target.data.counter.count_value += 1;
|
|
*/
|
|
std::get<basic_element::counter>(target.data).count_value =
|
|
std::min<short>(
|
|
std::get<basic_element::counter>(target.data).count_limit,
|
|
std::get<basic_element::counter>(target.data).count_value + 1 );
|
|
}
|
|
break;
|
|
}
|
|
default:
|
|
break;
|
|
}
|
|
// accumulator was published at least once, next ld(i) operation will start a new rung
|
|
m_popstack = true;
|
|
break;
|
|
}
|
|
|
|
case opcode_e::op_set: {
|
|
if( m_accumulator.empty() ) {
|
|
log_error( "attempted SET with empty accumulator", programline );
|
|
break;
|
|
}
|
|
if( m_accumulator.back() == 0 ) {
|
|
break;
|
|
}
|
|
auto &target { element( operation.element ) };
|
|
target.input() = m_accumulator.back();
|
|
// additional operations for advanced element types
|
|
switch( (basic_element::type_e)target.data.index() ) {
|
|
case basic_element::type_e::counter: {
|
|
// NOTE: siemens counter behavior
|
|
// TODO: check whether this is true for mitsubishi
|
|
std::get<basic_element::counter>(target.data).count_limit = std::get<basic_element::counter>(target.data).count_value;
|
|
/*
|
|
if( ( initialstate == 0 ) && ( target.input() != 0 ) ) {
|
|
target.data.counter.count_value =
|
|
std::min<short>(
|
|
target.data.counter.count_limit,
|
|
target.data.counter.count_value + 1 );
|
|
}
|
|
*/
|
|
break;
|
|
}
|
|
default:
|
|
break;
|
|
}
|
|
// accumulator was published at least once, next ld(i) operation will start a new rung
|
|
m_popstack = true;
|
|
break;
|
|
}
|
|
|
|
case opcode_e::op_rst: {
|
|
if( m_accumulator.empty() ) {
|
|
log_error( "attempted RST with empty accumulator", programline );
|
|
break;
|
|
}
|
|
if( m_accumulator.back() == 0 ) {
|
|
break;
|
|
}
|
|
auto &target{ element( operation.element ) };
|
|
target.input() = 0;
|
|
// additional operations for advanced element types
|
|
switch( (basic_element::type_e)target.data.index() ) {
|
|
case basic_element::type_e::counter: {
|
|
std::get<basic_element::counter>(target.data).count_value = 0;
|
|
break;
|
|
}
|
|
default:
|
|
break;
|
|
}
|
|
// accumulator was published at least once, next ld(i) operation will start a new rung
|
|
m_popstack = true;
|
|
break;
|
|
}
|
|
default: {
|
|
break;
|
|
}
|
|
}
|
|
++programline;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
basic_controller::log_error( std::string const &Error, int const Line ) const {
|
|
|
|
ErrorLog(
|
|
"Bad plc program: \"" + m_programfilename + "\" "
|
|
+ Error
|
|
+ ( Line > 0 ?
|
|
" (line " + std::to_string( Line ) + ")" :
|
|
"" ) );
|
|
}
|
|
|
|
auto
|
|
basic_controller::guess_element_type_from_name( std::string const &Name ) const -> basic_element::type_e {
|
|
using enum plc::basic_element::type_e;
|
|
|
|
auto const [nametype, nameindex]{ split_string_and_number( Name ) };
|
|
|
|
if( nametype == "t" || nametype == "ton" || nametype.find("timer.") == 0 ) {
|
|
return timer;
|
|
}
|
|
if( nametype == "c" || nametype.find("counter.") == 0 ) {
|
|
return counter;
|
|
}
|
|
|
|
return variable;
|
|
}
|
|
|
|
} // plc
|