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

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

@@ -3,6 +3,7 @@ let gpio = require("gpio");
 
 // initialize pins
 let led = gpio.get("pc3"); // same as `gpio.get(7)`
+let led2 = gpio.get("pa7"); // same as `gpio.get(2)`
 let pot = gpio.get("pc0"); // same as `gpio.get(16)`
 let button = gpio.get("pc1"); // same as `gpio.get(15)`
 led.init({ direction: "out", outMode: "push_pull" });
@@ -16,6 +17,13 @@ eventLoop.subscribe(eventLoop.timer("periodic", 1000), function (_, _item, led,
     return [led, !state];
 }, led, true);
 
+// cycle led pwm
+print("Commencing PWM (PA7)");
+eventLoop.subscribe(eventLoop.timer("periodic", 10), function (_, _item, led2, state) {
+    led2.pwmWrite(10000, state);
+    return [led2, (state + 1) % 101];
+}, led2, 0);
+
 // read potentiometer when button is pressed
 print("Press the button (PC1)");
 eventLoop.subscribe(button.interrupt(), function (_, _item, pot) {

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

@@ -9,8 +9,23 @@ let byteInputView = require("gui/byte_input");
 let textBoxView = require("gui/text_box");
 let dialogView = require("gui/dialog");
 let filePicker = require("gui/file_picker");
+let widget = require("gui/widget");
+let icon = require("gui/icon");
 let flipper = require("flipper");
 
+// declare clock widget children
+let cuteDolphinWithWatch = icon.getBuiltin("DolphinWait_59x54");
+let jsLogo = icon.getBuiltin("js_script_10px");
+let stopwatchWidgetElements = [
+    { element: "string", x: 67, y: 44, align: "bl", font: "big_numbers", text: "00 00" },
+    { element: "string", x: 77, y: 22, align: "bl", font: "primary", text: "Stopwatch" },
+    { element: "frame", x: 64, y: 27, w: 28, h: 20, radius: 3 },
+    { element: "frame", x: 100, y: 27, w: 28, h: 20, radius: 3 },
+    { element: "icon", x: 0, y: 5, iconData: cuteDolphinWithWatch },
+    { element: "icon", x: 64, y: 13, iconData: jsLogo },
+    { element: "button", button: "right", text: "Back" },
+];
+
 // declare view instances
 let views = {
     loading: loadingView.make(),
@@ -31,6 +46,7 @@ let views = {
     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.",
     }),
+    stopwatchWidget: widget.makeWith({}, stopwatchWidgetElements),
     demos: submenuView.makeWith({
         header: "Choose a demo",
         items: [
@@ -40,6 +56,7 @@ let views = {
             "Byte input",
             "Text box",
             "File picker",
+            "Widget",
             "Exit app",
         ],
     }),
@@ -72,6 +89,8 @@ eventLoop.subscribe(views.demos.chosen, function (_sub, index, gui, eventLoop, v
         views.helloDialog.set("center", "Nice!");
         gui.viewDispatcher.switchTo(views.helloDialog);
     } else if (index === 6) {
+        gui.viewDispatcher.switchTo(views.stopwatchWidget);
+    } else if (index === 7) {
         eventLoop.stop();
     }
 }, gui, eventLoop, views);
@@ -111,6 +130,31 @@ eventLoop.subscribe(gui.viewDispatcher.navigation, function (_sub, _, gui, views
     gui.viewDispatcher.switchTo(views.demos);
 }, gui, views, eventLoop);
 
+// go to the demo chooser screen when the right key is pressed on the widget screen
+eventLoop.subscribe(views.stopwatchWidget.button, function (_sub, buttonId, gui, views) {
+    if (buttonId === "right")
+        gui.viewDispatcher.switchTo(views.demos);
+}, gui, views);
+
+// count time
+eventLoop.subscribe(eventLoop.timer("periodic", 500), function (_sub, _item, views, stopwatchWidgetElements, halfSeconds) {
+    let text = (halfSeconds / 2 / 60).toString();
+    if (halfSeconds < 10 * 60 * 2)
+        text = "0" + text;
+
+    text += (halfSeconds % 2 === 0) ? ":" : " ";
+
+    if (((halfSeconds / 2) % 60) < 10)
+        text += "0";
+    text += ((halfSeconds / 2) % 60).toString();
+
+    stopwatchWidgetElements[0].text = text;
+    views.stopwatchWidget.setChildren(stopwatchWidgetElements);
+
+    halfSeconds++;
+    return [views, stopwatchWidgetElements, halfSeconds];
+}, views, stopwatchWidgetElements, 0);
+
 // run UI
 gui.viewDispatcher.switchTo(views.demos);
 eventLoop.run();

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

@@ -1,62 +0,0 @@
-// Script cannot work without widget module so check before
-checkSdkFeatures(["widget"]);
-
-let widget = require("widget");
-
-let demo_seconds = 30;
-
-print("Loading file", __filename);
-print("From directory", __dirname);
-
-// addText supports "Primary" and "Secondary" font sizes.
-widget.addText(10, 10, "Primary", "Example JS widget");
-widget.addText(10, 20, "Secondary", "Example widget from JS!");
-
-// load a Xbm file from the same directory as this script.
-widget.addText(0, 30, "Secondary", __filename);
-let logo = widget.loadImageXbm(__dirname + "/widget-js.fxbm");
-
-// add a line (x1, y1, x2, y2)
-widget.addLine(10, 35, 120, 35);
-
-// add a circle/disc (x, y, radius)
-widget.addCircle(12, 52, 10);
-widget.addDisc(12, 52, 5);
-
-// add a frame/box (x, y, width, height)
-widget.addFrame(30, 45, 10, 10);
-widget.addBox(32, 47, 6, 6);
-
-// add a rounded frame/box (x, y, width, height, radius)
-widget.addRframe(50, 45, 15, 15, 3);
-widget.addRbox(53, 48, 6, 6, 2);
-
-// add a dot (x, y)
-widget.addDot(100, 45);
-widget.addDot(102, 44);
-widget.addDot(104, 43);
-
-// add a glyph (x, y, glyph)
-widget.addGlyph(115, 50, "#".charCodeAt(0));
-
-// Show the widget (drawing the layers in the orderer they were added)
-widget.show();
-
-let i = 1;
-let bitmap = undefined;
-while (widget.isOpen() && i <= demo_seconds) {
-    // Print statements will only show up once the widget is closed.
-    print("count is at", i++);
-
-    // You can call remove on any added item, it does not impact the other ids.
-    if (bitmap) { widget.remove(bitmap); bitmap = undefined; }
-    // All of the addXXX functions return an id that can be used to remove the item.
-    else { bitmap = widget.addXbm(77, 45, logo); }
-
-    delay(1000);
-}
-
-// If user did not press the back button, close the widget.
-if (widget.isOpen()) {
-    widget.close();
-}