eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-20 17:09:19 +02:00
Code Issues 123 Wiki Activity

reformat: remove redundant qualifiers

Browse Source
This commit is contained in:
jerrrrycho
2026-07-04 05:34:23 +02:00
parent 20e7a99516
commit cf9fb07800
98 changed files with 2290 additions and 2290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripting/PyIntStub.cpp
View File

@@ -19,7 +19,7 @@ void python_taskqueue::exit()
{
}
bool python_taskqueue::insert(python_taskqueue::task_request const &Task)
bool python_taskqueue::insert(task_request const &Task)
{
return false;
}

16
scripting/ladderlogic.cpp
View File

@@ -21,14 +21,14 @@ int basic_element::blank = -1;
auto
basic_element::input() -> int & {
switch( (basic_element::type_e)data.index() ) {
case basic_element::type_e::variable: {
switch( (type_e)data.index() ) {
case type_e::variable: {
return std::get<variable>(data).value;
}
case basic_element::type_e::timer: {
case type_e::timer: {
return std::get<timer>(data).value;
}
case basic_element::type_e::counter: {
case type_e::counter: {
return std::get<counter>(data).value;
}
}
@@ -39,14 +39,14 @@ basic_element::input() -> int & {
auto
basic_element::output() const -> int {
switch( (basic_element::type_e)data.index() ) {
case basic_element::type_e::variable: {
switch( (type_e)data.index() ) {
case type_e::variable: {
return std::get<variable>(data).value;
}
case basic_element::type_e::timer: {
case 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: {
case type_e::counter: {
return std::get<counter>(data).count_value >= std::get<counter>(data).count_limit ? 1 : 0;
}
}

6
scripting/ladderlogic.h
View File

@@ -27,7 +27,7 @@ public:
};
// constructors
template<typename ...Args_>
basic_element( basic_element::type_e Type = basic_element::type_e::variable, Args_ ...Args );
basic_element( type_e Type = type_e::variable, Args_ ...Args );
// methods
// data access
auto input() -> int &;
@@ -116,7 +116,7 @@ private:
auto element( element_handle const Element ) -> basic_element & {
return m_elements[ Element - 1 ]; }
// members
static std::map<std::string, basic_controller::opcode_e> const m_operationcodemap;
static std::map<std::string, opcode_e> 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
@@ -129,7 +129,7 @@ private:
};
template<typename ...Args_>
basic_element::basic_element( basic_element::type_e Type, Args_ ...Args )
basic_element::basic_element( type_e Type, Args_ ...Args )
{
switch( Type ) {
case type_e::variable: {