Merge branch 'master' into dev

This commit is contained in:
mmcwilliams 2019-02-23 16:44:33 -05:00
commit 478abaae8d
5 changed files with 624 additions and 2418 deletions

View File

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="com.sixteenmillimeter.intval3" version="1.0.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="com.sixteenmillimeter.intval3" version="1.0.4" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>INTVAL3</name>
<description>
Mobile control app for the INTVAL intervalometer for Bolex 16mm cameras
@ -30,19 +30,22 @@
<icon height="120" src="res/icon/ios/icon-60@2x.png" width="120" />
<icon height="60" src="res/icon/ios/icon-60.png" width="60" />
<splash src="res/screen/ios/Default@2x~universal~anyany.png" />
<preference name="APPCENTER_APP_SECRET" value="d9cbb435-e432-43d3-ae20-747fccbc8190" />
</platform>
<preference name="DisallowOverscroll" value="true" />
<preference name="StatusBarBackgroundColor" value="#212121" />
<preference name="CameraUsesGeolocation" value="false" />
<plugin name="cordova-plugin-whitelist" spec="1" />
<plugin name="cordova-plugin-splashscreen" spec="~4.1.0" />
<plugin name="cordova-plugin-device" spec="^1.1.7" />
<plugin name="cordova-plugin-dialogs" spec="^1.3.4" />
<plugin name="cordova-plugin-statusbar" spec="^2.3.0" />
<plugin name="cordova-plugin-splashscreen" spec="~4.1.0" />
<plugin name="cordova-plugin-camera-with-exif" spec="^1.2.2" />
<plugin name="cordova-plugin-ble-central" spec="^1.1.4">
<plugin name="cordova-plugin-ble-central" spec="^1.2.2">
<variable name="BLUETOOTH_USAGE_DESCRIPTION" value="INTVAL3 intervalometer controls" />
</plugin>
<plugin name="cordova-plugin-statusbar" spec="^2.4.2" />
<plugin name="cordova-plugin-camera-with-exif" spec="^1.2.4" />
<plugin name="cordova-plugin-appcenter-analytics" spec="^0.2.2" />
<plugin name="cordova-plugin-appcenter-crashes" spec="^0.2.2" />
<engine name="android" spec="^6.4.0" />
<engine name="ios" spec="^4.5.4" />
<engine name="ios" spec="^4.5.5" />
</widget>

280
app/package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "com.sixteenmillimeter.intval3",
"version": "1.0.2",
"version": "1.0.3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -9,13 +9,13 @@
"resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-6.4.0.tgz",
"integrity": "sha1-VK6NpXKKjX5e/MYXLT3MoXvH/n0=",
"requires": {
"android-versions": "1.2.1",
"cordova-common": "2.1.0",
"android-versions": "^1.2.1",
"cordova-common": "^2.1.0",
"elementtree": "0.1.6",
"nopt": "3.0.6",
"properties-parser": "0.2.3",
"q": "1.5.0",
"shelljs": "0.5.3"
"nopt": "^3.0.1",
"properties-parser": "^0.2.3",
"q": "^1.4.1",
"shelljs": "^0.5.3"
},
"dependencies": {
"abbrev": {
@ -46,14 +46,14 @@
"version": "0.1.1",
"bundled": true,
"requires": {
"big-integer": "1.6.25"
"big-integer": "^1.6.7"
}
},
"brace-expansion": {
"version": "1.1.8",
"bundled": true,
"requires": {
"balanced-match": "1.0.0",
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
}
},
@ -65,19 +65,19 @@
"version": "2.1.0",
"bundled": true,
"requires": {
"ansi": "0.3.1",
"bplist-parser": "0.1.1",
"cordova-registry-mapper": "1.1.15",
"ansi": "^0.3.1",
"bplist-parser": "^0.1.0",
"cordova-registry-mapper": "^1.1.8",
"elementtree": "0.1.6",
"glob": "5.0.15",
"minimatch": "3.0.4",
"osenv": "0.1.4",
"plist": "1.2.0",
"q": "1.5.0",
"semver": "5.4.1",
"shelljs": "0.5.3",
"underscore": "1.8.3",
"unorm": "1.4.1"
"glob": "^5.0.13",
"minimatch": "^3.0.0",
"osenv": "^0.1.3",
"plist": "^1.2.0",
"q": "^1.4.1",
"semver": "^5.0.1",
"shelljs": "^0.5.3",
"underscore": "^1.8.3",
"unorm": "^1.3.3"
}
},
"cordova-registry-mapper": {
@ -95,19 +95,19 @@
"version": "5.0.15",
"bundled": true,
"requires": {
"inflight": "1.0.6",
"inherits": "2.0.3",
"minimatch": "3.0.4",
"once": "1.4.0",
"path-is-absolute": "1.0.1"
"inflight": "^1.0.4",
"inherits": "2",
"minimatch": "2 || 3",
"once": "^1.3.0",
"path-is-absolute": "^1.0.0"
}
},
"inflight": {
"version": "1.0.6",
"bundled": true,
"requires": {
"once": "1.4.0",
"wrappy": "1.0.2"
"once": "^1.3.0",
"wrappy": "1"
}
},
"inherits": {
@ -122,21 +122,21 @@
"version": "3.0.4",
"bundled": true,
"requires": {
"brace-expansion": "1.1.8"
"brace-expansion": "^1.1.7"
}
},
"nopt": {
"version": "3.0.6",
"bundled": true,
"requires": {
"abbrev": "1.1.0"
"abbrev": "1"
}
},
"once": {
"version": "1.4.0",
"bundled": true,
"requires": {
"wrappy": "1.0.2"
"wrappy": "1"
}
},
"os-homedir": {
@ -151,8 +151,8 @@
"version": "0.1.4",
"bundled": true,
"requires": {
"os-homedir": "1.0.2",
"os-tmpdir": "1.0.2"
"os-homedir": "^1.0.0",
"os-tmpdir": "^1.0.0"
}
},
"path-is-absolute": {
@ -166,7 +166,7 @@
"base64-js": "0.0.8",
"util-deprecate": "1.0.2",
"xmlbuilder": "4.0.0",
"xmldom": "0.1.27"
"xmldom": "0.1.x"
}
},
"properties-parser": {
@ -209,7 +209,7 @@
"version": "4.0.0",
"bundled": true,
"requires": {
"lodash": "3.10.1"
"lodash": "^3.5.0"
}
},
"xmldom": {
@ -219,18 +219,46 @@
}
},
"cordova-ios": {
"version": "4.5.4",
"resolved": "https://registry.npmjs.org/cordova-ios/-/cordova-ios-4.5.4.tgz",
"integrity": "sha1-yAZIBYlyloVw3BXalzFP+S0H3+c=",
"version": "4.5.5",
"resolved": "https://registry.npmjs.org/cordova-ios/-/cordova-ios-4.5.5.tgz",
"integrity": "sha512-3+30m2dZ2yii7kg+H7cgpdpkXpMj54zoX5imjGGG4Z7dPXKmalTLc/9rLq+Iaa+Q1BqyOrUFaHopWOODRU6vCg==",
"requires": {
"cordova-common": "2.1.0",
"ios-sim": "6.1.2",
"abbrev": "*",
"ansi": "*",
"balanced-match": "*",
"base64-js": "1.2.0",
"big-integer": "*",
"bplist-creator": "*",
"bplist-parser": "*",
"brace-expansion": "*",
"concat-map": "*",
"cordova-common": "2.2.5",
"cordova-registry-mapper": "*",
"elementtree": "0.1.6",
"glob": "5.0.15",
"inflight": "*",
"inherits": "*",
"ios-sim": "6.1.3",
"minimatch": "*",
"nopt": "3.0.6",
"plist": "1.2.0",
"once": "*",
"path-is-absolute": "*",
"plist": "2.1.0",
"q": "1.5.1",
"sax": "0.3.5",
"shelljs": "0.5.3",
"simctl": "*",
"simple-plist": "0.2.1",
"stream-buffers": "2.2.0",
"tail": "0.4.0",
"underscore": "*",
"unorm": "*",
"uuid": "3.0.1",
"wrappy": "*",
"xcode": "0.9.3",
"xml-escape": "1.1.0"
"xml-escape": "1.1.0",
"xmlbuilder": "8.2.2",
"xmldom": "*"
},
"dependencies": {
"abbrev": {
@ -246,32 +274,32 @@
"bundled": true
},
"base64-js": {
"version": "0.0.8",
"version": "1.2.0",
"bundled": true
},
"big-integer": {
"version": "1.6.25",
"version": "1.6.32",
"bundled": true
},
"bplist-creator": {
"version": "0.0.7",
"bundled": true,
"requires": {
"stream-buffers": "2.2.0"
"stream-buffers": "~2.2.0"
}
},
"bplist-parser": {
"version": "0.1.1",
"bundled": true,
"requires": {
"big-integer": "1.6.25"
"big-integer": "^1.6.7"
}
},
"brace-expansion": {
"version": "1.1.8",
"version": "1.1.11",
"bundled": true,
"requires": {
"balanced-match": "1.0.0",
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
}
},
@ -280,22 +308,20 @@
"bundled": true
},
"cordova-common": {
"version": "2.1.0",
"version": "2.2.5",
"bundled": true,
"requires": {
"ansi": "0.3.1",
"bplist-parser": "0.1.1",
"cordova-registry-mapper": "1.1.15",
"ansi": "^0.3.1",
"bplist-parser": "^0.1.0",
"cordova-registry-mapper": "^1.1.8",
"elementtree": "0.1.6",
"glob": "5.0.15",
"minimatch": "3.0.4",
"osenv": "0.1.4",
"plist": "1.2.0",
"q": "1.5.1",
"semver": "5.4.1",
"shelljs": "0.5.3",
"underscore": "1.8.3",
"unorm": "1.4.1"
"glob": "^5.0.13",
"minimatch": "^3.0.0",
"plist": "^2.1.0",
"q": "^1.4.1",
"shelljs": "^0.5.3",
"underscore": "^1.8.3",
"unorm": "^1.3.3"
}
},
"cordova-registry-mapper": {
@ -313,19 +339,19 @@
"version": "5.0.15",
"bundled": true,
"requires": {
"inflight": "1.0.6",
"inherits": "2.0.3",
"minimatch": "3.0.4",
"once": "1.4.0",
"path-is-absolute": "1.0.1"
"inflight": "^1.0.4",
"inherits": "2",
"minimatch": "2 || 3",
"once": "^1.3.0",
"path-is-absolute": "^1.0.0"
}
},
"inflight": {
"version": "1.0.6",
"bundled": true,
"requires": {
"once": "1.4.0",
"wrappy": "1.0.2"
"once": "^1.3.0",
"wrappy": "1"
}
},
"inherits": {
@ -333,13 +359,13 @@
"bundled": true
},
"ios-sim": {
"version": "6.1.2",
"version": "6.1.3",
"bundled": true,
"requires": {
"bplist-parser": "0.0.6",
"bplist-parser": "^0.0.6",
"nopt": "1.0.9",
"plist": "1.2.0",
"simctl": "1.1.1"
"plist": "^2.1.0",
"simctl": "^1.1.1"
},
"dependencies": {
"bplist-parser": {
@ -350,68 +376,43 @@
"version": "1.0.9",
"bundled": true,
"requires": {
"abbrev": "1.1.1"
"abbrev": "1"
}
}
}
},
"lodash": {
"version": "3.10.1",
"bundled": true
},
"minimatch": {
"version": "3.0.4",
"bundled": true,
"requires": {
"brace-expansion": "1.1.8"
"brace-expansion": "^1.1.7"
}
},
"nopt": {
"version": "3.0.6",
"bundled": true,
"requires": {
"abbrev": "1.1.1"
"abbrev": "1"
}
},
"once": {
"version": "1.4.0",
"bundled": true,
"requires": {
"wrappy": "1.0.2"
}
},
"os-homedir": {
"version": "1.0.2",
"bundled": true
},
"os-tmpdir": {
"version": "1.0.2",
"bundled": true
},
"osenv": {
"version": "0.1.4",
"bundled": true,
"requires": {
"os-homedir": "1.0.2",
"os-tmpdir": "1.0.2"
"wrappy": "1"
}
},
"path-is-absolute": {
"version": "1.0.1",
"bundled": true
},
"pegjs": {
"version": "0.10.0",
"bundled": true
},
"plist": {
"version": "1.2.0",
"version": "2.1.0",
"bundled": true,
"requires": {
"base64-js": "0.0.8",
"util-deprecate": "1.0.2",
"xmlbuilder": "4.0.0",
"xmldom": "0.1.27"
"base64-js": "1.2.0",
"xmlbuilder": "8.2.2",
"xmldom": "0.1.x"
}
},
"q": {
@ -422,10 +423,6 @@
"version": "0.3.5",
"bundled": true
},
"semver": {
"version": "5.4.1",
"bundled": true
},
"shelljs": {
"version": "0.5.3",
"bundled": true
@ -434,8 +431,8 @@
"version": "1.1.1",
"bundled": true,
"requires": {
"shelljs": "0.2.6",
"tail": "0.4.0"
"shelljs": "^0.2.6",
"tail": "^0.4.0"
},
"dependencies": {
"shelljs": {
@ -463,12 +460,8 @@
"requires": {
"base64-js": "1.1.2",
"xmlbuilder": "8.2.2",
"xmldom": "0.1.27"
"xmldom": "0.1.x"
}
},
"xmlbuilder": {
"version": "8.2.2",
"bundled": true
}
}
},
@ -481,17 +474,13 @@
"bundled": true
},
"underscore": {
"version": "1.8.3",
"version": "1.9.1",
"bundled": true
},
"unorm": {
"version": "1.4.1",
"bundled": true
},
"util-deprecate": {
"version": "1.0.2",
"bundled": true
},
"uuid": {
"version": "3.0.1",
"bundled": true
@ -504,8 +493,8 @@
"version": "0.9.3",
"bundled": true,
"requires": {
"pegjs": "0.10.0",
"simple-plist": "0.2.1",
"pegjs": "^0.10.0",
"simple-plist": "^0.2.1",
"uuid": "3.0.1"
}
},
@ -514,11 +503,8 @@
"bundled": true
},
"xmlbuilder": {
"version": "4.0.0",
"bundled": true,
"requires": {
"lodash": "3.10.1"
}
"version": "8.2.2",
"bundled": true
},
"xmldom": {
"version": "0.1.27",
@ -526,15 +512,30 @@
}
}
},
"cordova-plugin-appcenter-analytics": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/cordova-plugin-appcenter-analytics/-/cordova-plugin-appcenter-analytics-0.2.2.tgz",
"integrity": "sha512-qCBrDuWiBcyLgG6jfva7tB3fXzQI7yral5sM9tFxRSYmo9gTUeKWYOHs+Eh01RMtehxtwmnhAgZY5/kj3EhNWg=="
},
"cordova-plugin-appcenter-crashes": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/cordova-plugin-appcenter-crashes/-/cordova-plugin-appcenter-crashes-0.2.2.tgz",
"integrity": "sha512-BxFaSLHmt03CR7g39a2AiInm6xrVI3qYF5B7qw8zemK+mEuAlRBeRR0RsGdnZWW/4mQKhHTA09F8k9KyXhh2gQ=="
},
"cordova-plugin-appcenter-shared": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/cordova-plugin-appcenter-shared/-/cordova-plugin-appcenter-shared-0.2.2.tgz",
"integrity": "sha512-f54lGj/swyEyZQD2IagcOPNUhKjvFsUvrIpBvAOHpWXg4fpScg+MK388MlAJC1Bhzhujs9Oo0VtG4/Z8i1fxwg=="
},
"cordova-plugin-ble-central": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/cordova-plugin-ble-central/-/cordova-plugin-ble-central-1.1.4.tgz",
"integrity": "sha1-rZA2mnla1wChuf3WbhnnzkSnicM="
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/cordova-plugin-ble-central/-/cordova-plugin-ble-central-1.2.2.tgz",
"integrity": "sha512-81+BD9UQSp8Fuati9bPvKG/6lSGHHtw3JeLxQl8Q85ZS1n3GkSfA3DBMqKRjmOG6OVe4csR+XcO7cd75HMl6Qg=="
},
"cordova-plugin-camera-with-exif": {
"version": "1.2.2",
"resolved": "https://registry.npmjs.org/cordova-plugin-camera-with-exif/-/cordova-plugin-camera-with-exif-1.2.2.tgz",
"integrity": "sha1-/kxfHWgga6QoOqtNM4MrVSwil3A="
"version": "1.2.4",
"resolved": "https://registry.npmjs.org/cordova-plugin-camera-with-exif/-/cordova-plugin-camera-with-exif-1.2.4.tgz",
"integrity": "sha1-doF8Dq2LZoGg6Fn5dUceDlaw0xw="
},
"cordova-plugin-compat": {
"version": "1.2.0",
@ -557,14 +558,19 @@
"integrity": "sha1-gQKKt2Q+YVWT0n8q0CRFYR8ZRrY="
},
"cordova-plugin-statusbar": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/cordova-plugin-statusbar/-/cordova-plugin-statusbar-2.4.0.tgz",
"integrity": "sha1-JOspc3ldEPbxrjIC90+Ix9mQzyA="
"version": "2.4.2",
"resolved": "https://registry.npmjs.org/cordova-plugin-statusbar/-/cordova-plugin-statusbar-2.4.2.tgz",
"integrity": "sha1-/B+9wNjXAzp+jh8ff/FnrJvU+vY="
},
"cordova-plugin-whitelist": {
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/cordova-plugin-whitelist/-/cordova-plugin-whitelist-1.3.3.tgz",
"integrity": "sha1-tehezbv+Wu3tQKG/TuI3LmfZb7Q="
},
"pegjs": {
"version": "0.10.0",
"resolved": "http://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz",
"integrity": "sha1-z4uvrm7d/0tafvsYUmnqr0YQ3b0="
}
}
}

View File

@ -1,7 +1,7 @@
{
"name": "com.sixteenmillimeter.intval3",
"displayName": "INTVAL3",
"version": "1.0.3",
"version": "1.0.4",
"description": "Mobile control app for the INTVAL intervalometer for Bolex 16mm cameras",
"main": "index.js",
"scripts": {
@ -11,14 +11,17 @@
"license": "MIT",
"dependencies": {
"cordova-android": "^6.4.0",
"cordova-ios": "^4.5.4",
"cordova-plugin-ble-central": "^1.1.4",
"cordova-plugin-camera-with-exif": "^1.2.2",
"cordova-ios": "^4.5.5",
"cordova-plugin-appcenter-analytics": "^0.2.2",
"cordova-plugin-appcenter-crashes": "^0.2.2",
"cordova-plugin-appcenter-shared": "^0.2.2",
"cordova-plugin-ble-central": "^1.2.2",
"cordova-plugin-camera-with-exif": "^1.2.4",
"cordova-plugin-compat": "^1.2.0",
"cordova-plugin-device": "^1.1.7",
"cordova-plugin-dialogs": "^1.3.4",
"cordova-plugin-splashscreen": "^4.1.0",
"cordova-plugin-statusbar": "^2.4.0",
"cordova-plugin-statusbar": "^2.4.2",
"cordova-plugin-whitelist": "^1.3.3"
},
"cordova": {
@ -28,10 +31,12 @@
"cordova-plugin-dialogs": {},
"cordova-plugin-statusbar": {},
"cordova-plugin-ble-central": {
"BLUETOOTH_USAGE_DESCRIPTION": "INTVAL intervalometer controls"
"BLUETOOTH_USAGE_DESCRIPTION": "INTVAL3 intervalometer controls"
},
"cordova-plugin-splashscreen": {},
"cordova-plugin-camera-with-exif": {}
"cordova-plugin-camera-with-exif": {},
"cordova-plugin-appcenter-analytics": {},
"cordova-plugin-appcenter-crashes": {}
},
"platforms": [
"android",

2718
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -28,14 +28,14 @@
"cron": "^1.2.1",
"gpio": "^0.2.7",
"node-ipc": "^9.1.0",
"node-persist": "^2.1.0",
"onoff": "^1.1.5",
"restify": "^7.2.1",
"rpio": "^0.9.20",
"node-persist": "^3.0.4",
"onoff": "^3.2.8",
"restify": "^8.0.0",
"rpio": "^1.0.13",
"sqlite3": "^4.0.2",
"squel": "^5.12.0",
"uuid": "^3.1.0",
"winston": "^2.3.1"
"winston": "^3.2.1"
},
"devDependencies": {
"jsdoc-to-markdown": "^4.0.1",