Baseline 4 preliminary steps

CMakeLists.txt

@@ -2,6 +2,7 @@ cmake_minimum_required (VERSION 3.14)
 project (ETCS)
 set(CMAKE_CXX_STANDARD 17)
 option(SIMRAIL "SimRail" OFF)
+option(DEBUG_VERBOSE "Print debug messages" ON)
 if (NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "wasm.*")
     set (WASM FALSE)
 else()
@@ -32,5 +33,6 @@ endif()
 if (WIN32)
     add_definitions(-D_WIN32_WINNT=0x602)
 endif()
+add_definitions(-DBASELINE=3)
 add_subdirectory(EVC)
 add_subdirectory(DMI)

DMI/STM/stm_objects.cpp

@@ -8,13 +8,15 @@
  */
 #include "stm_objects.h"
 #include "../monitor.h"
+#include "../tcp/server.h"
 #include "../graphics/display.h"
 #include "../graphics/text_button.h"
 #include "../graphics/icon_button.h"
 #include "../messages/messages.h"
 #include "../time_etcs.h"
 #include "../../EVC/Packets/STM/15.h"
 #include "../../EVC/Packets/STM/32.h"
+#include "../../EVC/Packets/STM/34.h"
 #include "../../EVC/Packets/STM/35.h"
 #include "../../EVC/Packets/STM/38.h"
 #include "../../EVC/Packets/STM/39.h"
@@ -66,6 +68,7 @@ void setup_areas()
 }
 ntc_window::ntc_window(int nid_stm) : nid_stm(nid_stm)
 {
+    customized = nullptr;
     auto contents = platform->read_file(stm_layout_file);
     if (contents) {
         json j = json::parse(*contents);
@@ -85,7 +88,9 @@ ntc_window::ntc_window(int nid_stm) : nid_stm(nid_stm)
 void ntc_window::display_indicator(int id, int position, int icon, std::string text, int properties, bool isButton)
 {
     auto it = indicators.find((isButton ? 256 : 0) + id);
+    bool wasPressed = false;
     if (it != indicators.end()) {
+        if (it->second->isButton && ((Button*)it->second)->pressed) wasPressed = true;
         remove(it->second);
         delete it->second;
         indicators.erase(it);
@@ -147,12 +152,21 @@ void ntc_window::display_indicator(int id, int position, int icon, std::string t
         pos = areas[area];
     }
     Component *c;
-    if (isButton) c = new Button(pos[2], pos[3]);
+    if (isButton)
+    {
+        c = new Button(pos[2], pos[3]);
+        ((Button*)c)->pressed = wasPressed;
+    }
     else c = new Component(pos[2],pos[3]);
     Color bg = get_color((properties>>3)&7, true);
     Color fg = get_color(properties&7, false);
     c->setBackgroundColor(bg);
     c->setForegroundColor(fg);
+    if (bg != DarkBlue)
+    {
+        //c->dispBorder = false;
+        if (isButton) ((Button*)c)->showBorder = false;
+    }
     bool text_also;
     if (customized != nullptr)
     {
@@ -188,7 +202,7 @@ void ntc_window::display_indicator(int id, int position, int icon, std::string t
         c->flash_style = (flash-1) | (counterflash<<1);
         if (customized != nullptr && customized->flash_style == 1) c->flash_style |= 4;
     }
-    indicators[id] = c;
+    indicators[(isButton ? 256 : 0) + id] = c;
     addToLayout(c, new RelativeAlignment(nullptr, pos[0], pos[1]));
 }
 void ntc_window::display_text(int id, bool ack, std::string text, int properties)
@@ -202,6 +216,48 @@ void ntc_window::display_text(int id, bool ack, std::string text, int properties
     messages[id] = m;
     if (active_ntc_window == this) addMsg(m);
 }
+void ntc_window::event(int evNo, float x, float y)
+{
+	int64_t CurrentTime = platform->get_timer();
+    bool pressed = evNo == 1;
+    std::map<int, bool> changed;
+    for (auto &kvp : indicators) {
+        if (kvp.second->isButton) {
+            Button *b = (Button*)kvp.second;
+            bool inside = b->x < x && b->x + b->sx > x && b->y < y && b->y + b->sy > y;
+            bool p = inside && pressed;
+            if (p != b->pressed) {
+                b->pressed = p;
+                changed[kvp.first - 256] = p;
+            }
+        }
+    }
+    if (changed.size() > 0) {
+        stm_message msg;
+        msg.NID_STM.rawdata = nid_stm;
+        auto stmevent = std::make_shared<STMButtonEvent>();
+        stmevent->N_ITER.rawdata = changed.size();
+        for (auto &kvp : changed) {
+            STMButtonEventElement e;
+            e.NID_BUTTON.rawdata = kvp.first;
+            e.Q_BUTTON.rawdata = kvp.second;
+            e.T_BUTTONEVENT.rawdata = CurrentTime & 0xFFFFFFFF;
+            stmevent->elements.push_back(e);
+        }
+        msg.packets.push_back(stmevent);
+        bit_manipulator w;
+        msg.write_to(w);
+        std::string str;
+        for (auto &var : w.log_entries)
+        {
+            str += var.first + '\t' + var.second + '\n';
+        }
+        platform->debug_print(str);
+        std::string s = w.to_base64();
+        write_command("stmData", s);
+    }
+    window::event(evNo, x, y);
+}
 void initialize_stm_windows()
 {
     setup_areas();
@@ -239,10 +295,13 @@ void parse_stm_message(stm_message &message)
         if (pack->NID_PACKET == 43)
         {
             STMSupervisionInformation &info = *((STMSupervisionInformation*)pack.get());
-            Vperm = info.V_PERMIT.rawdata;
-            Vtarget = info.V_TARGET.rawdata*5;
-            Vrelease = info.V_RELEASE.rawdata;
-            Vsbi = info.V_INTERV.rawdata;
+            if (state == stm_state::DA)
+            {
+                Vperm = info.V_PERMIT.rawdata;
+                Vtarget = info.V_TARGET.rawdata*5;
+                Vrelease = info.V_RELEASE.rawdata;
+                Vsbi = info.V_INTERV.rawdata;
+            }
             Dtarg = (int)info.D_TARGET.get_value(info.Q_SCALE);
             window->monitoring_data = stm_monitoring_data(info);
         }

DMI/STM/stm_objects.h

@@ -22,16 +22,16 @@
 using json = nlohmann::json;
 struct stm_monitoring_data
 {
-    Color needle_color;
-    int Vperm_display;
+    Color needle_color = Grey;
+    int Vperm_display = 0;
     Color Vperm_color;
-    int Vtarget_display;
+    int Vtarget_display = 0;
     Color Vtarget_color;
-    int Vsbi_display;
+    int Vsbi_display = 0;
     Color Vsbi_color;
-    int Vrelease_display;
+    int Vrelease_display = 0;
     Color Vrelease_color;
-    int Dtarget_display;
+    int Dtarget_display = 0;
     stm_monitoring_data() = default;
     stm_monitoring_data(const STMSupervisionInformation &info)
     {
@@ -180,6 +180,7 @@ class ntc_window : public window
     ntc_window(int nid_stm);
     void display_indicator(int id, int position, int icon, std::string text, int properties, bool isButton);
     void display_text(int id, bool ack, std::string text, int properties);
+    void event(int evNo, float x, float y);
     ~ntc_window()
     {
         for (auto &it : indicators)

DMI/control/control.cpp

@@ -180,13 +180,7 @@ void setWindow(json &data)
                 }
                 else if (type == "DataView")
                 {
-                    std::vector<std::pair<std::string,std::string>> data;
-                    json &fields = def["Fields"];
-                    for (json &j : fields)
-                    {
-                        data.push_back({j["Label"], j["Value"]});
-                    }
-                    w = new data_view_window(def["WindowTitle"], data);
+                    w = new data_view_window(def["WindowTitle"], def["Fields"]);
                 }
                 /*else if (type == "Menu") w = new menu(j["WindowDefinitionW"]);*/
             }

DMI/speed/gauge.cpp

@@ -34,6 +34,9 @@ bool showSpeeds = false;
 void displaya1();
 Component a1(54,54, displaya1);
 Component csg(2*cx, 2*cy, displayGauge);
+#if BASELINE == 4
+Component b8(36,36);
+#endif
 IconButton togglingButton("symbols/Driver Request/DR_01.bmp", 64, 50, []() {showSpeeds = !showSpeeds;});
 #include "../graphics/text_graphic.h"
 text_graphic *spd_nums[10] = {nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr,nullptr};
@@ -74,6 +77,12 @@ void drawNeedle()
     {
         if (active_ntc_window != nullptr) needleColor = active_ntc_window->monitoring_data.needle_color;
     }
+#if BASELINE == 4
+    else if (mode == Mode::AD)
+    {
+        needleColor = Vtarget<=Vest || monitoring == RSM ? White : Grey;
+    }
+#endif
     else if(supervision == IntS)
     {
         needleColor = Red;
@@ -197,9 +206,17 @@ void displayCSG()
         if (stm.Vrelease_display & 2) drawGauge(0,Vrelease,stm.Vrelease_color,133);
         return;
     }
-    if(mode != Mode::FS)
+#if BASELINE < 4
+    if (mode != Mode::FS)
+#else
+    if (mode != Mode::FS && mode != Mode::AD)
+#endif
     {
-        if((mode == Mode::OS || mode == Mode::SR) && showSpeeds)
+        if((mode == Mode::OS || mode == Mode::SR) && showSpeeds
+#if BASELINE == 4
+        || mode == Mode::SM
+#endif
+        )
         {
             platform->set_color(White);
             drawHook(Vperm);
@@ -231,15 +248,30 @@ void displayCSG()
     if(monitoring == TSM)
     {
         drawGauge(0,Vtarget, DarkGrey);
+#if BASELINE == 4
+        drawGauge(Vtarget, Vperm, mode == Mode::AD ? White : Yellow);
+#else
         drawGauge(Vtarget, Vperm, Yellow);
+#endif
         drawHook(Vperm);
     }
     if(monitoring == RSM)
     {
+#if BASELINE == 4
+        platform->set_color(mode == Mode::AD ? White : Yellow);
+#else
         platform->set_color(Yellow);
+#endif
         drawHook(Vperm);
     }
-    if(supervision == OvS || supervision == WaS) drawGauge(Vperm,Vsbi,Orange,117);
+    if(supervision == OvS || supervision == WaS)
+    {
+#if BASELINE == 4
+        drawGauge(Vperm,Vsbi, mode == Mode::AD ? (Vtarget<Vperm ? White : DarkGrey) : Orange,117);
+#else
+        drawGauge(Vperm,Vsbi,Orange,117);
+#endif
+    }
     if(supervision == IntS) drawGauge(Vperm,Vsbi,Red,117);
     if(Vrelease!=0 && Vtarget == 0 && (monitoring == TSM || monitoring == RSM))
     {
@@ -249,12 +281,23 @@ void displayCSG()
             float ang = speedToAngle(Vperm);
             platform->set_color(Black);
             csg.drawSolidArc(ang0,ang,132,133,cx,cy);
+#if BASELINE == 4
+            platform->set_color(mode == Mode::AD ? White : Yellow);
+#else
             platform->set_color(Yellow);
+#endif
             csg.drawSolidArc(ang0,ang,128, 132,cx,cy);
         }
         else
         {
-            if(monitoring == RSM) drawGauge(0, Vperm, Yellow);
+            if(monitoring == RSM)
+            {
+#if BASELINE == 4
+                drawGauge(0, Vperm, mode == Mode::AD ? White : Yellow);
+#else
+                drawGauge(0, Vperm, Yellow);
+#endif
+            }
             drawGauge(0,Vrelease,Black,132);
             drawGauge(0,Vrelease,MediumGrey,133);
         }
@@ -326,7 +369,13 @@ void displayVrelease()
         {
             releaseSignShown = true;
             releaseRegion.clear();
-            releaseRegion.addText(to_string((int)std::round(Vrelease)).c_str(), 0, 0, 17, MediumGrey, CENTER, 0);
+            releaseRegion.addText(to_string((int)std::round(Vrelease)).c_str(), 0, 0, 17, 
+#if BASELINE == 4
+            mode == Mode::AD ? MediumGrey : Yellow,
+#else
+            MediumGrey,
+#endif
+            CENTER, 0);
             prevVrelease = Vrelease;
         }
     } else {
@@ -367,9 +416,20 @@ void setLSSMA(int nlssma)
 void displaya1()
 {
     if(mode == Mode::LS) return;
-    if((mode == Mode::FS || ((mode == Mode::OS || mode == Mode::SR) && showSpeeds)) && monitoring == CSM && TTI < TdispTTI)
+    if((mode == Mode::FS
+#if BASELINE == 4
+    || mode == Mode::AD || mode == Mode::SM
+#endif
+    || ((mode == Mode::OS || mode == Mode::SR) && showSpeeds)) && monitoring == CSM && TTI < TdispTTI)
     {
-        if(!ttiShown) playSinfo();
+        if(!ttiShown)
+        {
+#if BASELINE == 4
+            if (mode != Mode::AD) playSinfo();
+#else
+            playSinfo();
+#endif
+        }
         ttiShown = true;
         int n;
         for(n = 1; n<11; n++)

DMI/state/acks.cpp

@@ -98,9 +98,11 @@ void dispAcks()
             case Level::N2:
                 num=4;
                 break;
+#if BASELINE < 4
             case Level::N3:
                 num=5;
                 break;
+#endif
         }
         num = 4 + 2*num;
         if(levelAck == 2) num++;

DMI/state/level.cpp

@@ -15,10 +15,12 @@ extern Component distanceBar;
 Component a4(54, 25, nullptr);
 Component levelRegion(54, 25, displayLevel);
 static Level prevlevel;
+static int prevNTC;
 void displayLevel()
 {
-    if(prevlevel==level) return;
+    if(prevlevel==level && (level != Level::NTC || prevNTC == nid_ntc)) return;
     prevlevel = level;
+    prevNTC = nid_ntc;
     levelRegion.clear();
     string path = "symbols/Level/LE_";
     int num = 0;
@@ -36,14 +38,20 @@ void displayLevel()
         case Level::N2:
             num=4;
             break;
+#if BASELINE < 4
         case Level::N3:
             num=5;
             break;
+#endif
     }
     if (num == 0) return;
     if(num<10) path+="0";
     path+=to_string(num);
-    if (level == Level::NTC && (nid_ntc == 0 || nid_ntc == 10 || nid_ntc == 26)) path += "_" + to_string(nid_ntc);
+    if (level == Level::NTC)
+    {
+        std::string testpath = path + "_" + to_string(nid_ntc) + ".bmp";
+        if (levelRegion.getImageGraphic(testpath) != nullptr) path += "_" + to_string(nid_ntc);
+    }
     path+=".bmp";
     levelRegion.addImage(path);
 }

DMI/state/mode.cpp

@@ -62,9 +62,17 @@ void displayMode()
         case Mode::LS:
             num = 21;
             break;
-        case Mode::IS:
+#if BASELINE == 4
+        case Mode::AD:
             num = 23;
             break;
+        case Mode::SM:
+            num = 24;
+            break;
+#endif
+        case Mode::IS:
+            num = 25;
+            break;
     }
     if(num<10) path+="0";
     path+=to_string(num);