Skip to content

Commit

Permalink
Data entry abortion
Browse files Browse the repository at this point in the history
  • Loading branch information
@cesarBLG
cesarBLG committed Sep 15, 2023
1 parent ecf5cbf commit 5ff951a
Show file tree
Hide file tree
Showing 9 changed files with 182 additions and 35 deletions.
4 changes: 3 additions & 1 deletion DMI/state/acks.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Component ackButton(40, 82);
extern Component c9;
extern Component textArea;
bool prevAck = false;
bool ackAllowed;
int prevlevel = 0;
bool level_announce = false;
AckType AllowedAck = AckType::None;
Expand Down Expand Up @@ -120,7 +121,7 @@ int64_t get_milliseconds()
int64_t lastAck;
void updateAcks()
{
if (AllowedAck == AckType::None && lastAck + 1000 < get_milliseconds() && !pendingAcks.empty())
if (AllowedAck == AckType::None && lastAck + 1000 < get_milliseconds() && !pendingAcks.empty() && ackAllowed)
{
AckType type = pendingAcks.front().first;
switch (type)
Expand Down Expand Up @@ -155,6 +156,7 @@ void updateAcks()
ackButton.addImage("symbols/Driver Request/DR_04.bmp");
}
}
if (!ackAllowed) AllowedAck = AckType::None;
if (level_announce)
{
if (AllowedAck != AckType::Mode && AllowedAck != AckType::Level)
Expand Down
2 changes: 2 additions & 0 deletions DMI/tcp/server.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,8 @@ void parseData(std::string str)
display_taf = j["DisplayTAF"].get<bool>();
if (j.contains("LSSMA")) setLSSMA((int)(j["LSSMA"].get<double>()*3.6 + 0.01));
else setLSSMA(-1);
extern bool ackAllowed;
ackAllowed = j.contains("AllowedAck") && j["AllowedAck"];
setAck(AckType::Brake, 0, j["BrakeAcknowledge"].get<bool>());
{
speed_elements = j["SpeedTargets"].get<std::vector<speed_element>>();
Expand Down
2 changes: 1 addition & 1 deletion EVC/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Euroradio/session.cpp Euroradio/terminal.cpp Euroradio/radio_connection.cpp Euro
Packets/logging.cpp Packets/io/io.cpp Packets/io/base64.cpp STM/stm.cpp Packets/STM/message.cpp
Procedures/start.cpp Procedures/override.cpp Procedures/train_trip.cpp Procedures/level_transition.cpp
Procedures/stored_information.cpp TrackConditions/track_conditions.cpp TrackConditions/route_suitability.cpp
Time/clock.cpp Position/geographical.cpp DMI/text_messages.cpp DMI/windows.cpp DMI/track_ahead_free.cpp
Time/clock.cpp Position/geographical.cpp DMI/text_messages.cpp DMI/windows.cpp DMI/track_ahead_free.cpp DMI/acks.cpp
TrainSubsystems/power.cpp TrainSubsystems/brake.cpp TrainSubsystems/train_interface.cpp TrainSubsystems/cold_movement.cpp
language/language.cpp Version/version.cpp Version/translate.cpp Config/config.cpp
NationalFN/nationalfn.cpp NationalFN/asfa.cpp
Expand Down
43 changes: 43 additions & 0 deletions EVC/DMI/acks.cpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/*
* European Train Control System
* Copyright (C) 2019-2023 César Benito <cesarbema2009@hotmail.com>
*
* 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 https://mozilla.org/MPL/2.0/.
*/
#include "acks.h"
#include "windows.h"
#include "../Time/clock.h"
#include "text_message.h"
#include "../Procedures/mode_transition.h"
#include "../Procedures/level_transition.h"
#include "../STM/stm.h"
bool ack_required;
bool ack_allowed;
int64_t last_ack_time;
void update_acks()
{
ack_required = mode_acknowledgeable || level_acknowledgeable || brake_acknowledgeable;
for (auto &msg : messages) {
if (msg.ack)
ack_required = true;
}
if (ack_required && active_dialog != dialog_sequence::StartUp) {
if (active_dialog != dialog_sequence::None) {
if (active_dialog == dialog_sequence::NTCData) {
for (auto &kvp : installed_stms) {
auto *stm = kvp.second;
if (stm->data_entry == stm_object::data_entry_state::Driver)
stm->data_entry = stm_object::data_entry_state::Active;
}
}
active_dialog = dialog_sequence::None;
last_ack_time = get_milliseconds();
}
if (get_milliseconds() > last_ack_time + 1000)
ack_allowed = true;
} else {
ack_allowed = false;
}
}
11 changes: 11 additions & 0 deletions EVC/DMI/acks.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/*
* European Train Control System
* Copyright (C) 2019-2023 César Benito <cesarbema2009@hotmail.com>
*
* 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 https://mozilla.org/MPL/2.0/.
*/
#pragma once
extern bool ack_allowed;
void update_acks();
2 changes: 2 additions & 0 deletions EVC/DMI/dmi.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include "track_ahead_free.h"
#include "text_message.h"
#include "windows.h"
#include "acks.h"
#include "platform_runtime.h"

using std::map;
Expand Down Expand Up @@ -215,6 +216,7 @@ void dmi_update_func()
else j["GeographicalPositionKM"]=nullptr;
j["TextMessages"] = messages;
j["DisplayTAF"] = start_display_taf && !stop_display_taf;
j["AllowedAck"] = ack_allowed;
if (display_lssma) j["LSSMA"] = lssma;
if (mode == Mode::FS || mode == Mode::OS)
{
Expand Down
145 changes: 114 additions & 31 deletions EVC/DMI/windows.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/
#include "windows.h"
#include "acks.h"
#include "../language/language.h"
#include "../Supervision/emergency_stop.h"
#include "../Supervision/supervision.h"
Expand Down Expand Up @@ -215,6 +216,7 @@ json ntc_data_window()
auto *stm = kvp.second;
if (stm->data_entry == stm_object::data_entry_state::Driver) {
json j = R"({"active":"ntc_data_window"})"_json;
j["ntc"] = get_ntc_name(kvp.first);
std::vector<json> inputs;
for (auto &field : stm->specific_data) {
if (field.keys.empty())
Expand Down Expand Up @@ -317,6 +319,7 @@ static dialog_sequence prev_dialog;
static std::string prev_step;
void update_dmi_windows()
{
update_acks();
any_button_pressed = any_button_pressed_async;
any_button_pressed_async = false;
//json prev_active = active_window_dmi;
Expand Down Expand Up @@ -718,71 +721,150 @@ void update_dmi_windows()

}
}
std::string active = active_window_dmi["active"];
if (active == "menu_main" && !active_window_dmi.contains("hour_glass")) {
json &enabled = active_window_dmi["enabled"];
std::map<std::string, bool> enabled_buttons;
if (active_dialog != dialog_sequence::None) {
bool c1 = V_est == 0 && mode == Mode::SB && train_data_valid && level != Level::Unknown;
bool c2 = V_est == 0 && mode == Mode::PT && train_data_valid && (level == Level::N1 || ((level == Level::N2 || level == Level::N3) && trip_exit_acknowledged && supervising_rbc && supervising_rbc->status == session_status::Established && emergency_stops.empty()));
bool c3 = mode == Mode::SR && (level == Level::N2 || level == Level::N3) && supervising_rbc && supervising_rbc->status == session_status::Established;
enabled["Start"] = c1 || c2 || c3;
enabled["Driver ID"] = (V_est == 0 && mode == Mode::SB && driver_id_valid && level_valid) || ((M_NVDERUN || (!M_NVDERUN && V_est == 0)) &&
enabled_buttons["Start"] = c1 || c2 || c3;
enabled_buttons["Driver ID"] = (V_est == 0 && mode == Mode::SB && driver_id_valid && level_valid) || ((M_NVDERUN || (!M_NVDERUN && V_est == 0)) &&
(mode == Mode::SH || mode == Mode::FS || mode == Mode::LS || mode == Mode::SR || mode == Mode::OS || mode == Mode::NL || mode == Mode::UN || mode == Mode::SN));
enabled["Train Data"] = V_est == 0 && driver_id_valid && level_valid &&
enabled_buttons["Train Data"] = V_est == 0 && driver_id_valid && level_valid &&
(mode == Mode::SB || mode == Mode::FS || mode == Mode::LS || mode == Mode::SR || mode == Mode::OS || mode == Mode::UN || mode == Mode::SN);
enabled["Maintain Shunting"] = mode == Mode::SH && false;
enabled["Level"] = V_est == 0 && driver_id_valid &&
enabled_buttons["Maintain Shunting"] = mode == Mode::SH && false;
enabled_buttons["Level"] = V_est == 0 && driver_id_valid &&
(mode == Mode::SB || mode == Mode::FS || mode == Mode::LS || mode == Mode::SR || mode == Mode::OS || mode == Mode::UN || mode == Mode::SN);
enabled["Train Running Number"] = (V_est == 0 && mode == Mode::SB && driver_id_valid && level_valid) ||
enabled_buttons["Train Running Number"] = (V_est == 0 && mode == Mode::SB && driver_id_valid && level_valid) ||
(mode == Mode::FS || mode == Mode::LS || mode == Mode::SR || mode == Mode::OS || mode == Mode::NL || mode == Mode::UN || mode == Mode::SN);
enabled["Shunting"] = (mode == Mode::SH && V_est == 0) ||
enabled_buttons["Shunting"] = (mode == Mode::SH && V_est == 0) ||
(V_est == 0 && driver_id_valid && (mode == Mode::SB || mode == Mode::FS || mode == Mode::LS || mode == Mode::SR || mode == Mode::OS || mode == Mode::UN || mode == Mode::SN)
&& level_valid && (level == Level::N0 || level == Level::N1 || level == Level::NTC || ((level == Level::N2 || level == Level::N3) && supervising_rbc && supervising_rbc->status == session_status::Established))) ||
(V_est == 0 && mode == Mode::PT && (level == Level::N1 || ((level == Level::N2 || level == Level::N3) && trip_exit_acknowledged && supervising_rbc && supervising_rbc->status == session_status::Established && emergency_stops.empty())));
enabled["Non Leading"] = false;
enabled["Radio Data"] = V_est == 0 && driver_id_valid && level_valid &&
(mode == Mode::SB || mode == Mode::FS || mode == Mode::LS || mode == Mode::SR || mode == Mode::OS || mode == Mode::NL || mode == Mode::PT || mode == Mode::UN || mode == Mode::SN);;
} else if (active == "menu_radio" && !active_window_dmi.contains("hour_glass")) {
json &enabled = active_window_dmi["enabled"];
enabled_buttons["Non Leading"] = false;
enabled_buttons["Radio Data"] = V_est == 0 && driver_id_valid && level_valid &&
(mode == Mode::SB || mode == Mode::FS || mode == Mode::LS || mode == Mode::SR || mode == Mode::OS || mode == Mode::NL || mode == Mode::PT || mode == Mode::UN || mode == Mode::SN);

bool registered = false;
for (mobile_terminal *t : mobile_terminals) {
if (t->registered) {
registered = true;
break;
}
}
enabled["Contact last RBC"] = V_est == 0 && driver_id_valid &&
enabled_buttons["Contact last RBC"] = V_est == 0 && driver_id_valid &&
(mode == Mode::SB || mode == Mode::FS || mode == Mode::LS || mode == Mode::SR || mode == Mode::OS || mode == Mode::NL || mode == Mode::PT) &&
level_valid && (level == Level::N2 || level == Level::N3) && registered && rbc_contact;
enabled["Use short number"] = V_est == 0 && driver_id_valid &&
enabled_buttons["Use short number"] = V_est == 0 && driver_id_valid &&
(mode == Mode::SB || mode == Mode::FS || mode == Mode::LS || mode == Mode::SR || mode == Mode::OS || mode == Mode::NL || mode == Mode::PT) &&
level_valid && (level == Level::N2 || level == Level::N3) && registered;
enabled["Enter RBC data"] = V_est == 0 && driver_id_valid &&
enabled_buttons["Enter RBC data"] = V_est == 0 && driver_id_valid &&
(mode == Mode::SB || mode == Mode::FS || mode == Mode::LS || mode == Mode::SR || mode == Mode::OS || mode == Mode::NL || mode == Mode::PT) &&
level_valid && (level == Level::N2 || level == Level::N3) && registered;
enabled["Radio Network ID"] = V_est == 0 && driver_id_valid &&
enabled_buttons["Radio Network ID"] = V_est == 0 && driver_id_valid &&
(mode == Mode::SB || mode == Mode::FS || mode == Mode::LS || mode == Mode::SR || mode == Mode::OS || mode == Mode::NL || mode == Mode::PT) &&
level_valid;

enabled_buttons["Adhesion"] = (V_est == 0 && mode == Mode::SB && Q_NVDRIVER_ADHES && driver_id_valid && train_data_valid && level_valid) || (Q_NVDRIVER_ADHES && (mode == Mode::FS || mode == Mode::LS || mode == Mode::SR || mode == Mode::OS || mode == Mode::UN || mode == Mode::SN));
enabled_buttons["SRspeed"] = V_est == 0 && mode == Mode::SR;
enabled_buttons["TrainIntegrity"] = V_est == 0 && (mode == Mode::SB || mode == Mode::FS || mode == Mode::LS || mode == Mode::SR || mode == Mode::OS || mode == Mode::PT) && driver_id_valid && train_data_valid && level_valid;

bool c = (V_est == 0 && mode == Mode::SB) || (mode == Mode::SH || mode == Mode::FS || mode == Mode::LS || mode == Mode::SR || mode == Mode::OS || mode == Mode::NL || mode == Mode::UN || mode == Mode::TR || mode == Mode::PT || mode == Mode::SN || mode == Mode::RV);
enabled_buttons["Language"] = c;
enabled_buttons["Volume"] = c;
enabled_buttons["Brightness"] = c;
enabled_buttons["SystemVersion"] = c;
enabled_buttons["SetVBC"] = V_est == 0 && mode == Mode::SB;
enabled_buttons["RemoveVBC"] = V_est == 0 && mode == Mode::SB && !vbcs.empty();


for (auto &kvp : installed_stms) {
auto *stm = kvp.second;
enabled_buttons[get_ntc_name(kvp.first)] = stm->data_entry == stm_object::data_entry_state::Active;
}
enabled_buttons["EndDataEntry"] = active_dialog_step != "S1" && active_dialog_step != "S4";
}
std::string active = active_window_dmi["active"];
if (active == "menu_main" && !active_window_dmi.contains("hour_glass")) {
json &enabled = active_window_dmi["enabled"];
enabled["Start"] = enabled_buttons["Start"];
enabled["Driver ID"] = enabled_buttons["Driver ID"];
enabled["Train Data"] = enabled_buttons["Train Data"];
enabled["Maintain Shunting"] = enabled_buttons["Maintain Shunting"];
enabled["Level"] = enabled_buttons["Level"];
enabled["Train Running Number"] = enabled_buttons["Train Running Number"];
enabled["Shunting"] = enabled_buttons["Shunting"];
enabled["Non Leading"] = enabled_buttons["Non Leading"];
enabled["Radio Data"] = enabled_buttons["Radio Data"];
} else if (active == "menu_radio" && !active_window_dmi.contains("hour_glass")) {
json &enabled = active_window_dmi["enabled"];
enabled["Contact last RBC"] = enabled_buttons["Contact last RBC"];
enabled["Use short number"] = enabled_buttons["Use short number"];
enabled["Enter RBC data"] = enabled_buttons["Enter RBC data"];
enabled["Radio Network ID"] = enabled_buttons["Radio Network ID"];
} else if (active == "menu_override") {
active_window_dmi["enabled"]["EoA"] = V_est <= V_NVALLOWOVTRP && (((mode == Mode::FS || mode == Mode::OS || mode == Mode::LS || mode == Mode::SR || mode == Mode::UN || mode == Mode::PT || mode == Mode::SB || mode == Mode::SN) && train_data_valid) || mode == Mode::SH);
} else if (active == "menu_spec") {
json &enabled = active_window_dmi["enabled"];
enabled["Adhesion"] = (V_est == 0 && mode == Mode::SB && Q_NVDRIVER_ADHES && driver_id_valid && train_data_valid && level_valid) || (Q_NVDRIVER_ADHES && (mode == Mode::FS || mode == Mode::LS || mode == Mode::SR || mode == Mode::OS || mode == Mode::UN || mode == Mode::SN));
enabled["SRspeed"] = V_est == 0 && mode == Mode::SR;
enabled["TrainIntegrity"] = V_est == 0 && (mode == Mode::SB || mode == Mode::FS || mode == Mode::LS || mode == Mode::SR || mode == Mode::OS || mode == Mode::PT) && driver_id_valid && train_data_valid && level_valid;
enabled["Adhesion"] = enabled_buttons["Adhesion"];
enabled["SRspeed"] = enabled_buttons["SRspeed"];
enabled["TrainIntegrity"] = enabled_buttons["TrainIntegrity"];
} else if (active == "menu_settings") {
bool c = (V_est == 0 && mode == Mode::SB) || (mode == Mode::SH || mode == Mode::FS || mode == Mode::LS || mode == Mode::SR || mode == Mode::OS || mode == Mode::NL || mode == Mode::UN || mode == Mode::TR || mode == Mode::PT || mode == Mode::SN || mode == Mode::RV);
active_window_dmi["enabled"]["Language"] = c;
active_window_dmi["enabled"]["Volume"] = c;
active_window_dmi["enabled"]["Brightness"] = c;
active_window_dmi["enabled"]["SystemVersion"] = c;
active_window_dmi["enabled"]["SetVBC"] = V_est == 0 && mode == Mode::SB;
active_window_dmi["enabled"]["RemoveVBC"] = V_est == 0 && mode == Mode::SB && !vbcs.empty();
json &enabled = active_window_dmi["enabled"];
enabled["Language"] = enabled_buttons["Language"];
enabled["Volume"] = enabled_buttons["Volume"];
enabled["Brightness"] = enabled_buttons["Brightness"];
enabled["SystemVersion"] = enabled_buttons["SystemVersion"];
enabled["SetVBC"] = enabled_buttons["SetVBC"];
enabled["RemoveVBC"] = enabled_buttons["RemoveVBC"];
} else if (active == "menu_ntc") {
json &enabled = active_window_dmi["enabled"];
for (auto &kvp : installed_stms) {
auto *stm = kvp.second;
active_window_dmi["enabled"][get_ntc_name(kvp.first)] = stm->data_entry == stm_object::data_entry_state::Active;
enabled[get_ntc_name(kvp.first)] = enabled_buttons[get_ntc_name(kvp.first)];
}
enabled["EndDataEntry"] = enabled_buttons["EndDataEntry"];
}
if (active_dialog != dialog_sequence::None && active_dialog != dialog_sequence::StartUp && (!som_active || som_status != S1)) {
extern bool traindata_applied;
if ((active == "trn_window" && !enabled_buttons["Train Running Number"])
|| (active == "driver_window" && !enabled_buttons["Driver ID"])
|| (active == "level_window" && !enabled_buttons["Level"])
|| ((active == "train_data_validation_window" || active == "train_data_window" || active == "fixed_train_data_validation_window" || active == "fixed_train_data_window") && !enabled_buttons["Train Data"])) {
active_dialog_step = "S1";
if ((active == "fixed_train_data_window" || active == "fixed_train_data_validation_window" || active == "train_data_window" || active == "train_data_validation_window") && V_est != 0) {
traindata_applied = true;
trigger_brake_reason(1);
}
}
if ((active == "rbc_data_window" && !enabled_buttons["Enter RBC data"])
|| (active == "radio_network_window" && !enabled_buttons["Radio Network ID"]) ) {
active_dialog_step = "S5-1";
}
if ((active == "language_window" && !enabled_buttons["Language"])
|| (active == "volume_window" && !enabled_buttons["Volume"])
|| (active == "brightness_window" && !enabled_buttons["Brightness"]) ) {
active_dialog_step = "S1";
}
if ((active == "adhesion_window" && !enabled_buttons["Adhesion"])
|| (active == "sr_data_window" && !enabled_buttons["SRspeed"]) ) {
active_dialog_step = "S1";
if (active == "sr_data_window" && V_est != 0) {
traindata_applied = true;
trigger_brake_reason(1);
}
}
if ((active == "ntc_data_window" || active == "ntc_data_validation_window") && !enabled_buttons[active_window_dmi["ntc"]]) {
for (auto &kvp : installed_stms) {
auto *stm = kvp.second;
if (stm->data_entry == stm_object::data_entry_state::Driver)
stm->data_entry = stm_object::data_entry_state::Active;
}
active_dialog_step = "S2";
if (V_est != 0) {
traindata_applied = true;
trigger_brake_reason(1);
}
}
active_window_dmi["enabled"]["EndDataEntry"] = active_dialog_step != "S1" && active_dialog_step != "S4";
}
}
void close_window()
Expand Down Expand Up @@ -1107,6 +1189,7 @@ void validate_data_entry(std::string name, json &result)
if ((name == get_ntc_name(kvp.first)+get_text(" data"))) {
active_dialog_step = "S3-2";
json j = R"({"active":"ntc_data_validation_window"})"_json;
j["ntc"] = get_ntc_name(kvp.first);
json def;
def["WindowType"] = "DataValidation";
def["WindowTitle"] = get_text("Validate ")+get_ntc_name(kvp.first)+get_text(" data");
Expand Down
Loading

0 comments on commit 5ff951a

Please sign in to comment.