Skip to content
Snippets Groups Projects

Working 24 controls + attribution

Merged Franklin Kaifeng Zheng requested to merge fkzheng-24-sensor-attribution into main
+ 4
12
@@ -867,14 +867,11 @@ int can_reach_sensor_ahead(int cur_node_idx, uint32_t blocked[144][6][2]) {
} else {
next = next->edge[DIR_AHEAD].dest;
}
// logic
for (int i = 0; i < 6; i++) {
if (blocked[next->idx][i][1] == UINT32_MAX) {
return 0;
}
}
} while (next->type != NODE_SENSOR);
return (1 + next->idx);
// return (1 + next->idx);
return parking_spot_is_blocked(next->idx, blocked, cur_node_idx, Time(get_tid_by_name(CLOCK_SERVER)))
? 0
: (1 + next->idx);
}
void train_admin() {
@@ -1077,14 +1074,9 @@ void train_admin() {
park_train(next_sensor_id - 1, track_admin_tid);
unpark_train(train_metadata[cur_train_ind].cur_loc->idx, track_admin_tid);
} else {
// 1a. If train on ahead node, stop (send 0 immediately)
debug_prints("Sensor ahead of Train 24 Blocked\r\n");
send_speed_command(cur_train, 0);
}
// 2. Park on future location (based on switch state)
// 3. Unpark current location
}
if (train_metadata[cur_train_ind].has_path) {
Loading