Bram
/
BangleApps
forked from FOSS/BangleApps
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #453 from detached/fix-apploader 

Require correct module in apploader.js  and fix typo in appinfo.js
master
Gordon Williams 2020-05-27 08:04:21 +01:00 committed by GitHub
parent 5530b80ca8 7f83f2afd4
commit b5ab140726
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/apploader.js
View File

@ -15,6 +15,7 @@ var SETTINGS = {
}; };
var Utils = require("../js/utils.js"); var Utils = require("../js/utils.js");
var AppInfo = require("../js/appinfo.js"); var AppInfo = require("../js/appinfo.js");
var noble = require('@abandonware/noble');
var apps; var apps;
function ERROR(msg) { function ERROR(msg) {
@ -62,7 +63,6 @@ function cmdInstallApp(appId) {
} }
function bangleSend(command) { function bangleSend(command) {
var noble = require('noble');
var log = function() { var log = function() {
var args = [].slice.call(arguments); var args = [].slice.call(arguments);
console.log("UART: "+args.join(" ")); console.log("UART: "+args.join(" "));

2
js/appinfo.js
View File

@ -2,7 +2,7 @@ if (typeof btoa==="undefined") {
// Don't define btoa as a function here because Apple's // Don't define btoa as a function here because Apple's
// iOS browser defines the function even though it's in // iOS browser defines the function even though it's in
// an IF statement that is never executed! // an IF statement that is never executed!
btoa = function(d) { return BufferA.from(d).toString('base64'); } btoa = function(d) { return Buffer.from(d).toString('base64'); }
} }
// Converts a string into most efficient way to send to Espruino (either json, base64, or compressed base64) // Converts a string into most efficient way to send to Espruino (either json, base64, or compressed base64)