aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaverick2797 <git.maverick2797@gmail.com>2021-07-04 16:34:04 +0800
committerorwell96 <orwell@bleipb.de>2021-12-29 21:16:32 +0100
commit23d524df71e66c443345a043c9767b7c947d5a5c (patch)
treee374a0c7afa40e78030d0a7ac1576bb9e9f2edde
parent5912f778e1e4ed568a0874bc200d71f258624390 (diff)
downloadadvtrains-23d524df71e66c443345a043c9767b7c947d5a5c.tar.gz
advtrains-23d524df71e66c443345a043c9767b7c947d5a5c.tar.bz2
advtrains-23d524df71e66c443345a043c9767b7c947d5a5c.zip
Luaautomation: add section_occupancy()
Returns a table of train ids for the specified section. Returns nil if the section id is not provided.. Returns false if the section id is invalid. Returns an empty table if the section id is valid but empty of trains.
-rwxr-xr-x[-rw-r--r--]advtrains_luaautomation/README.md5
-rwxr-xr-x[-rw-r--r--]advtrains_luaautomation/environment.lua12
2 files changed, 16 insertions, 1 deletions
diff --git a/advtrains_luaautomation/README.md b/advtrains_luaautomation/README.md
index 88fc1ef..67a4b80 100644..100755
--- a/advtrains_luaautomation/README.md
+++ b/advtrains_luaautomation/README.md
@@ -314,13 +314,16 @@ Deprecated:
#### Interlocking
-This additional function is available when advtrains_interlocking is enabled:
+These additional functions are available when advtrains_interlocking is enabled:
- `atc_set_ars_disable(boolean)`
Disables (true) or enables (false) the use of ARS for this train. The train will not trigger ARS (automatic route setting) on signals then.
Note: If you want to disable ARS from an approach callback, the call to `atc_set_ars_disable(true)` *must* happen during the approach callback, and may not be deferred to an interrupt(). Else the train might trigger an ARS before the interrupt fires.
+ - `section_occupancy(section_id)`
+ Returns a table of train ids for the specified section, nil if no section id is provided, false if the section id is invalid, an empty table if the section id is valid but empty of trains.
+
#### Approach callbacks
The LuaATC interface provides a way to hook into the approach callback system, which is for example used in the TSR rails (provided by advtrains_interlocking) or the station tracks (provided by advtrains_lines). However, for compatibility reasons, this behavior needs to be explicitly enabled.
diff --git a/advtrains_luaautomation/environment.lua b/advtrains_luaautomation/environment.lua
index e93b9c3..6b1a283 100644..100755
--- a/advtrains_luaautomation/environment.lua
+++ b/advtrains_luaautomation/environment.lua
@@ -223,6 +223,18 @@ if advtrains.interlocking then
local pos = atlatc.pcnaming.resolve_pos(signal)
return advtrains.interlocking.signal_set_aspect(pos)
end
+
+ --section_occupancy()
+ static_env.section_occupancy = function(ts_id)
+ if not ts_id then return nil end
+ ts_id = tostring(ts_id)
+ local response = advtrains.interlocking.db.get_ts(ts_id)
+ if response == nil then
+ return false
+ else
+ return response.trains
+ end
+ end
end
-- Lines-specific: