diff --git a/app/data/cfg.json b/app/data/cfg.json
index 9a2a28e..64736d0 100644
--- a/app/data/cfg.json
+++ b/app/data/cfg.json
@@ -1,63 +1,74 @@
{
"version" : "2.0.0",
"ext_port" : 1111,
+ "profiles" : {
+ "mcopy" : {
+ "label" : "Default mcopy profile",
+ "cam" : {
+ "time" : 850,
+ "delay" : 50,
+ "momentary" : 0
+ },
+ "proj" : {
+ "time" : 1400,
+ "delay" : 50,
+ "momentary" : 0
+ },
+ "black" : {
+ "before" : 0,
+ "after" : 0
+ }
+ },
+ "jk103" : {
+ "label" : "JK103",
+ "cam" : {
+ "time" : 600,
+ "delay" : 50,
+ "momentary" : 240
+ },
+ "proj" : {
+ "time" : 950,
+ "delay" : 50,
+ "momentary" : 240
+ },
+ "black" : {
+ "before" : 0,
+ "after" : 0
+ }
+ },
+ "jk_original" : {
+ "label" : "JK45 profile",
+ "cam" : {
+ "time" : 750,
+ "delay" : 50,
+ "momentary" : 300
+ },
+ "proj" : {
+ "time" : 1300,
+ "delay" : 50,
+ "momentary" : 300
+ },
+ "black" : {
+ "before" : 250,
+ "after" : 250
+ }
+ },
+ "intval3" : {
+ "label" : "INTVAL3",
+ "cam" : {
+ "time" : 630,
+ "delay" : 50,
+ "momentary" : 0
+ }
+ }
+ },
"arduino" : {
"baud" : 57600,
"board" : "uno",
"serialDelay" : 20,
"sequenceDelay" : 100,
- "profiles" : {
- "mcopy" : {
- "cam" : {
- "time" : 630,
- "delay" : 50,
- "momentary" : 0
- },
- "proj" : {
- "time" : 1300,
- "delay" : 50,
- "momentary" : 0
- },
- "black" : {
- "before" : 0,
- "after" : 0
- }
- },
- "jk_original" : {
- "cam" : {
- "time" : 750,
- "delay" : 50,
- "momentary" : 300
- },
- "proj" : {
- "time" : 1300,
- "delay" : 50,
- "momentary" : 300
- },
- "black" : {
- "before" : 250,
- "after" : 250
- }
- },
- "jk103" : {
- "cam" : {
- "time" : 600,
- "delay" : 50,
- "momentary" : 240
- },
- "proj" : {
- "time" : 950,
- "delay" : 50,
- "momentary" : 240
- },
- "black" : {
- "before" : 0,
- "after" : 0
- }
- }
- },
"cam" : {
- "time" : 750,
+ "time" : 850,
"delay" : 50,
"momentary" : 300
},
diff --git a/app/less/settings.less b/app/less/settings.less
index 2cc2ed3..88f87d6 100644
--- a/app/less/settings.less
+++ b/app/less/settings.less
@@ -12,6 +12,10 @@
padding: 6px 12px;
font-size: 21px;
min-width: 300px;
+ &.active{
+ border-color: @SELECTED;
+ color: @SELECTED;
+ }
}
button{
margin-top: -1px;
diff --git a/app/lib/ui/devices.js b/app/lib/ui/devices.js
index 9da7fe3..76a639a 100644
--- a/app/lib/ui/devices.js
+++ b/app/lib/ui/devices.js
@@ -3,40 +3,65 @@ var devices = {};
devices.init = function () {
'use strict';
- devices.listen();
+ devices.listen();;
+ devices.profiles();
gui.overlay(true);
gui.spinner(true, 'Checking for connected devices...');
};
+devices.profiles = function () {
+ const keys = Object.keys(mcopy.cfg.profiles);
+ const elem = $('#profile')
+ let opt;
+ elem.empty();
+ for (let key of keys) {
+ opt = $('