State at 2020-02-17

10 files changed, 48 insertions, 9 deletions

diff --git a/Crossroads/nodes/(1083,19,3028).lua b/Crossroads/nodes/(1083,19,3028).lua
index 0e5b482..20ba94c 100644
--- a/Crossroads/nodes/(1083,19,3028).lua
+++ b/Crossroads/nodes/(1083,19,3028).lua
@@ -1,5 +1,5 @@
 if event.train then
   if not atc_arrow then return end
-  atc_set_text_outside("ATL/CRT Bronze Line - Crossroads City Hall")
+  atc_set_text_outside("ATL Bronze Line - Crossroads City Hall")
   set_line("AB")
 end
\ No newline at end of file
diff --git a/Crossroads/nodes/(1219,9,1549).lua b/Crossroads/nodes/(1219,9,1549).lua
index e08cb42..c54106a 100644
--- a/Crossroads/nodes/(1219,9,1549).lua
+++ b/Crossroads/nodes/(1219,9,1549).lua
@@ -1 +1 @@
-F.cg_stn(1)
\ No newline at end of file
+F.timing(0,F.depint["AG"],"cg","thecube","R","M",nil,"1")
\ No newline at end of file
diff --git a/Crossroads/nodes/(1232,9,1547).lua b/Crossroads/nodes/(1232,9,1547).lua
index 4e4a905..32a814b 100644
--- a/Crossroads/nodes/(1232,9,1547).lua
+++ b/Crossroads/nodes/(1232,9,1547).lua
@@ -1 +1 @@
-F.cg_stn(2)
\ No newline at end of file
+F.timing(0,F.depint["AG"],"cg","scn","R","M",nil,"1")
\ No newline at end of file
diff --git a/Crossroads/nodes/(1702,12,914).lua b/Crossroads/nodes/(1702,12,914).lua
index 27def93..4ce5b54 100644
--- a/Crossroads/nodes/(1702,12,914).lua
+++ b/Crossroads/nodes/(1702,12,914).lua
@@ -1 +1,2 @@
-F.hst("cras","crsmacker","L","M",nil,"1")
\ No newline at end of file
+--F.hst("cras","crsmacker","L","M",nil,"1")
+atc_send("SM")
\ No newline at end of file
diff --git a/Crossroads/nodes/(1709,17,914).lua b/Crossroads/nodes/(1709,17,914).lua
index 1375bd7..4b17b62 100644
--- a/Crossroads/nodes/(1709,17,914).lua
+++ b/Crossroads/nodes/(1709,17,914).lua
@@ -1 +1,2 @@
-F.hst("cras","crchs","R","M",nil,"2")
\ No newline at end of file
+--F.hst("cras","crchs","R","M",nil,"2")
+atc_send("SM")
\ No newline at end of file
diff --git a/Crossroads/nodes/(1755,27,943).lua b/Crossroads/nodes/(1755,27,943).lua
index 01ed586..eeaa266 100644
--- a/Crossroads/nodes/(1755,27,943).lua
+++ b/Crossroads/nodes/(1755,27,943).lua
@@ -51,7 +51,7 @@ if event.type=="digiline" then
     	lagavg = lagavg + v
     end
     lagavg = lagavg / #S.lagrec
-    digiline_send("lag1", "DEBUG\nTRAINS: " .. counter .. "\nDISPS: " .. length .. "\nTIME: " .. os.date("%d %b %Y %X"))
+    digiline_send("lag1", "DEBUG\nTRAINS: " .. counter .. "\nDISPS: " .. length .. "\nTS: " .. os.time())
     digiline_send("lag2", "CUR " .. (end_t - start_t) .. "\nMIN " .. S.lagrec[1] .. "\nMAX " .. S.lagrec[#S.lagrec] .. "\nAVG " .. lagavg)
   end
 end
\ No newline at end of file
diff --git a/Crossroads/nodes/(1767,27,946).lua b/Crossroads/nodes/(1767,27,946).lua
index 27d996d..f30bb31 100644
--- a/Crossroads/nodes/(1767,27,946).lua
+++ b/Crossroads/nodes/(1767,27,946).lua
@@ -1,2 +1,2 @@
 S.trains = {}
-S.lagavg = {}
\ No newline at end of file
+S.lagrec = {}
\ No newline at end of file
diff --git a/Crossroads/nodes/(1773,5,994).lua b/Crossroads/nodes/(1773,5,994).lua
index 575cb88..a44cbcf 100644
--- a/Crossroads/nodes/(1773,5,994).lua
+++ b/Crossroads/nodes/(1773,5,994).lua
@@ -1 +1 @@
-F.timing(0, F.depint["AB"], "crch", "crwm", "R", "M", "ATL/CRT Bronze Line - Personhood West", "1", true)
\ No newline at end of file
+F.timing(0, F.depint["AB"], "crch", "crwm", "R", "M", "ATL Bronze Line - Personhood West", "1", true)
\ No newline at end of file
diff --git a/Crossroads/nodes/(1795,5,1000).lua b/Crossroads/nodes/(1795,5,1000).lua
index ccf3e26..d5beb66 100644
--- a/Crossroads/nodes/(1795,5,1000).lua
+++ b/Crossroads/nodes/(1795,5,1000).lua
@@ -1,5 +1,5 @@
 if event.type == "train" then
   if atc_arrow then
-    atc_set_text_inside("Next stop: CR-North Station St. Ferry (West)")
+    atc_set_text_inside("Next stop: CR-North Station St. 9th Alley")
   end
 end
\ No newline at end of file
diff --git a/Crossroads/nodes/(1890,6,946).lua b/Crossroads/nodes/(1890,6,946).lua
new file mode 100644
index 0000000..7f023d4
--- /dev/null
+++ b/Crossroads/nodes/(1890,6,946).lua
@@ -0,0 +1,37 @@
+local atdiff = 5
+if not S.corrcalc then S.corrcalc = {} end
+if S.corrcalc.lasttime then S.corrcalc.lasttime = nil end
+if event.type == "punch" then
+  S.corrcalc.lastrlt = os.time()
+  S.corrcalc.lastrwt = rwt.to_secs(rwt.now())
+  digiline_send("name","1SE | Time calculation")
+end
+if event.type == "digiline" and event.msg == "recalc" then
+  if not (S.corrcalc.lastrlt and S.corrcalc.lastrwt) then
+    S.corrcalc.lastrlt = os.time()
+    S.corrcalc.lastrwt = rwt.to_secs(rwt.now())
+  else
+    local nowrlt = os.time()
+    local nowrwt = rwt.to_secs(rwt.now())
+    local nowtbl = rwt.now()
+    local rltdiff = nowrlt - S.corrcalc.lastrlt
+    local rwtdiff = nowrwt - S.corrcalc.lastrwt
+    digiline_send("disp0", string.format("RLT: %d | RWT: %d %d;%02d;%02d", nowrlt, nowrwt, nowtbl.c, nowtbl.m, nowtbl.s))
+    digiline_send("disp1", string.format("DIFF: %d/%d | RLT/RWT: %.4f | RWT/RLT: %.4f", rltdiff, rwtdiff, rltdiff/rwtdiff, rwtdiff/rltdiff))
+    S.corrcalc.lastrlt = nowrlt
+    S.corrcalc.lastrwt = nowrwt
+    interrupt(atdiff, {os.clock(), nowrwt})
+  end
+end
+if event.type == "int" then
+  local nowrlt = os.clock()
+  local nowrwt = rwt.to_secs(rwt.now())
+  local lastrlt = (event.msg and event.msg[1]) or S.corrcalc.lastrlt
+  local lastrwt = (event.msg and event.msg[2]) or S.corrcalc.lastrwt
+  local rltdiff = nowrlt - lastrlt
+  local rwtdiff = nowrwt - lastrwt
+  digiline_send("disp2", string.format("CPU: %.4f ------------ | RWT: | %d", nowrlt, nowrwt))
+  digiline_send("disp3", string.format("RLT Diff: | %.4f | RWT Diff: | %d | AT Diff: %d", rltdiff, rwtdiff, atdiff))
+  digiline_send("disp4", string.format("RLT/AT | %.4f | AT/RLT | %.4f", rltdiff/atdiff, atdiff/rltdiff))
+  digiline_send("disp5", string.format("RWT/AT | %.4f | AT/RWT | %.4f", rwtdiff/atdiff, atdiff/rwtdiff))
+end
\ No newline at end of file