merge p2

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

@@ -17,18 +17,16 @@ let views = {
     empty: emptyView.make(),
     keyboard: textInputView.makeWith({
         header: "Enter your name",
-        defaultText: flipper.getName(),
-        defaultTextClear: true,
-        // Props for makeWith() are passed in reverse order, so maxLength must be after defaultText
         minLength: 0,
         maxLength: 32,
+        defaultText: flipper.getName(),
+        defaultTextClear: true,
     }),
     helloDialog: dialogView.make(),
     bytekb: byteInputView.makeWith({
         header: "Look ma, I'm a header text!",
-        defaultData: Uint8Array([0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88]),
-        // Props for makeWith() are passed in reverse order, so length must be after defaultData
         length: 8,
+        defaultData: Uint8Array([0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88]),
     }),
     longText: textBoxView.makeWith({
         text: "This is a very long string that demonstrates the TextBox view. Use the D-Pad to scroll backwards and forwards.\nLorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse rhoncus est malesuada quam egestas ultrices. Maecenas non eros a nulla eleifend vulputate et ut risus. Quisque in mauris mattis, venenatis risus eget, aliquam diam. Fusce pretium feugiat mauris, ut faucibus ex volutpat in. Phasellus volutpat ex sed gravida consectetur. Aliquam sed lectus feugiat, tristique lectus et, bibendum lacus. Ut sit amet augue eu sapien elementum aliquam quis vitae tortor. Vestibulum quis commodo odio. In elementum fermentum massa, eu pellentesque nibh cursus at. Integer eleifend lacus nec purus elementum sodales. Nulla elementum neque urna, non vulputate massa semper sed. Fusce ut nisi vitae dui blandit congue pretium vitae turpis.",

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

@@ -24,11 +24,10 @@ let views = {
     }),
     textInput: textInput.makeWith({
         header: "Type JavaScript Code:",
-        defaultText: "2+2",
-        defaultTextClear: true,
-        // Props for makeWith() are passed in reverse order, so maxLength must be after defaultText
         minLength: 0,
         maxLength: 256,
+        defaultText: "2+2",
+        defaultTextClear: true,
     }),
     loading: loading.make(),
 };

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

@@ -0,0 +1,88 @@
+// Connect a w25q32 SPI device to the Flipper Zero.
+// D1=pin 2 (MOSI), SLK=pin 5 (SCK), GND=pin 8 (GND), D0=pin 3 (MISO), CS=pin 4 (CS), VCC=pin 9 (3V3)
+let spi = require("spi");
+
+// Display textbox so user can scroll to see all output.
+let eventLoop = require("event_loop");
+let gui = require("gui");
+let text = "SPI demo\n";
+let textBox = require("gui/text_box").makeWith({
+    focus: "end",
+    font: "text",
+    text: text,
+});
+
+function addText(add) {
+    text += add;
+    textBox.set("text", text);
+}
+
+gui.viewDispatcher.switchTo(textBox);
+
+// writeRead returns a buffer the same length as the input buffer.
+// We send 6 bytes of data, starting with 0x90, which is the command to read the manufacturer ID.
+// Can also use Uint8Array([0x90, 0x00, ...]) as write parameter
+// Optional timeout parameter in ms. We set to 100ms.
+let data_buf = spi.writeRead([0x90, 0x0, 0x0, 0x0, 0x0, 0x0], 100);
+let data = Uint8Array(data_buf);
+if (data.length === 6) {
+    if (data[4] === 0xEF) {
+        addText("Found Winbond device\n");
+        if (data[5] === 0x15) {
+            addText("Device ID: W25Q32\n");
+        } else {
+            addText("Unknown device ID: " + data[5].toString(16) + "\n");
+        }
+    } else if (data[4] === 0x0) {
+        addText("Be sure Winbond W25Q32 is connected to Flipper Zero SPI pins.\n");
+    } else {
+        addText("Unknown device. Manufacturer ID: " + data[4].toString(16) + "\n");
+    }
+}
+
+addText("\nReading JEDEC ID\n");
+
+// Acquire the SPI bus. Multiple calls will happen with Chip Select (CS) held low.
+spi.acquire();
+
+// Send command (0x9F) to read JEDEC ID.
+// Can also use Uint8Array([0x9F]) as write parameter
+// Note: you can pass an optional timeout parameter in milliseconds.
+spi.write([0x9F]);
+
+// Request 3 bytes of data.
+// Note: you can pass an optional timeout parameter in milliseconds.
+data_buf = spi.read(3);
+
+// Release the SPI bus as soon as we are done with the set of SPI commands.
+spi.release();
+
+data = Uint8Array(data_buf);
+addText("JEDEC MF ID: " + data[0].toString(16) + "\n");
+addText("JEDEC Memory Type: " + data[1].toString(16) + "\n");
+addText("JEDEC Capacity ID: " + data[2].toString(16) + "\n");
+
+if (data[0] === 0xEF) {
+    addText("Found Winbond device\n");
+}
+let capacity = data[1] << 8 | data[2];
+if (capacity === 0x4016) {
+    addText("Device: W25Q32\n");
+} else if (capacity === 0x4015) {
+    addText("Device: W25Q16\n");
+} else if (capacity === 0x4014) {
+    addText("Device: W25Q80\n");
+} else {
+    addText("Unknown device\n");
+}
+
+// Wait for user to close the app
+eventLoop.subscribe(gui.viewDispatcher.navigation, function (_sub, _, eventLoop) {
+    eventLoop.stop();
+}, eventLoop);
+
+// This script has no interaction, only textbox, so event loop doesn't need to be running all the time
+// We run it at the end to accept input for the back button press to quit
+// But before that, user sees a textbox and pressing back has no effect
+// This is fine because it allows simpler logic and the code above takes no time at all to run
+eventLoop.run();