Skip to content

Commit 5f63847

Browse files
bradamillerbradamiller
authored
Merge pull request #90 from Open-STEM/frank-data-work
Gamepad support plus bug fixes
2 parents 708c8ef + fdb30b4 commit 5f63847

19 files changed

+631
-277
lines changed

‎.nojekyll‎

Whitespace-only changes.

‎CHANGELOG.txt‎

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# Version 1.2.2
2+
3+
## Gamepad support
4+
* After updating the XRPLib to version 2.1.3 or greater you can use a gamepad with XRPCode to drive your XRP. The Blocks palette has been updated with gamepad blocks.
5+
* To drive your XRP you will need a program that responds to the gamepad interactions. There is a very small program in the XRPExamples directory. Be creative and create your own for different types of driving.
6+
* We use the standard Web Gamepad support and recognize only one controller. If you want to know if your gamepad will work you can go to this <a href="https://hardwaretester.com/gamepad" target="_blank" style="color: blue;">website</a> that will test if your gamepad is compatible with the web browser.
7+
* If you don't have a gamepad you can use the keyboard. For the left joystick use WASD keys and for the right joystick use the IJKL keys. The number keys 1 - 0 are used for the buttons, in the same order as the pull down on the button gamepad block. There are no keys for the D-PAD.
8+
9+
## Waiting dialog box
10+
We noticed that when connecting and stopping a program via bluetooth that different operating systems and versions take different amounts of time. We now put up a working dialog box to let you know the connection is still being worked on.
11+
12+
## Comment block added
13+
If you would like to add comments to your Blockly program there is now a comment block. It can be found with the Text blocks.
14+
115
# Version 1.2.1
216

317
## Support for new XRP control board
@@ -19,28 +33,6 @@ But this created a bug where the second time a program was run it could run out
1933
* Updates of XRPLib were only being allowed if you were connected via a USB cable. You can now also update the library over bluetooth. Although it will always be much faster when using a cable.
2034

2135

22-
# Version 1.1.0
23-
24-
#### Bluetooth support
25-
<img height="10%" width="10%" src="images/Bluetooth_FM_Black.png"/></img>
26-
27-
# Please read the steps below!!
28-
29-
* Connect your XRP with a cable
30-
* Let XRPCode upgrade the Micropython and XRPLib
31-
* Under the RUN button will be the unique name of the XRP. You will want to write this on the XRP.
32-
* Disconnect the XRP from the cable and turn on the XRP.
33-
* When you click CONNECT select Bluetooth and it will bring up a list of XRPs that are not currently connected. (If your XRP does not show up press reset)
34-
* Select your XRP and click Pair.
35-
* Once connected XRPCode should be the same as if connected via a cable. YOU ARE NOW CABLE FREE!
36-
* If the XRP is reset / turned off / too far away XRPCode will show RE-CONNECT XRP for 10 seconds and then switch to CONNECT.
37-
* If the XRP is turned back on / brought closer XRPCode will auto re-connect to the XRP within that 10 seconds
38-
* If you start the XRP and a program runs keeping the bluetooth from connecting then press reset and it will restart without running the program
39-
40-
#### Fixed
41-
* Input is now accepted in XRP applications
42-
* The REPL stays live from run to run and has information from the last running program like globals and classes
43-
* When STOP is used the REPL is reset.
4436

4537

4638

‎images/gamepad.png‎

45.8 KB
Loading

‎images/logo_x_rotate_in_place.gif‎

70.2 KB
Loading

‎index.html‎

Lines changed: 39 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77

88
<title>XRP Code Editor</title>
99

10-
<link rel="stylesheet" href="uikit-3.16.22/css/uikit.css?version=1.2.1" />
10+
<link rel="stylesheet" href="uikit-3.16.22/css/uikit.css?version=1.2.2" />
1111

12-
<link rel="stylesheet" href="js/xterm/css/xterm.css?version=1.2.1"/>
12+
<link rel="stylesheet" href="js/xterm/css/xterm.css?version=1.2.2"/>
1313

14-
<link rel="stylesheet" href="golden-layout/css/goldenlayout-base.css?version=1.2.1">
15-
<link rel="stylesheet" href="golden-layout/css/themes/goldenlayout-dark-theme.css?version=1.2.1">
14+
<link rel="stylesheet" href="golden-layout/css/goldenlayout-base.css?version=1.2.2">
15+
<link rel="stylesheet" href="golden-layout/css/themes/goldenlayout-dark-theme.css?version=1.2.2">
1616

17-
<link rel="stylesheet" href="css/dark/main-dark.css?version=1.2.1">
18-
<link rel="stylesheet" href="css/dark/fs-dark.css?version=1.2.1">
19-
<link rel="stylesheet" href="css/dark/dir_chooser-dark.css?version=1.2.1">
20-
<link rel="stylesheet" href="css/dark/shell-dark.css?version=1.2.1">
21-
<link rel="stylesheet" href="css/dark/editor-dark.css?version=1.2.1">
22-
<link rel="stylesheet" href="css/dark/changelog-dark.css?version=1.2.1">
17+
<link rel="stylesheet" href="css/dark/main-dark.css?version=1.2.2">
18+
<link rel="stylesheet" href="css/dark/fs-dark.css?version=1.2.2">
19+
<link rel="stylesheet" href="css/dark/dir_chooser-dark.css?version=1.2.2">
20+
<link rel="stylesheet" href="css/dark/shell-dark.css?version=1.2.2">
21+
<link rel="stylesheet" href="css/dark/editor-dark.css?version=1.2.2">
22+
<link rel="stylesheet" href="css/dark/changelog-dark.css?version=1.2.2">
2323

24-
<link rel="stylesheet" href="js/treejs/treejs.css?version=1.2.1" />
24+
<link rel="stylesheet" href="js/treejs/treejs.css?version=1.2.2" />
2525

2626
<link rel="preconnect" href="https://fonts.googleapis.com">
2727
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
@@ -82,12 +82,14 @@
8282
class = "uk-align-right uk-text-small xrp-name">
8383
</span>
8484

85-
<div class="header_button_space uk-margin-medium-left uk-height-1-1 uk-width-1-3">
85+
<div class="header_button_space uk-height-1-1 uk-width-1-3">
8686

87-
<div class="uk-button-group uk-height-1-1 uk-text-left">
87+
<div class="uk-button-group uk-height-1-1 uk-text-left uk-margin-medium-left">
8888

8989
<img id="logo" class="xrp_logo" src="images/xrpstickerbot.png" alt="XRP Logo" title="Hello world, I'm XRP!" uk-img>
9090

91+
<img id="IDGamePad" style="padding-left: 20%; display: none;" src="images/gamepad.png" alt="gamepad icon" title="gamepad connected" uk-img>
92+
9193
<!-- <button
9294
id="IDConnectBTN"
9395
title="Connect XRP to page manually, or automatically if connected before"
@@ -217,34 +219,7 @@
217219
</ul>
218220
</div>
219221
</div>
220-
<!--
221-
<button
222-
title="Adds a code editor panel"
223-
alt="Add a new file button"
224-
id="IDAddEditorBTN"
225-
class="uk-button uk-text-small uk-width-1-1 uk-margin-medium-left uk-height-1-1 uk-text-nowrap"
226-
uk-icon="file-edit" dir="rtl">
227-
New File
228-
</button>
229-
230-
<button
231-
title="Opens link in new tab"
232-
alt="Link to open User Guide"
233-
onclick="window.open('https://xrpusersguide.readthedocs.io/en/latest/course/introduction.html', '_blank');"
234-
class="uk-button uk-text-small uk-width-1-1 uk-margin-medium-left uk-height-1-1 uk-text-nowrap"
235-
uk-icon="info" dir="rtl">
236-
User Guide
237-
</button>
238-
239-
<button
240-
title="Opens link in new tab"
241-
alt="Link to open XRP API homepage"
242-
onclick="window.open('https://open-stem.github.io/XRP_MicroPython/', '_blank');"
243-
class="uk-button uk-text-small uk-width-1-1 uk-margin-medium-left uk-height-1-1 uk-text-nowrap"
244-
uk-icon="home" dir="rtl">
245-
XRP API
246-
</button>
247-
-->
222+
248223
</div>
249224

250225
<!-- BELOW LOGO -->
@@ -264,6 +239,13 @@ <h4 id="IdProgress_TitleText"></h4>
264239
</div>
265240
</div>
266241

242+
<div id="IDWaitingParent" uk-modal bg-close="false">
243+
<div class="uk-modal-dialog uk-modal-body progress-bar-parent">
244+
<h4 id="IdWaiting_TitleText"></h4>
245+
<img id="IDWaitingImage" src="images/logo_x_rotate_in_place.gif" width="150"></div>
246+
</div>
247+
</div>
248+
267249
<!-- This is the modal for connection type -->
268250
<div id="connect-modal" uk-modal="esc-close:false; bg-close:false">
269251
<div class="uk-modal-dialog uk-modal-body">
@@ -304,28 +286,28 @@ <h2 class="uk-modal-title"></h2>
304286
<script src="js/blockly-10.0.0/blockly.min.js"></script>
305287
<script src="js/blockly-10.0.0/python_compressed.js"></script>
306288

307-
<script src="js/treejs/tree.js?version=1.2.1"></script>
289+
<script src="js/treejs/tree.js?version=1.2.2"></script>
308290

309-
<script src="js/xterm/lib/xterm.js?version=1.2.1"></script>
310-
<script src="js/xterm-addon-fit/lib/xterm-addon-fit.js?version=1.2.1"></script>
291+
<script src="js/xterm/lib/xterm.js?version=1.2.2"></script>
292+
<script src="js/xterm-addon-fit/lib/xterm-addon-fit.js?version=1.2.2"></script>
311293

312294
<script src="js/marked/marked.min.js"></script>
313295

314296

315-
<script src="js/ace/ace.js?version=1.2.1" type="text/javascript" charset="utf-8"></script>
316-
<script src="js/ace/ext-language_tools.js?version=1.2.1"></script>
297+
<script src="js/ace/ace.js?version=1.2.2" type="text/javascript" charset="utf-8"></script>
298+
<script src="js/ace/ext-language_tools.js?version=1.2.2"></script>
317299

318-
<script src="js/xrp_blocks.js?version=1.2.1"></script>
319-
<script src="js/xrp_blocks_python.js?version=1.2.1"></script>
320-
<script src="js/xrp_blockly_toolbox.js?version=1.2.1"></script>
300+
<script src="js/xrp_blocks.js?version=1.2.2"></script>
301+
<script src="js/xrp_blocks_python.js?version=1.2.2"></script>
302+
<script src="js/xrp_blockly_toolbox.js?version=1.2.2"></script>
321303

322-
<script src="js/editor_wrapper.js?version=1.2.1"></script>
323-
<script src="js/filesystem_wrapper.js?version=1.2.1"></script>
324-
<script src="js/dir_chooser.js?version=1.2.1"></script>
325-
<script src="js/active_terminal_wrapper.js?version=1.2.1"></script>
326-
<script src="js/joystick_wrapper.js?version=1.2.1"></script>
327-
<script src="js/repl.js?version=1.2.1"></script>
328-
<script type="module" src="golden-layout/bundle/esm/golden-layout.js?version=1.2.1"></script>
329-
<script type="module" src="js/main.js?version=1.2.1"></script>
304+
<script src="js/editor_wrapper.js?version=1.2.2"></script>
305+
<script src="js/filesystem_wrapper.js?version=1.2.2"></script>
306+
<script src="js/dir_chooser.js?version=1.2.2"></script>
307+
<script src="js/active_terminal_wrapper.js?version=1.2.2"></script>
308+
<script src="js/joystick_wrapper.js?version=1.2.2"></script>
309+
<script src="js/repl.js?version=1.2.2"></script>
310+
<script type="module" src="golden-layout/bundle/esm/golden-layout.js?version=1.2.2"></script>
311+
<script type="module" src="js/main.js?version=1.2.2"></script>
330312
</body>
331313
</html>

0 commit comments

Comments
 (0)