Skip to content

Commit b2fb491

Browse files
committed
Add webtools repo, and use UART.js not Puck.js for comms so we can use USB devices now
1 parent c1e4aeb commit b2fb491

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "EspruinoAppLoaderCore"]
22
path = core
33
url = https://github.com/espruino/EspruinoAppLoaderCore.git
4+
[submodule "webtools"]
5+
path = webtools
6+
url = https://github.com/espruino/EspruinoWebTools.git

index.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,11 @@ <h3>Settings</h3>
144144
</div>
145145
</footer>
146146

147-
<script src="https://www.puck-js.com/puck.js"></script>
147+
<script src="webtools/uart.js"></script>
148+
<script src="core/js/utils.js"></script>
148149
<script src="core/lib/marked.min.js"></script>
149150
<script src="core/lib/espruinotools.js"></script>
150-
<script src="core/lib/heatshrink.js"></script>
151-
<script src="core/js/utils.js"></script>
151+
<script src="webtools/heatshrink.js"></script>
152152
<script src="loader.js"></script>
153153
<script src="core/js/ui.js"></script>
154154
<script src="core/js/comms.js"></script>

loader.js

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
/* BLE debug info */
2-
Puck.debug = 3;
1+
/* debug info */
2+
//UART.debug = 3;
33
/* Are we only putting a single app on a device? If so
44
apps should all be saved as .bootcde and we write info
55
about the current app into app.info */
@@ -72,18 +72,14 @@ window.addEventListener('load', (event) => {
7272
<div class="column col-4 col-xs-6">
7373
<div class="card devicechooser" deviceid="${d.id}">
7474
<div class="card-header">
75-
<div class="card-title h5">${d.name}</div>
75+
<div class="card-title h6">${d.name}</div>
7676
<!--<div class="card-subtitle text-gray">...</div>-->
7777
</div>
78-
<div class="card-image">
79-
<img src="${d.img}" alt="${d.name}" class="img-responsive">
78+
<div class="card-image" style="align:center">
79+
<img src="${d.img}" alt="${d.name}" class="img-responsive" style="margin-left: auto; margin-right: auto;">
8080
</div>
8181
</div>
8282
</div>`).join("\n")}
83-
</div><div class="columns">
84-
<div class="column col-12 text-center">
85-
<p><a href="https://www.espruino.com/Order" target="_blank">Non-Bluetooth Espruino Devices</a> will be added soon.</p>
86-
</div>
8783
</div>`;
8884
showPrompt("Which device?",html,{},false);
8985
htmlToArray(document.querySelectorAll(".devicechooser")).forEach(button => {

webtools

Submodule webtools added at 27939de

0 commit comments

Comments
 (0)