From d9908ee6a2a77eab3b6371ade461a1ea449eec87 Mon Sep 17 00:00:00 2001
From: Salim Blume <sblume@gmail.com>
Date: Tue, 5 Apr 2022 09:53:52 -0500
Subject: [PATCH] Switch from setScan to findDevices

---
 apps/bthrm/boot.js     |   8 +--
 apps/bthrm/settings.js | 110 +++++++++++++----------------------------
 2 files changed, 38 insertions(+), 80 deletions(-)

diff --git a/apps/bthrm/boot.js b/apps/bthrm/boot.js
index 0a6af55b6..ad3c85591 100644
--- a/apps/bthrm/boot.js
+++ b/apps/bthrm/boot.js
@@ -24,7 +24,7 @@
 
     function getCache(){
       var cache = require('Storage').readJSON("bthrm.cache.json", true) || {};
-      if (settings.btname && settings.btname == cache.name) return cache;
+      if (settings.btid && settings.btid == cache.id) return cache;
       clearCache();
       return {};
     }
@@ -368,9 +368,9 @@
       
       if (!device){
         var filters = serviceFilters;
-        if (settings.btname){
-          log("Configured device name", settings.btname);
-          filters = [{name: settings.btname}];
+        if (settings.btid){
+          log("Configured device id", settings.btid);
+          filters = [{id: settings.btid }];
         }
         log("Requesting device with filters", filters);
         promise = NRF.requestDevice({ filters: filters, active: true });
diff --git a/apps/bthrm/settings.js b/apps/bthrm/settings.js
index 9f409880a..b376d6a2d 100644
--- a/apps/bthrm/settings.js
+++ b/apps/bthrm/settings.js
@@ -5,14 +5,14 @@
     require('Storage').writeJSON(FILE, s);
     readSettings();
   }
-  
+
   function readSettings(){
     settings = Object.assign(
       require('Storage').readJSON("bthrm.default.json", true) || {},
       require('Storage').readJSON(FILE, true) || {}
     );
   }
-  
+
   var FILE="bthrm.json";
   var settings;
   readSettings();
@@ -61,12 +61,13 @@
       }
     };
 
-    if (settings.btname){
-      var name = "Clear " + settings.btname;
+    if (settings.btname || settings.btid){
+      var name = "Clear " + (settings.btname || settings.btid);
       mainmenu[name] = function() {
-      E.showPrompt("Clear current device name?").then((r)=>{
+      E.showPrompt("Clear current device?").then((r)=>{
           if (r) {
             writeSettings("btname",undefined);
+            writeSettings("btid",undefined);
           }
           E.showMenu(buildMainMenu());
         });
@@ -78,9 +79,7 @@
     mainmenu.Debug = function() { E.showMenu(submenu_debug); };
     return mainmenu;
   }
-  
 
-  
   var submenu_debug = {
     '' : { title: "Debug"},
     '< Back': function() { E.showMenu(buildMainMenu()); },
@@ -103,35 +102,39 @@
 
   function createMenuFromScan(){
     E.showMenu();
-    E.showMessage("Scanning");
+    E.showMessage("Scanning for 4 seconds");
 
     var submenu_scan = {
-      '' : { title: "Scan"},
       '< Back': function() { E.showMenu(buildMainMenu()); }
     };
-    var packets=10;
-    var scanStart=Date.now();
-    NRF.setScan(function(d) {
-      packets--;
-      if (packets<=0 || Date.now() - scanStart > 5000){
-        NRF.setScan();
-        E.showMenu(submenu_scan);
-      } else if (d.name){
-        print("Found device", d);
-        submenu_scan[d.name] = function(){
-          E.showPrompt("Set "+d.name+"?").then((r)=>{
-          if (r) {
-            writeSettings("btname",d.name);
-          }
-          E.showMenu(buildMainMenu());
+    NRF.findDevices(function(devices) {
+      submenu_scan[''] = { title: `Scan (${devices.length} found)`};
+      if (devices.length === 0) {
+        E.showAlert("No devices found")
+          .then(() => E.showMenu(buildMainMenu()));
+        return;
+      } else {
+        devices.forEach((d) => {
+          print("Found device", d);
+          var shown = (d.name || d.id.substr(0, 17));
+          submenu_scan[shown] = function () {
+            E.showPrompt("Set " + shown + "?").then((r) => {
+              if (r) {
+                writeSettings("btid", d.id);
+                // Store the name for displaying later. Will connect by ID
+                if (d.name) {
+                  writeSettings("btname", d.name);
+                }
+              }
+              E.showMenu(buildMainMenu());
+            });
+          };
         });
-        };
       }
-    }, { active: true, filters: [{services: [ "180d" ]}]});
+      E.showMenu(submenu_scan);
+    }, { timeout: 4000, active: true, filters: [{services: [ "180d" ]}]});
   }
-  
 
-  
   var submenu_custom = {
     '' : { title: "Custom mode"},
     '< Back': function() { E.showMenu(buildMainMenu()); },
@@ -167,7 +170,7 @@
       }
     },
   };
-  
+
   var submenu_grace = {
     '' : { title: "Grace periods"},
     '< Back': function() { E.showMenu(submenu_debug); },
@@ -212,51 +215,6 @@
       }
     }
   };
-  
-  var submenu = {
-    '' : { title: "Grace periods"},
-    '< Back': function() { E.showMenu(buildMainMenu()); },
-    'Request': {
-      value: settings.gracePeriodRequest,
-      min: 0,
-      max: 3000,
-      step: 100,
-      format: v=>v+"ms",
-      onchange: v => {
-        writeSettings("gracePeriodRequest",v);
-      }
-    },
-    'Connect': {
-      value: settings.gracePeriodConnect,
-      min: 0,
-      max: 3000,
-      step: 100,
-      format: v=>v+"ms",
-      onchange: v => {
-        writeSettings("gracePeriodConnect",v);
-      }
-    },
-    'Notification': {
-      value: settings.gracePeriodNotification,
-      min: 0,
-      max: 3000,
-      step: 100,
-      format: v=>v+"ms",
-      onchange: v => {
-        writeSettings("gracePeriodNotification",v);
-      }
-    },
-    'Service': {
-      value: settings.gracePeriodService,
-      min: 0,
-      max: 3000,
-      step: 100,
-      format: v=>v+"ms",
-      onchange: v => {
-        writeSettings("gracePeriodService",v);
-      }
-    }
-  };
-  
+
   E.showMenu(buildMainMenu());
-})
+});