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)
170 lines
5.2 KiB
C++
170 lines
5.2 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/.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "utilities/Classes.h"
|
|
|
|
namespace plc {
|
|
|
|
using element_handle = short;
|
|
|
|
// basic logic element.
|
|
class basic_element {
|
|
public:
|
|
// types
|
|
// rtti
|
|
enum class type_e {
|
|
variable,
|
|
timer,
|
|
counter,
|
|
};
|
|
// constructors
|
|
template<typename ...Args_>
|
|
explicit basic_element( basic_element::type_e Type = basic_element::type_e::variable, Args_ ...Args );
|
|
// methods
|
|
// data access
|
|
auto input() -> int &;
|
|
auto output() const -> int;
|
|
private:
|
|
// types
|
|
// cell content variants
|
|
struct variable {
|
|
std::int32_t value;
|
|
};
|
|
struct timer {
|
|
std::int32_t value;
|
|
short time_preset;
|
|
short time_elapsed;
|
|
};
|
|
struct counter {
|
|
std::int32_t value;
|
|
short count_limit;
|
|
short count_value;
|
|
};
|
|
// members
|
|
std::variant<variable, timer, counter> data;
|
|
|
|
static int blank;
|
|
// friends
|
|
friend class basic_controller;
|
|
};
|
|
|
|
class basic_controller {
|
|
|
|
public:
|
|
// methods
|
|
auto load( std::string_view Filename) -> bool;
|
|
auto update( double const Timestep ) -> int;
|
|
// finds element with specified name, potentially creating new element of specified type initialized with provided arguments. returns: handle to the element
|
|
template<typename ...Args_>
|
|
auto find_or_insert( std::string const &Name, basic_element::type_e Type = basic_element::type_e::variable, Args_ ...Args ) -> element_handle;
|
|
// data access
|
|
auto input( element_handle const Element ) -> int &;
|
|
auto output( element_handle const Element ) const -> int;
|
|
|
|
private:
|
|
//types
|
|
// plc program instruction
|
|
enum class opcode_e : short {
|
|
op_nop,
|
|
op_ld,
|
|
op_ldi,
|
|
op_and,
|
|
op_ani,
|
|
op_anb,
|
|
op_or,
|
|
op_ori,
|
|
op_orb,
|
|
op_out,
|
|
op_set,
|
|
op_rst,
|
|
};
|
|
struct operation {
|
|
opcode_e code;
|
|
short element;
|
|
short parameter1;
|
|
short parameter2;
|
|
};
|
|
// containers
|
|
using element_sequence = std::vector<basic_element>;
|
|
using name_sequence = std::vector<std::string>;
|
|
using operation_sequence = std::vector<operation>;
|
|
using handle_sequence = std::vector<element_handle>;
|
|
// methods
|
|
auto deserialize_operation( cParser &Input ) -> bool;
|
|
// adds provided item to the collection. returns: true if there's no duplicate with the same name, false otherwise
|
|
auto insert( std::string const &Name, basic_element Element ) -> element_handle;
|
|
// runs one cycle of current program. returns: error code or 0 if there's no error
|
|
auto run() -> int;
|
|
void log_error( std::string const &Error, int const Line = -1 ) const;
|
|
auto guess_element_type_from_name( std::string const &Name ) const->basic_element::type_e;
|
|
inline
|
|
auto inverse( int const Value ) const -> int {
|
|
return Value == 0 ? 1 : 0; }
|
|
// element access
|
|
inline
|
|
auto element( element_handle const Element ) const -> basic_element {
|
|
return m_elements[ Element - 1 ]; }
|
|
inline
|
|
auto element( element_handle const Element ) -> basic_element & {
|
|
return m_elements[ Element - 1 ]; }
|
|
// members
|
|
static std::map<std::string, basic_controller::opcode_e, std::less<>> const m_operationcodemap;
|
|
element_sequence m_elements; // collection of elements accessed by the plc program
|
|
name_sequence m_elementnames;
|
|
handle_sequence m_timerhandles; // indices of timer elements, timer update optimization helper
|
|
std::string m_programfilename; // cached filename of currently loaded program
|
|
operation_sequence m_program; // current program for the plc
|
|
std::vector<int> m_accumulator; // state accumulator for currently processed program rung
|
|
bool m_popstack { false }; // whether ld(i) operation should pop the accumulator stack or just add onto it
|
|
double m_updateaccumulator { 0.0 }; //
|
|
double m_updaterate { 0.1 };
|
|
};
|
|
|
|
template<typename ...Args_>
|
|
basic_element::basic_element( basic_element::type_e Type, Args_ ...Args )
|
|
{
|
|
switch( Type ) {
|
|
case type_e::variable: {
|
|
data = variable{ Args ... };
|
|
break;
|
|
}
|
|
case type_e::timer: {
|
|
data = timer{ Args ... };
|
|
break;
|
|
}
|
|
case type_e::counter: {
|
|
data = counter{ Args ... };
|
|
break;
|
|
}
|
|
default: {
|
|
// TBD: log error if we get here?
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
template<typename ...Args_>
|
|
auto basic_controller::find_or_insert( std::string const &Name, basic_element::type_e Type, Args_ ...Args ) -> element_handle {
|
|
// NOTE: because we expect all lookups to be performed only (once) during controller (code) initialization
|
|
// we're using simple linear container for names, to allow for easy access to both elements and their names with the same handle
|
|
auto index { 1 };
|
|
for( auto const &name : m_elementnames ) {
|
|
if( name == Name ) {
|
|
return static_cast<element_handle>(index);
|
|
}
|
|
++index;
|
|
}
|
|
// create and insert a new element if we didn't find existing one
|
|
return insert( Name, basic_element( Type, Args ... ) );
|
|
}
|
|
|
|
} // plc
|