Commit Graph

223 Commits

Author SHA1 Message Date
Johan Degraeve c9987977af developer option to disable chart, just for testing 2020-10-16 08:54:01 +02:00
Johan Degraeve 49c38a3086 glucoseChartManager in RootViewController : nillify when going to background, in order to free up memory, in order to avoid that iOS kills the app in background 2020-10-11 21:12:20 +02:00
Johan Degraeve 03381e60cb snooze parameters being stored in core data 2020-10-10 22:01:47 +02:00
Johan Degraeve 4e7b9a1476 getting rid of warnings, unimportant 2020-10-06 22:32:31 +02:00
Johan Degraeve 7377f57a98 getting rid of warnings, unimportant 2020-10-05 22:04:57 +02:00
Johan Degraeve d28919a4b3 commented out Libre2 direct connectivity 2020-08-30 22:34:32 +02:00
Johan Degraeve ef8f6ebbb5 Libre2 direct connectivity, just prepared, not tested at all 2020-08-30 09:45:31 +02:00
Johan Degraeve 46c0aea3ec Libre 2 local decryption, only when using bubble 2020-08-25 22:05:03 +02:00
Johan Degraeve e6a02921e2 Snooze button in home view enabled now. It allows to presnooze or unsnooze 2020-08-10 21:57:09 +02:00
Johan Degraeve 8b0f628120 removed tracing which should not be needed anymore 2020-07-30 13:08:24 +02:00
Johan Degraeve 860f8e7bbc
Merge branch 'develop' into develop 2020-07-30 13:01:57 +02:00
Paul Plant 42a9cae2a9 Divide by 0 error fix for JSON calibration upload 2020-07-30 12:12:51 +02:00
Johan Degraeve 08f69376c9 adding tracing in calibration upload to fix issue wiht one user 2020-07-29 19:06:22 +02:00
Johan Degraeve b44461151b closes #123 : if alarm goes off, then suppress the notification with the reading, as that info is already in the alarm notification
Xdrip sends a notification for each reding to my home screen. However when you are also in a high or low area a second notification will be triggered right after the reading notification. Can this somehow combined so Im getting a reading as High Alarm instead of both?
2020-07-15 10:29:18 +02:00
Johan Degraeve 3d16f9e5e3 resolve merge conflict 2020-07-13 16:40:21 +02:00
Johan Degraeve 9e65a32e21 cleanup : removed oop web site and oop token from BLEPeripheral/coredata 2020-07-12 23:39:59 +02:00
Paul Plant cbf43f4554 Merge branch 'bgGraphObjectives' into develop 2020-07-12 10:36:11 +02:00
Paul Plant da7e5a09bd Objective Lines/Targets and Settings Screen added 2020-07-11 18:58:56 +02:00
Johan Degraeve 3de9a16d28 moved OOP web site and oop web token to developer settings 2020-07-11 17:33:07 +02:00
Johan Degraeve f4ca7443a6 fix merge conflict 2020-07-10 22:36:27 +02:00
Johan Degraeve 1d9c2ba6fd non fixed slope : small changes in UISwitch handling 2020-07-09 00:04:50 +02:00
Tudor-Andrei Vrabie 9aac215690 Add option for non-fixed calibration slopes for Libre sensors 2020-07-07 20:06:10 +01:00
Johan Degraeve 8c2219f0c3 Merge branch 'MMLibre2' into develop 2020-07-03 23:35:32 +02:00
Johan Degraeve c97571858b MiaoMiao Libre 2 support 2020-07-02 22:10:49 +02:00
Johan Degraeve c07dce41f5 tracing timestamps before and after calling task.resume, everywhere 2020-07-02 21:54:20 +02:00
Johan Degraeve f9a02cfd60 add tracing when alert is raised but notifications are not authorized 2020-07-01 18:40:47 +02:00
Johan Degraeve 2402129e26 resolve merge conflict 2020-06-29 21:42:32 +02:00
Johan Degraeve f034133488 redesign Libre Utilities 2020-06-29 21:38:18 +02:00
Tudor-Andrei Vrabie 34efb3a379 Upload calibrations to Nightscout 2020-06-29 16:28:37 +01:00
Johan Degraeve 3bad01b092 fix #113, GNSEntry, after discovery app crashes 2020-06-15 08:26:52 +02:00
Paul Plant 8900f3ad1c changes to colored circles and guidelines 2020-06-13 20:17:38 +02:00
Paul Plant 0202872166 Initial test of coloured circles 2020-06-12 23:36:39 +02:00
Johan Degraeve 2bd8ea842b fix #113 GNSEntry, after discovery app crashes 2020-06-10 23:44:13 +02:00
Paul Plant 6094b8eeae Glucose Targets and Limits enabled to show on graph. New Home Screen section to Settings. 2020-06-09 19:02:47 +02:00
Johan Degraeve 2ccea4f501 Volume tests.
Two volume tests are possible in the settings screen :
- volume of sound used for alarms where override mute = on
When clicking the setting, the xdrip sound is played. The volume can be turned up or down while the sound is playing, with the device volume buttons
- volume of sound used for alarms where override mute = off AND for missed reading alarms.
When clicking the setting, the xDrip sound is played. When using one of the volume buttons, the sound immediately stops playing. The volume can be changed but the user will not hear the current volume. A new test needs to be intiated to hear the new volume.

Note : missed reading alerts will actually never be able to override mute. Even though an alarm type with override mute = on
That's always been the case, probably not known because I never mentioned it
2020-05-30 16:58:06 +02:00
Johan Degraeve cd393ac418 reenabled web oop for bubble, miaomaio and Watlaa 2020-05-29 00:18:32 +02:00
Johan Degraeve 216457703a disabled web oop for bubble, miaomaio and Watlaa 2020-05-29 00:14:55 +02:00
Johan Degraeve 3cf613fda8 add tracing when going to background, foreground or terminating while running (meaning if terminated by user while app is suspended, then this will not be traced 2020-05-29 00:05:07 +02:00
Johan Degraeve 99c5b3fcad fix #75 Missed reading alert should be canceled if alert type is disabled 2020-04-24 22:05:15 +02:00
Johan Degraeve ad8ce834ce texts related to activation/decactivation CGM, when switching from master to follower mode 2020-04-20 23:34:45 +02:00
Johan Degraeve 68d1d5bed1 Changes related to master/follower mode
- when switching from follower to master, disable the sensor and calibrate button or vice versa
- snooze button always disabled, as it's not yet implemented
- when trying to activate a CGM in follower mode, deny
- when switching from master to follower, and a CGM is active, deactivate it and give warning

Some remarks:
- New texts in BluetoothPeripheralManager and BluetoothPeripheralViewController and BluetoothPeripheralsViewController
These texts are not yet in the strings file (to avoid conflict with Paul's changes)
2020-04-20 22:34:43 +02:00
Johan Degraeve 780423bc7d Watlaa working
It still has unused features which I will remove in the next commit (which allows me to find them back if I want to), like firmware/hardware, serial number ..

Also has fixes for DexcomG6, although still not fully tested
2020-04-18 23:58:52 +02:00
Johan Degraeve 1ed6e71d63 Adding possiblity to integrate with Loop, as proposed by Julian Groen 2020-04-16 22:32:37 +02:00
Johan Degraeve 9108dc2fe0 warning message when upgrading from 3.x to 4.x, to inform that transmitter needs to be recreated in the bluetooth tab 2020-04-14 23:11:36 +02:00
Johan Degraeve 1bae9657ec Dexcom G6 2020-04-13 23:48:11 +02:00
Johan Degraeve 25754c90db Initiate NS or Dexcom upload when user changes value of timeSchedule 2020-04-10 21:48:11 +02:00
Johan Degraeve 0cc70f2a2d Dexcom G4 with xdrip 2020-04-06 22:16:21 +02:00
Johan Degraeve 35aeb177a2 Droplet 2020-04-06 22:16:21 +02:00
Johan Degraeve 5c76abf071 BlueReader + bluetoothPeripheralViewModel can be optional, as in case of BlueReader. In that case there's no specific section with sections 2020-04-06 22:16:02 +02:00
Johan Degraeve 5553495bcc GNSEntry 2020-04-06 22:15:44 +02:00
Johan Degraeve 338a53adf1 Speak Reading : remove option to change the rate 2020-04-06 22:14:47 +02:00
Johan Degraeve 0a78b09b7b blucon in new bt 2020-04-06 22:14:30 +02:00
Johan Degraeve 65d4f1af71 fix default rate value in bgreading speaker 2020-04-06 22:12:17 +02:00
Johan Degraeve 733f5d05ef reset function for G5 2020-04-06 22:12:17 +02:00
Johan Degraeve 1aa613c94e still changes related to info screens when bluetooth is not on or not authorized at the moment user starts scanning 2020-04-06 22:12:17 +02:00
Johan Degraeve 3698775472 message shown when starting the scanning 2020-04-06 22:12:17 +02:00
Johan Degraeve 46bd3a8174 MiaoMiao 2020-04-06 22:12:17 +02:00
Johan Degraeve 1dedd35156 bluetoothPeripheralViewController, add line with last connection or disconnection timestamp 2020-04-06 22:11:34 +02:00
Johan Degraeve 8c0fc34910 just some changes in the comments and moving a function around 2020-04-06 22:11:00 +02:00
Johan Degraeve d2c4efda88 removed automatic start scanning 2020-04-06 22:08:18 +02:00
Johan Degraeve 2fb2d11a0e DexcomG5 battery info added 2020-04-06 22:08:18 +02:00
Johan Degraeve 9a39f66761 sort bluetoothperipherals per category 2020-04-06 22:08:18 +02:00
Johan Degraeve 3a91379b39 Bubble
Sort per category
2020-04-06 22:07:19 +02:00
Johan Degraeve ac9354b539 compiles, but can't test yet for G5 as I have no working one, will continue now with bubble 2020-04-06 22:04:30 +02:00
Johan Degraeve d96fd7a5db temp commit 2020-04-06 22:03:53 +02:00
Johan Degraeve 3e8d7839c5 bt redesign, DexcomG5 2020-04-06 21:57:29 +02:00
Paul Plant f3fd1bb326 Many UI changes. Theme, layout, styles, tabBar, icons. Also text corrections. 2020-04-06 21:50:37 +02:00
Johan Degraeve 04c2901205 fix #74 Chart shows a gap after changing bloodglucose unit 2020-02-02 21:35:48 +01:00
Johan Degraeve d055d090b5 resolve merge conflict, and close #65, Fast rise/drop alerts 2020-01-28 23:17:33 +01:00
Johan Degraeve 3e393cde0f checkAlertGroupAndFire, changed order ; first checkAlertAndFireHelper then check issnoozed 2020-01-28 23:10:48 +01:00
Johan Degraeve 956980e28b Mapping function for AlertKind, so that order in UI can be set without changing the order of the cases. Also minor changes related to checkAlert for fast rise/drop. Still needs more testing 2020-01-28 18:11:34 +01:00
Johan Degraeve 105ad2d9e1 enhancement #53 upload sensor age to nightscout 2020-01-26 23:08:48 +01:00
opsb 9363fb4a81 Add fast drop and fast rise alerts 2020-01-26 18:41:25 +01:00
Johan Degraeve 5bb63fd169 Option to write latest glucose value in Calendar event. This allows to make reading visible in Apple Watch.
Following instructions are copied from Spike :
On your Apple Watch or the Watch app in your iOS device select the
"Modular" watch face and make sure you also select the "Calendar Complication" to be present in the middle of the watch face
Your glucose values should now start syncing to your watch when you receive your next reading from your CGM transmitter.
If by any chance you're not getting readings in your Apple Watch, go to the Watch app and under "General", "Reset"
click the "Reset Sync Data" and wait a few minutes.
2020-01-24 21:13:34 +01:00
Johan Degraeve 96c99691dd more tracing added to find problem with some people in follower mode, that no notification is shown 2020-01-19 22:33:06 +01:00
Johan Degraeve fe2b988b7c resolve merge conflicts 2020-01-19 21:24:16 +01:00
Johan Degraeve 2ec60c502f Watlaa connection, master mode (ie watlaa is master) - receives Libre packets and watlaa battery level
This is a test version

To setup Watlaa :
- go to settings tab, select transmitter type Watlaa
- go back to home screen
- click transmitter
- click start sensor and start the sensor
- then go to the bluetooth tab (the second tab)
- click the +
- select watlaa
- select watlaa master
- scan
- click 'done'

xdrip should now receive the libre packets, you should get a calibration request
2020-01-19 14:10:21 +01:00
Johan Degraeve 65213ea728 fix #54 - missed reading alerts goes on and on for ever 2020-01-19 13:46:58 +01:00
Johan Degraeve 1429922bd5 Option to enable NSLog so that all tracing can be found with cfgutil
When enabled, all logging can be viewed on a Mac:
- install Apple Configurator 2 on a Mac (it's not necessary to run the application)
- Open a Terminal session (on Mac click Search button top right, type 'Terminal', double click on the Terminal app)
- change directory to Downloads folder , type :
cd Downloads
- copy paste this :
/Applications/Apple\ Configurator\ 2.app/Contents/MacOS/cfgutil syslog | grep xDrip-NSLog | awk -F "xDrip-NSLog " '{print $2}'  > xdriplog.txt
and press enter

Now use the app, all logging information can be found in the file xdriplog.txt
You can also leave out the redirection to file.
2020-01-18 00:02:58 +01:00
Johan Degraeve 14fe568e65 watlaa master connect working, receives packages 2020-01-09 18:09:11 +01:00
Johan Degraeve 4a95c2c50d connects to watlaa, discovers services and characteristics 2020-01-07 23:13:18 +01:00
Johan Degraeve a6a6e2a20d set upload schedule for Dexcom share 2020-01-02 22:51:44 +01:00
Johan Degraeve 844ac6c979 set upload schedule for nightscout 2020-01-02 22:27:14 +01:00
Johan Degraeve a52fd4d3c1 M5Stack : option to disable wifi 2019-12-28 21:00:35 +01:00
Johan Degraeve 9cb9c3d909 better handling missed reading alerts : snoozing with rescheduling, repeatable 2019-12-26 22:29:16 +01:00
Johan Degraeve edc27ce6cf M5Stack : view battery level and option to switch off 2019-12-23 23:31:25 +01:00
Johan Degraeve b22a74dd64 removed withVolume parameter in playSound, as it's not used, and it doesn't allow to increase the volume above system volume level 2019-12-22 16:53:27 +01:00
Johan Degraeve d6fc94ca5d fixes for M5Stick 2019-12-21 21:11:04 +01:00
Johan Degraeve a0589d0f7a change in bluetoothperipheral screen : when adding new peripheral, option to choose first the category (for the moment only M5Stack but goal is that others will follow), secondly the type of peripheral (eg M5Stack or M5StickC) 2019-12-18 18:42:38 +01:00
Johan Degraeve ceb5e797e8 when app in background, then don't update labels and chart 2019-12-14 15:00:44 +01:00
Johan Degraeve 4b98823021 fix for case where user clickx 'always connect' in bluetoothperipheral view, and if a password was already storted for that peripheral 2019-12-13 22:40:08 +01:00
Johan Degraeve 4248d359e1 redesign M5Stack stuff, as preperation to move all bluetooth stuff to that page 2019-12-11 18:13:31 +01:00
Johan Degraeve 7ae2412449 glucosechartmanager : mainly comments changedé 2019-11-27 16:01:31 +01:00
Johan Degraeve cd8850b2d2 renamed M5StackManaging to BluetoothPeripheralManaging and M5StackManager to BluetoothPeripheralManager 2019-11-26 21:47:58 +01:00
Johan Degraeve 5653de5161 brightness for m5stack 2019-11-25 22:56:54 +01:00
Johan Degraeve c59e101309 fixes compile error, although this compiled previously 2019-11-24 22:03:13 +01:00
Johan Degraeve 1f697eb65b Glucose chart panning 2019-11-24 21:37:39 +01:00
Johan Degraeve 687e03cedf removed unused chart related code 2019-11-15 13:55:36 +01:00
Johan Degraeve 2144d3945e M5Stack : moved M5StackBluetoothDelegate to other folder 2019-11-11 17:57:59 +01:00
Johan Degraeve 154d08ddcb M5Stack : removed disconnect from protocol M5StackManaging, not used 2019-11-11 10:20:11 +01:00