Skip to content

Commit

Permalink
cosmetic fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
flash62au committed Feb 19, 2024
1 parent 72367db commit 5e2bbe9
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 14 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Contributing
Firstly, thank you for wanting to contribute to WebThrottle-EX! We really appreciate any contributions, however small (even typo corrections!). If you know what you want to change,
Firstly, thank you for wanting to contribute to EX-WebThrottle! We really appreciate any contributions, however small (even typo corrections!). If you know what you want to change,
go ahead and read the section **Making your change**. If you want to contribute, but don't know where to start, have a look at some of the open issues and join the discussion.

## Making your change
Expand All @@ -18,7 +18,7 @@ If you are a member of DCC-EX, you can clone this repo locally to make changes.
or better yet, in the format `user-feature`. This way it is easy to see who is using which branch and the feature they are implementing.
Once you have made these changes, you can either open a pull request to `master` or just merge it to `master` yourself, it is completely up to you.

**Note:** Never touch the `build` branch! This is the live, end-user version of WebThrottle-EX and is only pushed to when a release is made.
**Note:** Never touch the `build` branch! This is the live, end-user version of EX-WebThrottle and is only pushed to when a release is made.

## What files are where?
`index.html` - this is where the main code for the webpage is. There is only one html page, it is manipulated by JavaScript.
Expand Down
11 changes: 4 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# DCC-EX-WebThrottle

This is a prototype for a new DCC-EX Throttle/Controller that can connect to the DCCEX EX-CommmandStation (EX-CS) directly through the USB port of a computer.
This is a simple Throttle/Controller that can connect to the DCCEX EX-CommmandStation (EX-CS) directly through the USB port of a computer.

## What you need to setup the project

Expand Down Expand Up @@ -36,7 +36,7 @@ If the program finds a compatible device, it will popup a window showing you a s

You should then be connected to the Command Station (CS) and should see the response from the CS on the web page under the buttons. Make sure your debug console is open. If it isn't, use the slider button in the lower left to open it. You can also open the DevTools window in your browser to see more developer logging.

Once you are connected, you can enter the ``<s>`` command in the "direct command" textbox to get status information from your Command Station, just enter "s" (without the quotes) and press the SEND button. You can send any DCC++ command in this way. You should see <iDCC++...> returned in the log window with your version, type of arduino, type of motor shield, and some other information.
Once you are connected, you can enter the ``<s>`` command in the "direct command" textbox to get status information from your Command Station, just enter "s" (without the quotes) and press the SEND button. You can send any DCC++ command in this way. You should see <iDCC++...> returned in the log window with your version, type of Arduino, type of motor shield, and some other information.

Now you are ready to run trains! Place your loco on the track and click the power slider button to turn on power to your track. You should see lights on an Arduino Motor Board light and an indication that your loco has power.

Expand Down Expand Up @@ -64,12 +64,9 @@ To load the Chrome DevTools to look at logging and be able to manually enter "wr

Copyright 2020 DCC-EX

Licensed under the GNU open source licese.
Licensed under the GNU open source licence.

Unless required by applicable law or agreed to in writing, software distributed
under the License is distributed on an “AS IS” BASIS, WITHOUT WARRANTIES OR
CONDITIONS OF ANY KIND, either express or implied. See the License for the
specific language governing permissions and limitations under the License.
Unless required by applicable law or agreed to in writing, software distributed under the Licence is distributed on an AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the Licence.

[DCC-EX](https://dcc-ex.com)

Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
<div class="column-3">
<button class="btn-expand" id="fs-toggle" state="ws" title="Fullscreen">&#10530;</button>
<button class="btn-info" id="info-tooltip" state="ws" title="Information"><span class="icon-info"></span></button>
<button class="btn-info" id="help-button" state="ws" title="Help" onclick=" window.open('https://dcc-ex.com/throttles/software/ex-webthrottle.html', '_blank')"><span class="icon-question"></span></button>
<button class="btn-info" id="help-button" state="ws" title="Help" onclick=" window.open('https://dcc-ex.com/ex-webthrottle/', '_blank')"><span class="icon-question"></span></button>
</div>
</div>
</div>
Expand Down
7 changes: 4 additions & 3 deletions js/exwebthrottle.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
Authors: Fred Decker
Mani Kumar
Matt
Peter Akers
This is part of the DCC-EX Project for model railroading and more.
For more information, see us at dcc-ex.com.
Expand Down Expand Up @@ -317,7 +318,7 @@ function setThrottleScreenUI() {
$("#console-toggle").prop("checked", false);
}
if (getPreference("timestamp") == null) {
setPreference("timestamp", "on");
setPreference("timestamp", "off");
}
$("#timestamp-selector").val(getPreference("timestamp")).trigger("change");

Expand Down Expand Up @@ -489,7 +490,7 @@ $(document).ready(function(){

$("#info-tooltip").tooltip({
content:
"<p>DCC-EX EX-WebThrottle<br>(WebThrottle-EX)</p><hr><p>Version: "+version+"</p><p><b>Credits</b><br> Fred Decker <br> Mani Kumar <br> Matt H</p>",
"<p>DCC-EX EX-WebThrottle<br>(WebThrottle-EX)</p><hr><p>Version: "+version+"</p><p><b>Credits</b><br> Fred Decker <br> Mani Kumar <br> Matt H <BR> Peter Akers</p>",
show: {
effect: "slideDown",
delay: 100,
Expand Down Expand Up @@ -1076,7 +1077,7 @@ function hideSettings(){
}

function credits() {
authors = ["Fred Decker","Mani Kumar","Matt"]
authors = ["Fred Decker","Mani Kumar","Matt","Peter Akers"]
displayLog("Credits:")
console.log("Credits:")
for (i=0; i<authors.length; i++) {
Expand Down
2 changes: 1 addition & 1 deletion manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "DCC-EX EX-WebThrottle",
"icons": [
{
"src": "images/full-logo.png",
"src": "images/product-logo-ex-webthrottle",
"type": "image/png",
"sizes": "176x176"
}
Expand Down

0 comments on commit 5e2bbe9

Please sign in to comment.