added developer mode option for pre-release software update testing

timelapseplus · Nov 10, 2016 · b7241f4 · b7241f4
1 parent 5708fa3
commit b7241f4
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 24 deletions.
diff --git a/interface/help.js b/interface/help.js
diff --git a/interface/ui.js b/interface/ui.js
@@ -209,12 +209,16 @@ exports.back = function() {
     }
 }
 
-exports.set = function(object, key, value) {
+exports.set = function(object, key, value, callback) {
     return {
         type: "function",
         fn: function(arg, cb) {
             object[key] = value;
-            if (cb) cb();
+            if(callback) {
+                callback(cb);
+            } else {
+                cb && cb();
+            }
         },
         selected: exports.select(object, key, value)
     }

diff --git a/main.js b/main.js
@@ -970,30 +970,42 @@ if (VIEW_HARDWARE) {
             name: "Charge Indicator LED",
             value: "enabled",
             help: help.chargeIndicatorMenu,
-            action: {
-                type: 'function',
-                fn: function(arg, cb) {
-                    if(power.lightDisabled !== false) {
-                        db.set('chargeLightDisabled', "no");
-                        power.init(false);
-                    }
-                    cb();
-                }
-            }
+            action: ui.set(power, 'lightDisabled', false, function(cb){
+                db.set('chargeLightDisabled', "no");
+                power.init(false);
+                cb && cb();
+            })
         }, {
             name: "Charge Indicator LED",
             value: "disabled",
             help: help.chargeIndicatorMenu,
-            action: {
-                type: 'function',
-                fn: function(arg, cb) {
-                    if(power.lightDisabled !== true) {
-                        db.set('chargeLightDisabled', "yes");
-                        power.init(true);
-                    }
-                    cb();
-                }
-            }
+            action: ui.set(power, 'lightDisabled', true, function(cb){
+                db.set('chargeLightDisabled', "yes");
+                power.init(true);
+                cb && cb();
+            })
+        }]
+    }
+
+    var developerModeMenu = {
+        name: "Developer Mode",
+        type: "options",
+        items: [{
+            name: "Developer Mode",
+            value: "disabled",
+            help: help.developerModeMenu,
+            action: ui.set(updates, 'developerMode', false, function(cb){
+                db.set('developerMode', "no");
+                cb && cb();
+            })
+        }, {
+            name: "Developer Mode",
+            value: "enabled",
+            help: help.developerModeMenu,
+            action: ui.set(updates, 'developerMode', true, function(cb){
+                db.set('developerMode', "yes");
+                cb && cb();
+            })
         }]
     }
 
@@ -1100,6 +1112,10 @@ if (VIEW_HARDWARE) {
             name: "Factory Reset",
             action: factoryResetConfirmMenu,
             help: help.eraseAllSettingsMenu
+        }, {
+            name: "Developer Mode",
+            action: developerModeMenu,
+            help: help.developerModeMenu
         }, ]
     }
 
@@ -1429,6 +1445,12 @@ db.get('chargeLightDisabled', function(err, en) {
     }
 });
 
+db.get('developerMode', function(err, en) {
+    if(!err) {
+        updates.developerMode = (en == "yes");
+    }
+});
+
 db.get('gps', function(err, en) {
     if(!err) {
         power.gps(en == "yes");

diff --git a/system/updates.js b/system/updates.js
@@ -93,7 +93,7 @@ if(installs.indexOf('current') !== -1) {
 	exports.version = current;
 }
 
-exports.includeBeta = false;
+exports.developerMode = false;
 var cachedVersions = null;
 exports.getVersions = function(callback){
 	if(cachedVersions) {
@@ -111,7 +111,7 @@ exports.getVersions = function(callback){
 				}
 				var list = [];
 				for(var i = 0; i < res.length; i++) {
-					if(!res[i].prerelease || exports.includeBeta) list.push({
+					if(!res[i].prerelease || exports.developerMode) list.push({
 						version: res[i].tag_name,
 						description: res[i].name,
 						notes: res[i].body,