Skip to content

Release/v2.0.5 #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alaromeny wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Release/v2.0.5 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e54c944
commented out all references to scratch x
alaromeny Oct 13, 2021
4c2c59f
deleted the references to scratch x after testing on device
alaromeny Oct 13, 2021
df7552b
removed scratchx source
alaromeny Oct 13, 2021
5b09097
bumped version number
alaromeny Oct 13, 2021
accb5c6
added some troubleshooting help to the readme
alaromeny Oct 14, 2021
244e664
Merge pull request #3 from robotical/bug-fix/remove-scratchx
alaromeny Oct 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,8 @@ Signing the Release!
reasons won't be shared... You can make your own by typing the following into a terminal
on the Hub* `usign -G -p ./.signing.pubkey -s ./.signing.secret`. *Obviously, don't share it.*

***Note to those who haven't done this before** The key is stored on lastpass


You have to do this bit from the command line on a hub, so as to have access to the `usign`
utility. With the zip file copied onto the Hub, rename it to `hub-update.zip`:
Expand All @@ -189,7 +191,7 @@ $ mv OpenWRT-HubPlusConfig-0.0.0.zip hub-update.zip hub-update.zip
```

Then create a signature (this will take approx. 10 seconds) and then verify that it
works good (another 10s or so):
works good (another 10s or so). Note: there will be no feedback from the first command, so wait manually 10 seconds, check with `ls` that there is now a file called `hub-update.zip.sig ` then you can run the second command. Otherwise you will get the output `Cannot open file './hub-update.zip.sig' for reading`

```
$ usign -S -m ./hub-update.zip -s ./.signing.secret
Expand Down
2 changes: 1 addition & 1 deletion src/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/usr/bin/env sh
export HUB_VERSION='master'
export HUB_VERSION='2.0.5'
1 change: 0 additions & 1 deletion src/scratchx
Open in desktop
Submodule scratchx deleted from db5afc
65 changes: 0 additions & 65 deletions src/www/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,19 +191,6 @@ <h2 class="subhead">&nbsp;Command Hub&plus;</h2>


<div class="container">
<a href="/scratchx/index.html?url=scratch_extensions/martyExtended.js#scratch" style="text-decoration: none !important;">
<div class="card">
<div class="row">
<div class="col" style="width: 11em;">
<img src="./res/scratchlogo.png" id="scratchlogo">
</div>
<div class="col" style="text-align: right; padding-top: 1em; color: #222;">
<span class="clicktext">Click here to open ScratchX &nbsp; &longrightarrow;</span>
</div>
</div>
</div>
</a>

<a href="/scratch3/index.html?marty_ip=192.168.8.1" style="text-decoration: none !important;">
<div class="card secondary">
<div class="row">
Expand All @@ -216,59 +203,7 @@ <h2 class="subhead">&nbsp;Command Hub&plus;</h2>
</div>
</div>
</a>
<div class="card secondary">
<a id="contentShow" onclick="showHideChallenges()" style="color: #aaa; display: block; padding: 1rem 0; text-align: center; text-decoration: none !important; cursor: pointer;">
<div style="font-size: 3em; padding-bottom: 0.2em;">&plus;</div>
Click to show Scratch Challenges&hellip;
</a>
<div id="contentHide" style="display: none;">

<h1>Marty Scratch Challenges</h1>
<p>
<a href="/scratchx/index.html?url=scratch_extensions/martyBasic.js#scratch">Main Scratch Interface</a><br/ >
<a href="/scratchx/index.html?url=scratch_extensions/martyExtended.js#scratch">Extended commands</a><br />
<a href="/scratchx/index.html?url=scratch_extensions/martyWalk.js#scratch">Walk Challenge</a><br />
<!--<a href="/scratchx/index.html?url=scratch_extensions/martyDemo.js#scratch">Scratch Demo</a><br />-->
</p>

<h2>Examples Sheet</h2>
<a href="/scratchx/ChallengeOutlines.pdf" target="_blank">Here</a> is a big document showing lots of things you can do with Scratch and Marty.

<h2>Starter projects</h2>
<h3>Basic Movements</h3>
<a href="/scratchx/index.html?url=scratch_extensions/basics-01.sbx#scratch">Making Marty move</a> <br/>
<a href="/scratchx/index.html?url=scratch_extensions/basics-02.sbx#scratch">Try out loops!</a><br />
<a href="/scratchx/index.html?url=scratch_extensions/basics-03.sbx#scratch">Make a function</a>

<h3>Walk Challenge</h3>
<p>
We challenge you to make Marty walk, but you're not allowed to just use the walk command!<br />
You'll need to think about balance and how Marty moves, and you'll actually teach a robot to walk!</p>
<p><a href="/scratchx/index.html?url=scratch_extensions/walkChallenge-01.sbx#scratch">Intro with instructions</a></p>
Once you're through the basics, try the following!:
<ul>
<li>Try using the "Move <i>joint</i>..." block to make your own movement, and define it in a function</li>
<li>Try making a step function that makes marty turn. See if you can get it to take an <i>argument</i> - in this case a number input - to vary the amount it turns</li>
<li>If the turn amount is too large, Marty might get into trouble. How can you make sure that doesn't happen?</li>
</ul>

<h3>Reading Sensors</h3>
<p>These two examples assume you have some bump switches connected - ideally a forward facing one on Input 0, and a ground contact (downward facing) one on Input 1<br />
<a href="/scratchx/index.html?url=scratch_extensions/sensors-01.sbx#scratch">Reading a bump switch and reacting</a><br />
<a href="/scratchx/index.html?url=scratch_extensions/sensors-01a.sbx#scratch">Detecting a ledge (and not walking off!)</a>
</p>
<a href="/scratchx/index.html?url=scratch_extensions/sensors-02.sbx#scratch">Reading motor current</a>

<h2>Complete examples</h2>
<a href="/scratchx/index.html?url=scratch_extensions/graphTest.sbx#scratch">Showing a graph of force on the arm</a><br />
<a href="/scratchx/index.html?url=scratch_extensions/handshake-basic.sbx#scratch">Simple Handshake</a><br />
<a href="/scratchx/index.html?url=scratch_extensions/handshake-full.sbx#scratch">Complex Handshake</a>

<br><br>
</div>
</div>


<div class="row">
<div class="col" style="width: 50%;min-width:200px;text-align:center">
<a href="/tools/rc/index.html" style="color:#222;">
Expand Down