Skip to content

Commit

Permalink
update for release 3.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
johnrm174 committed Jul 13, 2023
1 parent cd265ba commit 2c4411e
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 22 deletions.
14 changes: 5 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,14 @@ What's currently supported by the Editor:
* Configure GPIO sensors and track sections to provide a 'mimic' display of the layout
* Configure a level of automation for the signals as trains traverse the layout

What's New in Release 3.4.0:
* Point and line colour selections - to enable colour coding of routes
* Line end-style selections - end-stops and arrow styles can now be specified
* Enhanced error/warning reporting via popups - reduced reliance on logs
* Layout 'info' function (under Help) allows you to add notes for your layout
* Fixed issue when selecting objects if Canvas is scrolled within the main window
* Various window geometry improvements to keep key UI elements visible on resizing
* Track section occupancy logic corrected for passing shunt-ahead ground signals
What's new in Release 3.4.1:
* Minor bug fixes and enabling work for MQTT networking
* Improvements to the operation of single line block instruments
* Some block instrument library API functions have been DEPRECATED (see PUBLIC_API.md)

What's coming soon:
* MQTT networking (for linking layouts)
* Better pplication documentation
* Better application documentation

Any bug reports and feedback you may have would be gratefully appreciated - specifically:
* What aspects are intuitive? What aspects aren't?
Expand Down
4 changes: 2 additions & 2 deletions configuration_examples/automation_colour_light_example.sig
Original file line number Diff line number Diff line change
Expand Up @@ -20188,9 +20188,9 @@
},
"general": {
"editmode": true,
"filename": "/home/john/model-railway-signalling/configuration_examples/automation_colour_light_example.sig",
"filename": "/home/pi/model-railway-signalling/configuration_examples/automation_colour_light_example.sig",
"info": "Document your layout here",
"version": "Version 3.4.0"
"version": "Version 3.4.1"
},
"logging": {
"level": 2
Expand Down
4 changes: 2 additions & 2 deletions configuration_examples/automation_semaphore_example.sig
Original file line number Diff line number Diff line change
Expand Up @@ -20188,9 +20188,9 @@
},
"general": {
"editmode": true,
"filename": "/home/john/model-railway-signalling/configuration_examples/automation_semaphore_example.sig",
"filename": "/home/pi/model-railway-signalling/configuration_examples/automation_semaphore_example.sig",
"info": "Document your layout here",
"version": "Version 3.4.0"
"version": "Version 3.4.1"
},
"logging": {
"level": 2
Expand Down
4 changes: 2 additions & 2 deletions configuration_examples/interlocking_colour_light_example.sig
Original file line number Diff line number Diff line change
Expand Up @@ -19993,9 +19993,9 @@
},
"general": {
"editmode": true,
"filename": "/home/john/model-railway-signalling/configuration_examples/interlocking_colour_light_example.sig",
"filename": "/home/pi/model-railway-signalling/configuration_examples/interlocking_colour_light_example.sig",
"info": "This is a basic example of a layout without track sensors (and the associated signal automation).\n\nThe layout is signalled with a combination of 2-aspect home and distant signals, with the signals\nand points interlocked together - and the signals interlocked with opposing signals. \n\nFor example, signal 1 is interlocked with point 1 so can only be cleared if the facing point lock \n(the 'L' button) is active. When the main signal is cleared, it will show the appropriate route \nindication (a left-hand feather for the diverging loop and no feather for the main line). Note that\nin this example, the associated subsidary signal (controlled by the 'S' button) is similarly\ninterlocked, and can be cleared for either route (as it is a subsidary signal, it can control\nmultiple routes so no route indications are displayed).\n\nSignal 1 is also interlocked with any opposing signals that could allow a train onto the same\nsection of track - in this example, the signal is interlocked with ground signals 15, 13, 7 and 6\n(dependant on whether the route 'cleared' by these signals conflicts with the route for Signal 1).\n\nAll point interlocking is automatically configured for you via the signal interlocking, so in this\nexample, point 2 is locked if signal 1 (main or subsidary) is cleared for a train movement.\n\nNote that not all signals are configured for all possible routes - the only 'valid' shunting\nmovement allowed from signal 14 is via the crossover back onto the other main line. In 'edit' mode,\nclick on each signal or point and select the 'interlocking' tab to view the configuration.\n\nMost of the signals and points are configured with DCC Addresses. Signal 1 uses a single DCC address\nfor swiching the signal between 'danger' and 'proceed'. The single feather route indication uses\nuses a single DCC address to turn the route display on/off. Note that a DCC command is specified\nfor the 'dark' aspect - this is to turn off the route indication when the signal is at 'danger'. \nSimilarly, the subsidary aspect is controlled by a single DCC address.\n\nThis level of configuration is ideal if you want to be the signal man/woman for your layout. Other\nexamples add (semi) automation to this signalling scheme so the signals change automatically as\nyou watch the trains go round.\n\n",
"version": "Version 3.4.0"
"version": "Version 3.4.1"
},
"logging": {
"level": 2
Expand Down
4 changes: 2 additions & 2 deletions configuration_examples/interlocking_semaphore_example.sig
Original file line number Diff line number Diff line change
Expand Up @@ -20013,9 +20013,9 @@
},
"general": {
"editmode": true,
"filename": "/home/john/model-railway-signalling/configuration_examples/interlocking_semaphore_example.sig",
"filename": "/home/pi/model-railway-signalling/configuration_examples/interlocking_semaphore_example.sig",
"info": "This is a basic example of a layout without track sensors (and the associated signal automation).\n\nThe layout is signalled with a combination of semaphore home and distant signals. Note that\nSignal 16 is a home signal with a secondary distant arm (controled by the 'D' button). \n\nThe signals and points are interlocked together - and the signals interlocked with opposing signals\n(in 'edit' mode, double click on a signal or point and select the 'interlocking' tab to edit/view).\n\nIn this example, signal 1 is interlocked with point 2 so can only be cleared if the facing point \nlock (the 'L' button) is active. When the main signal is cleared, the appropriate route arm will \nbe cleared. Note that the associated subsidary signal (controlled by the 'S' button) is similarly\ninterlocked with point 2. When cleared, the appropriate subsidary arm will be cleared.\n\nSignal 1 is also interlocked with any opposing signals that could allow a train onto the same\nsection of track - in this example, the signal is interlocked with ground signals 15, 13, 7 and 6\n(dependant on whether the route 'cleared' by these signals conflicts with the route for Signal 1).\n\nNote that the distant signals are also configured to be interlocked with all home signals ahead. \nThis means that the signal cannot be cleared unless all home signals (up to the next distant signal)\nhave also been cleared (note that they can be returned to Caution at any time).\n\nAll point interlocking is automatically configured via the signal interlocking so, for example\npoint 2 is locked if signal 1 (main or subsidary) is cleared for a train movement.\n\nNote that not all signals are configured for all possible routes - the only 'valid' shunting\nmovement allowed from signal 14 is via the crossover back onto the other main line. \n\nSome of the signals and points are configured with DCC Addresses, with a single DCC address used\nfor each main or subsidary route arm. \n\nThis level of configuration is ideal if you want to be the signal man/woman for your layout. Other\nexamples add track sensors to allow semi-automation of the signalling scheme so the signals will \nchange automatically as you watch the trains go round.\n",
"version": "Version 3.4.0"
"version": "Version 3.4.1"
},
"logging": {
"level": 2
Expand Down
4 changes: 2 additions & 2 deletions configuration_examples/single_line_semaphore_example.sig
Original file line number Diff line number Diff line change
Expand Up @@ -8673,9 +8673,9 @@
},
"general": {
"editmode": false,
"filename": "/home/john/model-railway-signalling/configuration_examples/single_line_semaphore_example.sig",
"filename": "/home/pi/model-railway-signalling/configuration_examples/single_line_semaphore_example.sig",
"info": "Document your layout here",
"version": "Version 3.4.0"
"version": "Version 3.4.1"
},
"logging": {
"level": 2
Expand Down
2 changes: 1 addition & 1 deletion model_railway_signals/editor/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
default_settings["general"] = {}
default_settings["general"]["filename"] = "new_layout.sig"
default_settings["general"]["editmode"] = True
default_settings["general"]["version"] = "Version 3.4.0"
default_settings["general"]["version"] = "Version 3.4.1"
default_settings["general"]["info"] = "Document your layout here"
default_settings["canvas"] = {}
default_settings["canvas"]["width"] = 1000
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# This call to setup() does all the work
setup(
name="model-railway-signals",
version="3.4.0",
version="3.4.1",
packages=find_packages(),
include_package_data=True,
description="Create your own DCC model railway signalling scheme",
Expand Down
2 changes: 1 addition & 1 deletion system_tests/run_layout_tests.sig
Original file line number Diff line number Diff line change
Expand Up @@ -12088,7 +12088,7 @@
"editmode": true,
"filename": "/home/john/model-railway-signalling/system_tests/run_layout_tests.sig",
"info": "Document your layout here",
"version": "Version 3.4.0"
"version": "Version 3.4.1"
},
"logging": {
"level": 2
Expand Down

0 comments on commit 2c4411e

Please sign in to comment.