16mm
/
intval3
1
0
Fork 0
Code Issues 1 Pull Requests 9 Projects Releases Wiki Activity

Fix error message on app startup. Test to determine this doesn't break functionality with connected app. Must run "getState()" on wake as well as startup.

This commit is contained in:
litter 2020-01-02 12:40:40 -05:00
parent defa0afe7f
commit d4f04ec9f1
3 changed files with 755 additions and 535 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1264
app/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

25
app/package.json
View File

@ -1,25 +1,26 @@
{ {
"name": "com.sixteenmillimeter.intval3", "name": "com.sixteenmillimeter.intval3",
"displayName": "INTVAL3", "displayName": "INTVAL3",
"version": "1.0.4", "version": "1.0.5",
"description": "Mobile control app for the INTVAL intervalometer for Bolex 16mm cameras", "description": "Mobile control app for the INTVAL intervalometer for Bolex 16mm cameras",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
"test": "echo \"Error: no test specified\" && exit 1" "test": "echo \"Error: no test specified\" && exit 1",
"ios": "cordova build ios --buildFlag='-UseModernBuildSystem=0'"
}, },
"author": "M McWilliams", "author": "M McWilliams",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"cordova-android": "^6.4.0", "cordova-android": "^8.1.0",
"cordova-ios": "^4.5.5", "cordova-ios": "^5.1.1",
"cordova-plugin-ble-central": "^1.2.2", "cordova-plugin-ble-central": "^1.2.4",
"cordova-plugin-camera-with-exif": "^1.2.4", "cordova-plugin-camera-with-exif": "^1.3.1",
"cordova-plugin-compat": "^1.2.0", "cordova-plugin-compat": "^1.2.0",
"cordova-plugin-device": "^1.1.7", "cordova-plugin-device": "^2.0.3",
"cordova-plugin-dialogs": "^1.3.4", "cordova-plugin-dialogs": "^2.0.2",
"cordova-plugin-splashscreen": "^4.1.0", "cordova-plugin-splashscreen": "^5.0.3",
"cordova-plugin-statusbar": "^2.4.2", "cordova-plugin-statusbar": "^2.4.3",
"cordova-plugin-whitelist": "^1.3.3" "cordova-plugin-whitelist": "^1.3.4"
}, },
"cordova": { "cordova": {
"plugins": { "plugins": {
@ -38,4 +39,4 @@
"ios" "ios"
] ]
} }
} }

1
app/www/static/js/intval.mobile.js
View File

@ -162,6 +162,7 @@ mobile.init = function () {
mobile.getState = function () { mobile.getState = function () {
if (!mobile.ble.connected) { if (!mobile.ble.connected) {
//returning here will prevent error alert //returning here will prevent error alert
return true
} }
ble.read(mobile.ble.device.id, ble.read(mobile.ble.device.id,
mobile.ble.SERVICE_ID, mobile.ble.SERVICE_ID,