gudbjartur22/clinx02-androidpebble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
662 Commits 1 Branch 0 Tags
1816c10234f62153f442aaad998f21464091bca3
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Graham Jones 1816c10234 Added check that log manager mLm is not null before using it - FIXES #195 (well prevents it crashing the whole app anyway!) 2024-06-14 14:36:22 +01:00
Graham Jones 7871de926c V4.2.9 - fixed crash when using Polish translation and corrected network data source fault display on main screen. 2024-06-10 20:17:07 +01:00
Graham Jones 28dc9eabb4 Updated readme for new structure of development branches. 2024-06-06 19:21:50 +01:00
Graham Jones ad72bb6fc0 Merge branch 'V4.2.x' 2024-05-27 21:03:55 +01:00
Graham Jones d61539f980 Build V4.2.8 for play store 2024-05-09 22:01:43 +01:00
Graham Jones a2ae6b939c Added CNN based seizure probability to OSDAlg fragment - addresses #189 and #182 2024-05-09 21:41:04 +01:00
Graham Jones 2782689caa Merge pull request #190 from OpenSeizureDetector/178-v427-banglejs2-does-not-work-with-new-ble2-data-source 
178 v427 banglejs2 does not work with new ble2 data source
 2024-05-09 21:27:24 +01:00
Graham Jones c492e8616a Altered data source list to show BLE as BangleJS and BLE2 as PineTime 2024-05-09 21:20:15 +01:00
Graham Jones bc56e842f4 Merge branch 'V4.2.x' into 178-v427-banglejs2-does-not-work-with-new-ble2-data-source 2024-05-09 20:37:15 +01:00
Graham Jones 296bf3b9f1 Merge pull request #188 from OpenSeizureDetector/176-v426-crash-when-opening-app-from-notification 
Added exception catching to updateUI in an attempt to fix #176
 2024-05-08 21:59:54 +01:00
Graham Jones bcb5f80df5 Added exception catching to updateUI in an attempt to fix #176 2024-05-08 21:56:51 +01:00
Graham Jones d47df2fb97 Merge pull request #187 from OpenSeizureDetector/185-crash-in-exportactivity-when-using-comma-as-decimal-separator 
Introduced ParseToDoule function into mUtil as suggested by @AroonPro…
 2024-05-08 21:42:39 +01:00
Graham Jones 54e0264cdd Introduced ParseToDoule function into mUtil as suggested by @AroonPro. I have used NumberFormat to do the parse as recommended by the Oracle java documentation. Fixes #185 2024-05-08 21:38:07 +01:00
Graham Jones 951f6b176a Update version number and logcat strings to help with debugging 2024-05-07 21:15:35 +01:00
Graham Jones 446d2d1831 Merge pull request #174 from OpenSeizureDetector/169-v424+-ble-data-source-issues_3rd-attempt 
169 v424+ ble data source issues 3rd attempt
 2024-04-14 20:32:33 +01:00
Graham Jones 27c7f7be7e Minor UI tidying up, built V4.2.7 for play store 2024-04-14 20:26:05 +01:00
Graham Jones db9515cf31 Re-enabled auto reconnection in BLE2 data source - seems to be working well after several disconnect-reconnect cycles. 2024-04-14 19:55:41 +01:00
Graham Jones 9e421d51a5 Merge pull request #173 from OpenSeizureDetector/169-v424+-ble-data-source-issues_2nd_attempt 
169 v424+ ble data source issues 2nd attempt
 2024-04-13 22:39:08 +01:00
Graham Jones 5a14836df6 Updated changelog for V4.2.6 build 2024-04-13 22:37:28 +01:00
Graham Jones dad8df1c15 Built V4.2.6 for beta testing 2024-04-13 22:23:37 +01:00
Graham Jones bb8330db1c Fixed minor data time period and BLE device MAC address display issues 2024-04-13 22:18:27 +01:00
Graham Jones 50fdf237b9 Enabled battery history fragment of main activity 2024-04-13 22:00:30 +01:00
Graham Jones 1ad6d2b228 Added watch connection signal strength trend graph (will only work for BLE2 data source at the moment!) 2024-04-13 21:39:30 +01:00
Graham Jones 163dd0f4d9 Added a circular buffer to store 4 hours worth of watch signal strength for a graph 2024-04-13 21:09:50 +01:00
Graham Jones 568c932101 Added watch data to system fragment on main display, including watch signal strength 2024-04-13 21:00:03 +01:00
Graham Jones 1308e6cbef Disabled data source re-start on FAULT because it was resulting in multiple notifications to the accelerometer characteristic which meant it was receiving duplicate values which was breaking the analysis - it is better to have a FAULT than bad analysis! 2024-04-13 20:15:26 +01:00
Graham Jones 2c58f0130f Merge pull request #172 from OpenSeizureDetector/ble_permissions 
Fixed issue with bluetooth permissions
 2024-04-12 20:49:20 +01:00
Graham Jones 57068c49fb Fixed issue with bluetooth permissions - different permissions required for Android 12+ 2024-04-12 20:46:50 +01:00
Graham Jones a82a71f413 Having trouble with Bluetooth permissions - made a few changes and it seems to be working again, but needs testing on a couple of devices 2024-04-12 19:25:59 +01:00
Graham Jones 0dbb735517 bumped version number 2024-04-11 20:41:11 +01:00
Graham Jones 617eb53c2c Merge pull request #171 from OpenSeizureDetector/169-v424+-ble-data-source-issues 
169 v424+ ble data source issues
 2024-04-11 20:34:41 +01:00
Graham Jones beeb6abe49 Added check that we need BT permissions for BLE2 data source as well as BLE data source. 2024-04-11 20:25:01 +01:00
Graham Jones dcbf8028b1 Added longer delay between shutting down data source and re-starting it to make sure it shuts down properly. **We should really check it is shutdown before re-starting it!!** 2024-04-11 20:15:08 +01:00
Graham Jones b0ce331731 Added some try/catch blocks in SdDataSourceBLE2 to avoid crashes during shutdown. Re-introduced a data source re-start when we do a fault beep to try to rectify the problem 2024-04-11 20:00:13 +01:00
Graham Jones c23176ca8e Bound and unbound from service in Fragment onResume and onPause so we don't have so many things bound to the service at once 2024-04-11 19:42:35 +01:00
Graham Jones 532c2f0741 Added population of device info from BLE2 data source, and added auto-reconnect if the device disconnects. Note, if it disconnects for too long, the Pinetime goes to sleep and you need to press the button to re-enable it to clear the FAULT condition. This needs a PineTime firmware change to fix it. 2024-04-11 16:13:47 +01:00
Graham Jones 24cf171952 Fixed BLE2 shutdown - I think 2024-04-11 10:31:31 +01:00
Graham Jones 1dc2acdc61 Saved settings properly -starts ok now. Still need to sort out shut down and automatic reconnection 2024-04-10 22:56:10 +01:00
Graham Jones 0685215f2f BLE2 data source seems to be running on PineTime. Sart-up activity stuck on settings though 2024-04-10 22:46:48 +01:00
Graham Jones 26ab724410 enabled new BLE2 data source - not working yet! 2024-04-10 20:51:09 +01:00
Graham Jones 6ca038b514 Made CNN Alarm Disabled by default to reduce false alarms (Fixes #170) 2024-04-09 22:00:51 +01:00
Graham Jones cc0eba7a21 Merge pull request #167 from OpenSeizureDetector/166-v424-notifications-not-displaying-on-android-13-go-edition-moto-e13 
166 v424 notifications not displaying on android 13 go edition moto e13
 2024-04-08 20:37:43 +01:00
Graham Jones 3ad112cce7 Fixed notificaton problems on Android 13, tidied up start-up sequence. Added a 'restart' menu option. 2024-04-08 20:34:30 +01:00
Graham Jones 3552df8981 Built draft v4.2.6a.apk for testing on a few different devices. 2024-04-06 20:58:22 +01:00
Graham Jones b39aaa2805 fixed errors about getDrawable() from progress bars. 2024-04-06 20:53:16 +01:00
Graham Jones dee2bcc3b8 Fixed notifications and Bluetooth permissions issues on Android 13 Go. Re-start of the app improved to reduce the chance of leaving part of background service running, but this may make startup activity seem less stable. 2024-04-06 20:41:04 +01:00
Graham Jones 6633eee60d Merge pull request #165 from OpenSeizureDetector/148-v42x-pinetime-timedate-not-synchronised-to-phone 
Added Current Time Service to BLE Data Source
 2024-04-02 19:49:28 +01:00
Graham Jones 6d68348330 Added Current Time Service to BLE Data Source so we set the time on InfiniTime when it connects (using the library by BeeLine https://github.com/RideBeeline/android-bluetooth-current-time-service)). 2024-04-02 19:44:13 +01:00
Graham Jones ba9b092147 V4.2.4 - fault rather than crash if bluetooth system crashes. 2024-03-26 21:12:13 +00:00
Graham Jones fb59ec6db6 Added check that characteristic is not null before reading it. Displays warning on Logcat if it is null rather than crashing. 2024-03-25 22:56:56 +00:00
Graham Jones cff9d4567c V4.2.4a - check for null gatt characteristic before writing - should fix #158 2024-03-24 22:16:13 +00:00
Graham Jones 340b82ad1b Built V4.2.3 for play store 2024-03-24 16:42:43 +00:00
Graham Jones 78f1a42577 Merge branch 'V4.2.x' of github.com:OpenSeizureDetector/Android_Pebble_SD into V4.2.x 2024-03-23 20:25:58 +00:00
Graham Jones 6437e28bf9 Update version number 2024-03-23 20:25:09 +00:00
Graham Jones 529d87dd39 Merge pull request #156 from OpenSeizureDetector/V4.2.x_3dData 
Use 3d data to derive vector magnitudes if magnitude data not provided
 2024-03-23 20:24:33 +00:00
Graham Jones 1d0807ed2c Merge pull request #155 from OpenSeizureDetector/HR-activation-toggling 
Hr activation toggling
 2024-03-23 20:05:11 +00:00
Graham Jones 30b6403022 Added release build of V4.2.3c with latch alarm fix merged into it 2024-03-22 16:18:51 +00:00
Graham Jones b69a552cca Merge branch 'V4.2.x' into V4.2.x_3dData 2024-03-22 16:13:53 +00:00
Graham Jones a106f59462 Merge pull request #151 from OpenSeizureDetector/V4.2.x_latch 
V4.2.x latch
 2024-03-22 16:09:26 +00:00
Graham Jones 705e146a33 Fixed problem with analysing only 3d data rather than vector magnitude. 2024-03-22 16:02:24 +00:00
Graham Jones 4a910dc766 Added draft V4.2.3b to test latch alarms function 2024-03-21 23:01:03 +00:00
Graham Jones 9da0406e90 Fixed latch alarm timer (fixes #146) 2024-03-21 22:47:24 +00:00
Graham Jones fa024d72db 4.2.3a - use 3d data if vector magnitude not available 2024-03-21 21:08:08 +00:00
Graham Jones 0ef4ced31e V4.2.2 - Added support for OSD status reporting to PineTime watches 2024-03-16 22:01:50 +00:00
Graham Jones 2a0ef413b0 Changed log levels to tidy up logcat output 2024-02-28 20:04:25 +00:00
Graham Jones 092802cf1d Made mainactivity 'exit' menu function the same as mainactivity2 for consistency. 2024-02-27 13:23:54 +00:00
Graham Jones 61c7668712 Added V4.2.1 apk to releases folder 2024-02-02 15:13:33 +00:00
Graham Jones 69175131e2 Fixed issue with crash when rotating screen - Fixes #142 2024-02-02 15:06:23 +00:00
Graham Jones 1be6e51406 Fixed issue with new main activity blanking rather than staying on. Fixes #141 2024-01-31 21:32:30 +00:00
Graham Jones 1a98e1094e Fixed crash reported by google pre-release report 2024-01-31 21:30:51 +00:00
Graham Jones 7071696d8d Added writing of alarmState to OSD BLE Characteristic - not properly tested yet because I don't have a BLE data source which reads this - but it handles the characteristic not existing properly without crashing. 2024-01-28 20:28:14 +00:00
Graham Jones 6cdc245149 Update version code so that play store will send V4.2.x to alpha testers. 2024-01-28 14:03:51 +00:00
Graham Jones 8f905b068f Merge branch 'V4.1.x' 2024-01-28 13:45:18 +00:00
Graham Jones bb451e1f74 tidying directory 2024-01-28 13:44:54 +00:00
Graham Jones 09f33ee16f Minor Update to V4.1.x to fix silent crash issue #135 in production version 2024-01-28 08:29:27 +00:00
Graham Jones 7a44be7037 re-buid because I messed up play store alpha release 2024-01-27 22:57:19 +00:00
Graham Jones 02eeca28a3 Fixed issue with crash when switching between new and original UI 2024-01-27 22:49:27 +00:00
Graham Jones c89d02e397 Fixes switching between the two user interfaces without user having to exit app and re-start it. Fixes #138 2024-01-27 21:44:42 +00:00
Graham Jones b2a5fef2ff Put the fault detection functions (getStatus and faultCheck) in try...catch blocks. Fixes #135 
Should reduce the chances of a silent crash
They should give a fault 'pip' instead of crashing.
Not easy to test though becasue crashes are so rare...
Use git diff -w to show the real changes, otherwise this looks like a huge change.
 2024-01-27 21:17:15 +00:00
Graham Jones 4c164894a7 Fixed main activity mangling issue - Fixes #136 2024-01-27 20:23:45 +00:00
Graham Jones bc6d312c6a Fixed issue with system not shutting down properly using new UI (#133) - it was the fragments remaining bound to the server, preventing it shutting down. Fixed by making the 'stop' option an 'Exit' which shuts down the server and exits the main activity. 2024-01-25 22:15:09 +00:00
Graham Jones 4e3a6bb1de Made new UI default for new installations - built V4.2.1n apk 2024-01-24 20:16:53 +00:00
Graham Jones b4ec9afdcc Tidying up new user interface (and upgrading libraries after I suddenly got a load of build errors for some reason) 2024-01-24 20:09:34 +00:00
Graham Jones df9465dfb2 Tidied up BLE scan activity a bit 2024-01-21 21:05:09 +00:00
Graham Jones c5735d68c8 Set watch SD name and part no. for BLE data source 2024-01-21 19:47:23 +00:00
Graham Jones 36582f07e3 Started on battery history screen for new UI - not working yet, but it runs without crashing 2024-01-20 20:38:30 +00:00
Graham Jones 2cfb63fc2b Added data time and time diffrence between data points to main activity2 common fragment 2024-01-20 19:59:52 +00:00
Graham Jones cfe612933f Applied Android Studio code formatting to all java files 2024-01-19 20:53:18 +00:00
Graham Jones d8b3582291 Tidied up new user interface (and fixed problem with re-loading only activity from Android Studio) 2024-01-19 20:49:41 +00:00
Graham Jones 65c8a2a12b Updated BLE data source to handle 0x00 or 0xff as fault values, and fix issue with data being received multiple times after pinetime watch goes out of range and then returns. 2024-01-18 11:08:08 +00:00
Graham Jones 99b925cbd6 Increased chart description font size 2024-01-13 20:50:49 +00:00
Graham Jones 0cf40b9d21 Formatted HR history graph 2024-01-13 20:37:39 +00:00
Graham Jones f81a6e7dde Partial merge of the HR history graphs by @AroonPro - still need to add averaging option and then make the x scale user selectable - it is 3 hours at the moment 2024-01-13 13:42:38 +00:00
Graham Jones 9bfcc01525 Added read of standard battery service so we get 'settings ok' with InfiniTime 2024-01-11 19:50:27 +00:00
Graham Jones 259afff970 Added initial support for Infinitime GATT characteristics for heart rate and accelerometer - needs further development though! 2024-01-02 09:41:42 +00:00
Graham Jones 72018f7f28 Added updated README file from master branch 2023-12-21 18:03:07 +00:00
Graham Jones f94673c5e7 Changed default settings of fall detection algorithm so it works as a simple high acceleration detection algorithm - might fix #22 2023-12-21 17:52:35 +00:00
Graham Jones cdbacd00c2 Added alarm cause code. Fixes #111 2023-12-21 17:40:03 +00:00
Graham Jones 792ddf46d0 Fixed phone data source (battery low warning on MainActivity, and crash running off end of RawData). I am a bit suspicious that the frequency response is not right after downsampling, but ok for now as it is just a demo mode. 2023-12-21 15:59:22 +00:00
Graham Jones 92311545ea Added phone battery level to logged data fixes #55 2023-12-21 15:03:26 +00:00