Fixed multi aspect signal setting

artemis-beta · Feb 28, 2020 · a490e99 · a490e99
1 parent 5d62a5b
commit a490e99
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/interlocking.cxx b/interlocking.cxx
@@ -209,7 +209,6 @@ void EWRB::InterLocking::_create_logic_table()
     _logic[26] = {{EWRB::LeverState::On,            // Points 26 can only be changed when SIG. 11 and SIG. 38 are ON
                    {{11, EWRB::LeverState::Off},     // Points 26 reverse requires points 27 to be reverse
                     {12, EWRB::LeverState::Off},
-                    {27, EWRB::LeverState::On},
                     {38, EWRB::LeverState::Off}}},
                   {EWRB::LeverState::Off,
                      {{11, EWRB::LeverState::Off},
@@ -222,7 +221,6 @@ void EWRB::InterLocking::_create_logic_table()
                     {38, EWRB::LeverState::Off}}},
                   {EWRB::LeverState::Off,
                      {{37, EWRB::LeverState::Off},
-                      {26, EWRB::LeverState::Off},  // Points 27 normal requires Points 26 to be normal
                       {38, EWRB::LeverState::Off}}}
                  };
 

diff --git a/leverframe.cxx b/leverframe.cxx
@@ -265,6 +265,12 @@ void EWRB::LeverFrame::update(const int& i)
 {
     qDebug() << "Running Frame Update...";
 
+    int signal_id = i;
+
+    if(i == 3) signal_id = 2;
+    else if (i == 34 || i == 35) signal_id = 33;
+    else if (i == 12) signal_id = 11;
+
     if(i == -1)
     {
 
@@ -281,7 +287,10 @@ void EWRB::LeverFrame::update(const int& i)
 
     else
     {
-        if(_map_indicators.contains(i))_map_indicators[i]->update();
-        if(_sig_indicators.contains(i))_sig_indicators[i]->update();
+        if(_map_indicators.contains(signal_id))
+        {
+            _map_indicators[signal_id]->update();
+        }
+        if(_sig_indicators.contains(signal_id))_sig_indicators[signal_id]->update();
     }
 }