StephanRichter/Web4Rail
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity
521 Commits 3 Branches 0 Tags
710915f3baadf60107599013882cd789346dba6a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephan Richter 710915f3ba minor improvements 2021-09-20 20:37:26 +02:00
Stephan Richter 57fb15e1c1 lookup tables should be functional now. testing is needed soon. 2021-09-19 21:19:29 +02:00
Stephan Richter 42a931b9bd implementing lookup and storing result in variable 2021-09-19 20:33:42 +02:00
Stephan Richter 8ca448670d implemented storing and loading of lookup tables 2021-09-19 18:41:04 +02:00
Stephan Richter 3712a490fc working on lookup tables 2021-09-17 17:22:41 +02:00
Stephan Richter 5890e7966e working on lookup tables 2021-09-17 16:19:06 +02:00
Stephan Richter f6ef4a7ba3 Merge branch 'master' into lookup-tables 2021-09-17 14:26:38 +02:00
Stephan Richter b079bfeffc improving some methods 2021-09-17 14:22:50 +02:00
Stephan Richter 9643637f4a preparing lookup tables 2021-09-17 14:21:41 +02:00
Stephan Richter d5f85a5a60 minor refinement 2021-09-17 13:02:19 +02:00
Stephan Richter 29f32c66d2 updated Makefile 2021-08-21 18:12:48 +02:00
Stephan Richter 221e85dfb1 updated Makefile 2021-08-21 18:05:18 +02:00
Stephan Richter 1df6dd5b2f made turnout delay configurable 2021-08-21 18:01:17 +02:00
Stephan Richter d2ea627a2a updated Makefile for installation on raspberry pi 2021-08-21 18:00:33 +02:00
Stephan Richter 5087486218 minor bugfix 2021-07-01 13:31:58 +02:00
Stephan Richter f0d3ad094f bugfix: implemented delayed loading of contact data in TriggerdContact 2021-06-29 12:54:18 +02:00
Stephan Richter ef4740ccda fixed minor bug 2021-06-28 23:01:11 +02:00
Stephan Richter 7170952cb5 re-implemented route-search 2021-06-26 19:23:56 +02:00
Stephan Richter bb22f2a829 preventing new route reservation, when train already has route 2021-06-26 14:43:19 +02:00
Stephan Richter 80f31e2628 altered Action "DisableEnableBlock": 
this action now is able to disable/enable any tile
 2021-06-24 17:42:42 +02:00
Stephan Richter 59efa84189 bugfix 2021-06-24 17:42:13 +02:00
Stephan Richter aa74814b7c bugfix 2021-06-24 17:41:52 +02:00
Stephan Richter 1454a81803 bugfix 2021-06-24 17:40:51 +02:00
Stephan Richter 252a8a65cb fixed actions boken by function mapping implementation 2021-06-18 11:53:16 +02:00
Stephan Richter bf3d6859c5 removed unused "cause" parameter in actions 2021-06-18 11:51:15 +02:00
Stephan Richter db94d55cbc bugfix 2021-06-18 09:38:45 +02:00
Stephan Richter ebaadd2a2d Version bump: 
first functional version of new function mapping.
 2021-06-18 00:48:33 +02:00
Stephan Richter 6d761005eb refactoring 2021-06-17 23:13:59 +02:00
Stephan Richter 178d8f1622 started refactoring 2021-06-17 20:55:07 +02:00
Stephan Richter 002f08035b working on new function mapping 2021-06-17 16:28:12 +02:00
Stephan Richter dafcf651c3 re-implemented functions of locomotives 2021-06-17 14:21:41 +02:00
Stephan Richter aa9c87776d implemented saving of function settings for locomotives 2021-06-17 13:05:47 +02:00
Stephan Richter 3bb3fbbc3a working on function management 2021-06-17 12:17:43 +02:00
Stephan Richter e46217234c added getParams method to Params 2021-06-17 12:17:17 +02:00
Stephan Richter ab8a915380 working on function mapping 2021-06-17 11:11:57 +02:00
Stephan Richter 35bdb37a8f improved inflate method for POST params 2021-06-17 11:11:05 +02:00
Stephan Richter d4acacd5d4 preparing function mapping 2021-06-17 10:40:43 +02:00
Stephan Richter e1f50d0d6e added Paras class, refactored respective code 2021-06-17 10:40:33 +02:00
Stephan Richter 4feda6f709 separated decoder settings from locomotive 2021-06-16 14:10:39 +02:00
Stephan Richter 3385298408 started re-implementing decoder as device separate from locomotive 2021-06-15 09:18:09 +02:00
Stephan Richter cb8d642ba7 minor fixes 2021-06-15 09:17:17 +02:00
Stephan Richter 19b1b3ed01 implemented highlighting of tiles on action edit 2021-05-28 13:18:23 +02:00
Stephan Richter 029222ffa2 * verbesserte Geschwindigkeitsregelung 
* erweiterung der Aktion „Zug in Block bestimmen“
* verbesserungen beim Rangieren
 2021-05-15 00:34:38 +02:00
Stephan Richter 311f6c8d06 bugfixes 2021-05-11 01:24:50 +02:00
Stephan Richter d08eda142f minor improvements 
* when a train in shunting mode is directed to an occupied block, the train there is moved to the parking list of that block
* some null pointer checks
 2021-05-06 09:24:58 +02:00
Stephan Richter acb23d4434 altered start url 2021-04-26 15:18:23 +02:00
Stephan Richter e52c5522e4 Merge branch 'master' of github.com:srsoftware-de/Web4Rail 2021-04-25 14:08:45 +02:00
Stephan Richter af549a18cd improved history for cars 2021-04-25 14:08:17 +02:00
Stephan RichterandGitHub 44ed9d09d1 Update Makefile 2021-04-22 17:55:09 +02:00
Stephan Richter 321907f4ce improved programming card + bugfixes 2021-04-20 21:49:42 +02:00
Stephan Richter 6ece70b95b bugfix 2021-04-16 10:37:20 +02:00
Stephan Richter 2aa40913bb bugfixes 2021-04-16 03:36:09 +02:00
Stephan Richter e6bcca502c improved analyze-plan form 2021-04-15 16:28:39 +02:00
Stephan Richter 307edec6fb updated installer Makefile 2021-04-13 08:41:49 +02:00
Stephan Richter 41bf9eab8b added install Makefile for raspberry 2021-04-12 23:56:16 +02:00
Stephan Richter d383ae4dc8 bugfixes 2021-04-11 20:10:11 +02:00
Stephan Richter cac97b01d3 ui improvements 2021-04-10 18:19:04 +02:00
Stephan Richter 77d82c71be minor bugfix 2021-04-09 19:10:03 +02:00
Stephan Richter 77166acf91 - added else branch to conditional actions 
- implemented history for any object extending BaseClass (i.e. almost any)
- added distance() calculation method to base class
- Button "edit JSON" in Action Lists now hidden by default, can be enabled in plan properties

- fixed bugs:
    - updating json of DisplayText was not working properly
    - log output in Tile.isFreeFor was broken
 2021-04-09 18:55:20 +02:00
Stephan Richter 559e095e33 improved client-side message display 2021-04-07 09:12:12 +02:00
Stephan Richter 52e6e5f821 added screenshots 2021-04-05 14:10:06 +02:00
Stephan Richter e5815a32fc added screenshots 2021-04-05 14:03:12 +02:00
Stephan Richter 85302a5177 extended doc 2021-04-05 13:52:42 +02:00
Stephan Richter 90e4100d4c added screenshot 2021-04-05 13:43:55 +02:00
Stephan Richter 7c8637a81d updated doc 2021-04-05 13:37:09 +02:00
Stephan RichterandGitHub 0e234abcfe fixed image 2021-04-05 13:30:57 +02:00
Stephan Richter 4750a68311 extended documentation 2021-04-05 13:28:54 +02:00
Stephan Richter fa87201ef8 bugfixes 2021-04-04 18:53:53 +02:00
Stephan Richter 69d33e60c1 implemented maintenance tasks 2021-04-04 17:42:55 +02:00
Stephan Richter 941c96f5e7 added maven executor target 2021-04-04 13:45:35 +02:00
Stephan Richter 61ae9c727c bugfixes, reimplemented train simulator 2021-04-04 13:26:42 +02:00
Stephan Richter 6f529887f1 bugfixes 2021-04-04 12:56:37 +02:00
Stephan Richter edae77b3fb updated dependencies 2021-04-03 13:24:13 +02:00
Stephan Richter 184a245058 fixed typo 2021-04-03 02:37:11 +02:00
Stephan Richter 0f6e767260 Added links to README 2021-04-01 22:46:08 +02:00
Stephan Richter 744fb3eb32 minor improvements 2021-04-01 22:05:37 +02:00
Stephan Richter f7c895620a bugfixes 2021-04-01 19:09:22 +02:00
Stephan Richter 0c644af2bf implemented editable speed step 2021-04-01 19:09:17 +02:00
Stephan Richter db9fed1642 overhauled route search algorithm: 
now using breadth-first search instead of depth-first search
 2021-04-01 13:10:45 +02:00
Stephan Richter 2967e3b762 minor improvement 2021-03-30 23:41:53 +02:00
Stephan Richter 0dde9693d1 minor bugfixes + more debug logging 2021-03-29 20:09:15 +02:00
Stephan Richter da2ad054ed bugfixes 2021-03-21 05:42:30 +01:00
Stephan Richter 483ebec39e bugfixes 2021-03-18 23:35:22 +01:00
Stephan Richter 9172b60329 simplified log config using new ThreadFilter 2021-03-18 23:33:04 +01:00
Stephan Richter e90724b35e Merge branch 'state-machine' 2021-03-18 18:57:57 +01:00
Stephan Richter 937e061892 Routenplaner scheint nun endlich sauber zu funktionieren. 
Es müssen natürlich wieder einige Dinge nachimplementiert werden.
 2021-03-18 18:56:38 +01:00
Stephan Richter 540d1be489 Another refactoring step... 2021-03-18 17:27:09 +01:00
Stephan Richter 9b9c65542c bugfixes 2021-03-18 00:57:10 +01:00
Stephan Richter de19b8594a logback aktualisiert 2021-03-18 00:00:02 +01:00
Stephan Richter 5e50259d24 Implementierung des neuen Routen-Algorithmus weitgehend abgeschlossen. 
Was noch fehlt ist der Brems-Prozessor; außerdem muss der neue Code getestet werden.
 2021-03-17 23:58:38 +01:00
Stephan Richter 030b29499f dunno what to write, this is a non-clean state... 2021-03-16 21:39:34 +01:00
Stephan Richter fd254db358 minor bugfix. next step: implementing the preserveNextRoute action. 
Must work in the following conditions:
- called from route.setupActions
- called from route.startActions
- called from route.contactActions
- called from autopilot after reaching route.endBlock
 2021-03-14 20:07:36 +01:00
Stephan Richter 3c53bd192f bugfixes 2021-03-14 19:45:17 +01:00
Stephan Richter 9c86955d8d - implemented load callback 
- added waitTime field to context, wait time now determined in route.start
 2021-03-14 19:12:17 +01:00
Stephan Richter d86b6dcbcc implemented handling of stuck trains during route search 2021-03-14 16:15:14 +01:00
Stephan Richter c4e57d2b8a re-implemented trace update code 2021-03-14 15:07:30 +01:00
Stephan Richter 2647b4c43d Started clean re-implementation of 
- reserving route
- preparing route
- locking route

New implementation now properly handles stop event from user.

Next things to implement:

- tracing train upon contact activation, taking care of:
    - causing contact
    - train's last position
    - route
    - plan.freeBehindTrain
- finish event, keeping brake processor in mind
 2021-03-13 20:15:51 +01:00
Stephan Richter 9939d8d630 resetting route planner 2021-03-13 13:19:49 +01:00
Stephan Richter 5b2bf1ddc0 improved javascript 2021-03-13 13:12:37 +01:00
Stephan Richter 181933674d fixed import 2021-03-12 19:48:46 +01:00