Merge remote-tracking branch 'OFW/dev' into dev

applications/system/js_app/examples/apps/Scripts/interactive.js

@@ -0,0 +1,93 @@
+let eventLoop = require("event_loop");
+let gui = require("gui");
+let dialog = require("gui/dialog");
+let textInput = require("gui/text_input");
+let loading = require("gui/loading");
+let storage = require("storage");
+
+// No eval() or exec() so need to run code from file, and filename must be unique
+storage.makeDirectory("/ext/.tmp");
+storage.makeDirectory("/ext/.tmp/js");
+storage.rmrf("/ext/.tmp/js/repl")
+storage.makeDirectory("/ext/.tmp/js/repl")
+let ctx = {
+    tmpTemplate: "/ext/.tmp/js/repl/",
+    tmpNumber: 0,
+    persistentScope: {},
+};
+
+let views = {
+    dialog: dialog.makeWith({
+        header: "Interactive Console",
+        text: "Press OK to Start",
+        center: "Run Some JS"
+    }),
+    textInput: textInput.makeWith({
+        header: "Type JavaScript Code:",
+        minLength: 0,
+        maxLength: 256,
+        defaultText: "2+2",
+        defaultTextClear: true,
+    }),
+    loading: loading.make(),
+};
+
+eventLoop.subscribe(views.dialog.input, function (_sub, button, gui, views) {
+    if (button === "center") {
+        gui.viewDispatcher.switchTo(views.textInput);
+    }
+}, gui, views);
+
+eventLoop.subscribe(views.textInput.input, function (_sub, text, gui, views, ctx) {
+    gui.viewDispatcher.switchTo(views.loading);
+
+    let path = ctx.tmpTemplate + (ctx.tmpNumber++).toString();
+    let file = storage.openFile(path, "w", "create_always");
+    file.write(text);
+    file.close();
+
+    // Hide GUI before running, we want to see console and avoid deadlock if code fails
+    gui.viewDispatcher.sendTo("back");
+    let result = load(path, ctx.persistentScope); // Load runs JS and returns last value on stack
+    storage.remove(path);
+
+    // Must convert to string explicitly
+    if (result === null) { // mJS: typeof null === "null", ECMAScript: typeof null === "object", IDE complains when checking "null" type
+        result = "null";
+    } else if (typeof result === "string") {
+        result = "'" + result + "'";
+    } else if (typeof result === "number") {
+        result = result.toString();
+    } else if (typeof result === "bigint") { // mJS doesn't support BigInt() but might aswell check
+        result = "bigint";
+    } else if (typeof result === "boolean") {
+        result = result ? "true" : "false";
+    } else if (typeof result === "symbol") { // mJS doesn't support Symbol() but might aswell check
+        result = "symbol";
+    } else if (typeof result === "undefined") {
+        result = "undefined";
+    } else if (typeof result === "object") {
+        result = "object"; // JSON.stringify() is not implemented
+    } else if (typeof result === "function") {
+        result = "function";
+    } else {
+        result = "unknown type: " + typeof result;
+    }
+
+    gui.viewDispatcher.sendTo("front");
+    views.dialog.set("header", "JS Returned:");
+    views.dialog.set("text", result);
+    gui.viewDispatcher.switchTo(views.dialog);
+    views.textInput.set("defaultText", text);
+}, gui, views, ctx);
+
+eventLoop.subscribe(gui.viewDispatcher.navigation, function (_sub, _, eventLoop) {
+    eventLoop.stop();
+}, eventLoop);
+
+gui.viewDispatcher.switchTo(views.dialog);
+
+// Message behind GUI if something breaks
+print("If you're stuck here, something went wrong, re-run the script")
+eventLoop.run();
+print("\n\nFinished correctly :)")

applications/system/js_app/examples/apps/Scripts/js_examples/gpio.js

@@ -19,7 +19,7 @@ eventLoop.subscribe(eventLoop.timer("periodic", 1000), function (_, _item, led,
 // read potentiometer when button is pressed
 print("Press the button (PC1)");
 eventLoop.subscribe(button.interrupt(), function (_, _item, pot) {
-    print("PC0 is at", pot.read_analog(), "mV");
+    print("PC0 is at", pot.readAnalog(), "mV");
 }, pot);
 
 // the program will just exit unless this is here

applications/system/js_app/examples/apps/Scripts/load.js

@@ -0,0 +1,3 @@
+let math = load(__dirname + "/load_api.js");
+let result = math.add(5, 10);
+print(result);

applications/system/js_app/examples/apps/Scripts/path.js

@@ -0,0 +1,9 @@
+let storage = require("storage");
+
+print("script has __dirname of" + __dirname);
+print("script has __filename of" + __filename);
+if (storage.fileExists(__dirname + "/math.js")) {
+    print("math.js exist here.");
+} else {
+    print("math.js does not exist here.");
+}

applications/system/js_app/examples/apps/Scripts/storage.js

@@ -0,0 +1,29 @@
+let storage = require("storage");
+let path = "/ext/storage.test";
+
+print("File exists:", storage.fileExists(path));
+
+print("Writing...");
+let file = storage.openFile(path, "w", "create_always");
+file.write("Hello ");
+file.close();
+
+print("File exists:", storage.fileExists(path));
+
+file = storage.openFile(path, "w", "open_append");
+file.write("World!");
+file.close();
+
+print("Reading...");
+file = storage.openFile(path, "r", "open_existing");
+let text = file.read("ascii", 128);
+file.close();
+print(text);
+
+print("Removing...")
+storage.remove(path);
+
+print("Done")
+
+// You don't need to close the file after each operation, this is just to show some different ways to use the API
+// There's also many more functions and options, check type definitions in firmware repo

applications/system/js_app/examples/apps/Scripts/stringutils.js

@@ -0,0 +1,19 @@
+let sampleText = "Hello, World!";
+
+let lengthOfText = "Length of text: " + sampleText.length.toString();
+print(lengthOfText);
+
+let start = 7;
+let end = 12;
+let substringResult = sampleText.slice(start, end);
+print(substringResult);
+
+let searchStr = "World";
+let result2 = sampleText.indexOf(searchStr).toString();
+print(result2);
+
+let upperCaseText = "Text in upper case: " + sampleText.toUpperCase();
+print(upperCaseText);
+
+let lowerCaseText = "Text in lower case: " + sampleText.toLowerCase();
+print(lowerCaseText);