Skip to content

Commit 755e9ef

Browse files
gfwilliamsgfwilliams
committed
fix remote after new terminal tweaks
1 parent a1beb20 commit 755e9ef

File tree

5 files changed

+47
-46
lines changed

5 files changed

+47
-46
lines changed

‎manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "Espruino Web IDE",
33
"short_name": "Espruino IDE",
44
"description": "A Terminal and Graphical code Editor for Espruino JavaScript Microcontrollers",
5-
"version": "0.79.9",
5+
"version": "0.79.10",
66
"app": {
77
"background": {
88
"scripts": ["js/background.js"]

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "espruino-web-ide",
3-
"version": "0.79.9",
3+
"version": "0.79.10",
44
"description": "A Terminal and Graphical code Editor for Espruino JavaScript Microcontrollers",
55
"//1": "-------------------------------------------------------- nw.js",
66
"main": "main.html",

‎remote/index.html

+26-26
Original file line numberDiff line numberDiff line change
@@ -25,32 +25,6 @@
2525
window.location = "https://"+l.substr(7);
2626
</script>
2727

28-
<script src="../js/libs/jquery-1.11.0.js"></script>
29-
<script src="../js/libs/toastr/toastr.min.js"></script>
30-
31-
<script src="../EspruinoTools/espruino.js"></script>
32-
<!-- load console here, so we get any messages while loading -->
33-
<script src="../js/core/settingsConsole.js"></script>
34-
<script src="../EspruinoTools/core/utils.js"></script>
35-
<script src="../EspruinoTools/core/config.js"></script>
36-
<script src="../js/core/html.js"></script>
37-
<script src="../js/core/notifications.js"></script>
38-
<script src="../js/core/status.js"></script>
39-
<script src="../js/core/app.js"></script>
40-
<script src="../js/core/menuPortSelector.js"></script>
41-
<script src="../js/core/menuSettings.js"></script>
42-
<script src="../EspruinoTools/core/serial.js"></script>
43-
<script src="../EspruinoTools/core/serial_web_bluetooth.js"></script>
44-
<script src="../EspruinoTools/core/serial_web_serial.js"></script>
45-
<script src="../EspruinoTools/core/terminal.js"></script>
46-
47-
<script src="../js/libs/peerjs.min.js"></script>
48-
<script src="../js/libs/qrcode.min.js"></script>
49-
<script src="../EspruinoTools/libs/webrtc-connection.js"></script>
50-
<script src="remote.js"></script>
51-
52-
<script src="../js/plugins/webcam.js"></script>
53-
5428
<title>Espruino Remote</title>
5529
</head>
5630
<body>
@@ -94,5 +68,31 @@ <h5 class="title-bar__title">Espruino IDE Relay</h5>
9468

9569
</div>
9670

71+
<script src="../js/libs/jquery-1.11.0.js"></script>
72+
<script src="../js/libs/toastr/toastr.min.js"></script>
73+
74+
<script src="../EspruinoTools/espruino.js"></script>
75+
<!-- load console here, so we get any messages while loading -->
76+
<script src="../js/core/settingsConsole.js"></script>
77+
<script src="../EspruinoTools/core/utils.js"></script>
78+
<script src="../EspruinoTools/core/config.js"></script>
79+
<script src="../js/core/html.js"></script>
80+
<script src="../js/core/notifications.js"></script>
81+
<script src="../js/core/status.js"></script>
82+
<script src="../js/core/app.js"></script>
83+
<script src="../js/core/menuPortSelector.js"></script>
84+
<script src="../js/core/menuSettings.js"></script>
85+
<script src="../EspruinoTools/core/serial.js"></script>
86+
<script src="../EspruinoTools/core/serial_web_bluetooth.js"></script>
87+
<script src="../EspruinoTools/core/serial_web_serial.js"></script>
88+
<script src="../EspruinoTools/core/terminal.js"></script>
89+
90+
<script src="../js/libs/peerjs.min.js"></script>
91+
<script src="../js/libs/qrcode.min.js"></script>
92+
<script src="../EspruinoTools/libs/webrtc-connection.js"></script>
93+
<script src="remote.js"></script>
94+
95+
<script src="../js/plugins/webcam.js"></script>
96+
9797
</body>
9898
</html>

‎remote/remote.js

+18-17
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
var portList;
22
/// webtrc instance when initialised
3-
var webrtc;
3+
var webrtc;
44
/// If not true, the connection was requested from the top-left and we should just disconnect
5-
var connectionRequested = false;
5+
var connectionRequested = false;
66

77
// THIS IS NEVER SHOWN AT THE MOMENT
88
Espruino.Core.Terminal.OVERRIDE_CONTENTS = `
99
<div style="max-width:400px;margin:auto;">
1010
<b>Loading...</b>
1111
</div>
1212
`;
13-
// ABOUT page
13+
// ABOUT page
1414
Espruino.Core.Config.addSection("About", {
1515
description : undefined,
1616
sortOrder : -1000,
1717
getHTML : function(callback) {
1818
callback(`<h2>Web IDE Remote Connection Bridge</h2>
1919
<p>
20-
This Remote Connection Bridge exists so that you can connect
20+
This Remote Connection Bridge exists so that you can connect
2121
the Web IDE to your Espruino devices even if you do not have
2222
direct access to them or your main PC doesn't have the required
2323
communications (for instance Bluetooth).
@@ -32,7 +32,7 @@ that you want to use as the Bridge.
3232
${(webrtc && webrtc.peerId)?`
3333
<p>
3434
If you want to connect to this instance of the Bridge, copy the following code
35-
and paste it into the <b>Remote Connection Bridge Peer ID</b> field in your
35+
and paste it into the <b>Remote Connection Bridge Peer ID</b> field in your
3636
Web IDE's settings:
3737
</p><p style="text-align:center;"><b>${webrtc.peerId}</b></p>`:``}`);
3838
}
@@ -59,7 +59,7 @@ Web IDE's settings:
5959

6060

6161
webrtc = webrtcInit({
62-
bridge:true,
62+
bridge:true,
6363
onStatus : function(s) {
6464
print(s);
6565
},
@@ -77,7 +77,7 @@ Web IDE's settings:
7777
clientPeerId = kv[1];
7878
});
7979
}
80-
if (clientPeerId)
80+
if (clientPeerId)
8181
webrtc.connectSendPeerId(clientPeerId);
8282
},
8383
onGetPorts : function(cb) {
@@ -98,7 +98,7 @@ Web IDE's settings:
9898
onPortConnect : function(serialPort, cb) {
9999
if (Espruino.Core.Serial.isConnected())
100100
Espruino.Core.Serial.close();
101-
print("Connecting to "+serialPort);
101+
print("Connecting to "+serialPort);
102102
connectionRequested = true;
103103
Espruino.Core.Serial.open(serialPort, function(cInfo) {
104104
// Ensure that data from Espruino goes here
@@ -144,7 +144,7 @@ Web IDE's settings:
144144
ports = ports.filter(p => !p.promptsUser);
145145
if (ports.length)
146146
print("The following devices are paired:\n "+ports.map(p=>p.path).join("\n "));
147-
else
147+
else
148148
print("No devices are paired");
149149
print("To add more devices please click the connect icon in the top left.");
150150
});
@@ -156,7 +156,8 @@ Web IDE's settings:
156156
$("#terminal").css("font-size", Espruino.Config.FONT_SIZE+"px");
157157

158158
print("Web IDE Remote Connection Bridge");
159-
Espruino.Core.Terminal.addNotification('<img src="../img/ide_logo.png" onclick="Espruino.Core.MenuSettings.show()"><br/>',{noBorder:true})
159+
160+
//Espruino.Core.Terminal.addNotification('<img src="../img/ide_logo.png" onclick="Espruino.Core.MenuSettings.show()"><br/>',{noBorder:true});
160161

161162
Espruino.addProcessor("connected", function(data, callback) {
162163
/* If the connection was initiated from the button in the top left
@@ -169,7 +170,7 @@ Web IDE's settings:
169170
}, 500);
170171
}
171172
connectionRequested = false;
172-
callback(data);
173+
callback(data);
173174
});
174175

175176
Espruino.addProcessor("disconnected", function(data, callback) {
@@ -181,7 +182,7 @@ Web IDE's settings:
181182
if (data.visible && webrtc) {
182183
webrtc.connectVideo(data.stream);
183184
}
184-
185+
185186
callback(data);
186187
});
187188

@@ -195,13 +196,13 @@ Web IDE's settings:
195196

196197
function startWebSocket() {
197198
console.log("Disabling normal terminal");
198-
199-
199+
200+
200201

201202
console.log("Starting Websocket connection");
202203
print("Starting Websocket connection");
203204
// Create WebSocket connection.
204-
205+
205206
socket.addEventListener('open', function (event) {
206207
Espruino.Core.Notifications.success("Websocket connection open", true);
207208

@@ -218,13 +219,13 @@ Web IDE's settings:
218219
socketToBLE(event.data);
219220
});
220221

221-
222+
222223

223224
function socketToBLE(data) {
224225
if (data[0]=="\x01") {
225226
console.log("BLE <- "+JSON.stringify(data.substr(1)));
226227
// Data to send
227-
228+
228229
} else if (data[0]=="\x20") {
229230
print("New client connected");
230231
} else print("Unknown packet type "+JSON.stringify(data[0]));

‎serviceworker.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Service worker for Offline Web IDE
2-
const VERSION = 'v130';
2+
const VERSION = 'v131';
33

44
const CACHED_RESOURCES = [
55
'blockly/blockly_espruino.js',

0 commit comments

Comments
 (0)