Commit graph

721 commits

Author SHA1 Message Date
Milos Kozak 94cb506d20 Merge branch 'koreandanar' into smsnotify 2016-12-25 11:51:52 +01:00
Milos Kozak 381de0a5f5 function to send notification 2016-12-25 11:51:46 +01:00
Milos Kozak 02b3da97e0 send important confirmations to all phone numbers 2016-12-25 11:29:13 +01:00
Milos Kozak 273993f995 Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS into smsnotify 2016-12-25 09:53:43 +01:00
Milos Kozak 3bd7568d34 dismiss button not hardcoded 2016-12-24 23:56:47 +01:00
Milos Kozak 052ac47595 Better profile handling 2016-12-24 23:53:17 +01:00
Milos Kozak edcfebfd41 fix displaying missing carbs in wizard 2016-12-24 15:05:44 +01:00
Milos Kozak 5c506faa65 proper reaction to pump error 2016-12-24 14:53:37 +01:00
Milos Kozak 2b0c74c56f CZ translations 2016-12-24 14:21:24 +01:00
Milos Kozak 79aee157e3 redundant code cleanup 2016-12-24 14:13:35 +01:00
Milos Kozak 7719e2ac63 use notifications for profile update 2016-12-22 12:17:38 +01:00
Milos Kozak 132f82b484 fix showing objectives 2016-12-22 12:04:17 +01:00
Milos Kozak d72a3cbf36 Merge branch 'koreandanar' of https://github.com/MilosKozak/AndroidAPS into koreandanar 2016-12-21 14:50:22 +01:00
Milos Kozak d8696412b1 temporary disable korean danar 2016-12-21 14:48:36 +01:00
AdrianLxM 5e2302ed68 start KeepAlive at app start 2 2016-12-16 02:00:53 +01:00
AdrianLxM 4f3c9baf0b start KeepAlive at app start 1 2016-12-16 01:57:18 +01:00
Milos Kozak 37d539ce3e remove duplicated function 2016-12-15 19:10:07 +01:00
Milos Kozak 368652670c Merge branch 'master' into koreandanar 2016-12-15 18:58:16 +01:00
Milos Kozak d34e4579fc clear aps result before new calculation 2016-12-15 18:55:23 +01:00
Milos Kozak 889c75f3ee Merge branch 'koreandanar' of https://github.com/MilosKozak/AndroidAPS into koreandanar 2016-12-14 11:17:15 +01:00
Milos Kozak 5626c621ff fix loop 2016-12-14 11:16:28 +01:00
AdrianLxM d461a4b2c4 Set fragmentVisible instead of fragmentEnabled 2016-12-14 08:23:22 +01:00
Milos Kozak 49453e10df fix x axis on overview when no data displayed 2016-12-13 23:18:02 +01:00
Milos Kozak 738d4c1c2a hide pump control buttons when pump is not initialized 2016-12-13 22:50:51 +01:00
Milos Kozak cb4330ddcd notify when pump settings is wrong 2016-12-13 22:10:13 +01:00
Milos Kozak 407ea423cb detect if extended bolus is enabled, detect easy ui mode 2016-12-13 21:35:49 +01:00
Milos Kozak 9454e7e6e2 Merge branch 'koreandanar' of https://github.com/MilosKozak/AndroidAPS into koreandanar 2016-12-11 22:56:46 +01:00
Milos Kozak 4a2a15d394 smarter plugin selection and handling 2016-12-11 22:55:45 +01:00
AdrianLxM d33629e5d4 Korean Dana history Activity in Manifest 2016-12-11 16:28:18 +01:00
Milos Kozak 8f6f6e326d Disable profile control for pump profiles if pump is not enabled 2016-12-11 13:46:27 +01:00
Milos Kozak 0d6787a744 force enabled if only 1 plugin exists 2016-12-11 13:36:32 +01:00
Milos Kozak be1ec7f3e3 fix processing plugins in configbuilder 2016-12-11 13:08:20 +01:00
Milos Kozak 7aaa15dd3b Merge branch 'koreandanar' of https://github.com/MilosKozak/AndroidAPS into koreandanar 2016-12-11 11:15:34 +01:00
Milos Kozak 80a463a56d parse allowed phone numbers 2016-12-11 10:52:50 +01:00
AdrianLxM c8ac855219 also switch profiles 2016-12-10 23:51:57 +01:00
AdrianLxM e1dc624a47 fully remove mm640g 2016-12-10 22:58:31 +01:00
Milos Kozak 5b6e85f5c9 Merge branch 'master' into koreandanar 2016-12-10 18:14:39 +01:00
Milos Kozak 82f4c8ffac better handling of non existing profiles 2016-12-10 18:14:12 +01:00
Milos Kozak 617192dc3a hide buttons based on pump description 2016-12-10 00:18:20 +01:00
Milos Kozak cf4851250d enable loop only when pump is temp basals capable 2016-12-09 21:47:58 +01:00
Milos Kozak 2a10d4789e virtual pump description 2016-12-09 21:30:34 +01:00
Milos Kozak b824cc28c9 korean danar description 2016-12-09 20:37:56 +01:00
Milos Kozak bd6ee0f213 add duration to description 2016-12-09 20:20:21 +01:00
Milos Kozak 199c6b5e2c fix curentBasal rouding 2016-12-09 19:32:59 +01:00
Milos Kozak 3acabd792c basic danar description 2016-12-09 19:28:48 +01:00
Milos Kozak 6ba532d178 notify about setting basal profile 2016-12-09 16:04:07 +01:00
Milos Kozak 4103e4bf4a allow set profile to pump from simpleprofile plugin 2016-12-09 12:40:15 +01:00
Milos Kozak e9d639c979 fix read basal profile on korean pump 2016-12-09 12:00:44 +01:00
Milos Kozak a01c15f8f7 miminum basal rate in description 2016-12-09 11:46:46 +01:00
Milos Kozak 56eb347b84 Merge remote-tracking branch 'origin/master' into koreandanar 2016-12-09 11:33:33 +01:00
Milos Kozak 8c00e08574 Merge pull request #87 from AdrianLxM/dbfix
lazy initialization of optional plugins
2016-12-09 11:32:22 +01:00
Milos Kozak f75c2f8f91 check if plugin is enabled before accepting message 2016-12-09 11:31:45 +01:00
AdrianLxM f4e82ec022 lazy loading on optional plugins 2016-12-09 09:56:16 +01:00
Milos Kozak 064de0f64e synchronize pump time 2016-12-09 09:31:51 +01:00
Milos Kozak ccda992161 remove unused MM640g plugin 2016-12-08 15:23:37 +01:00
Milos Kozak 073cc84368 added PumpDescription 2016-12-08 15:21:16 +01:00
Milos Kozak 0044b8b41a Merge remote-tracking branch 'origin/master' into koreandanar 2016-12-08 14:29:38 +01:00
Milos Kozak e0f0ee0cbb Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2016-12-08 14:28:53 +01:00
Milos Kozak fdd594358c fix removeExpired in notifications 2016-12-08 14:28:21 +01:00
Milos Kozak 8f98ad1b15 do not process remote profile if not selected 2016-12-07 22:12:48 +01:00
AdrianLxM fa4cf31cf4 Correct db query 2016-12-07 01:48:53 +01:00
Milos Kozak 1db9ce287c fix basal rates decoding 2016-12-07 00:15:42 +01:00
Milos Kozak 2dea4615c0 basal rates set 2016-12-06 23:46:36 +01:00
Milos Kozak f2928c3d39 fix IC and ISF in DanaR Korean profile 2016-12-06 23:19:48 +01:00
Milos Kozak be8003da4b Merge branch 'master' into koreandanar 2016-12-06 23:18:02 +01:00
Milos Kozak 64de2fd736 Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2016-12-06 23:15:23 +01:00
Milos Kozak 10d30571a9 fix IC and ISF in DanaR profile 2016-12-06 23:14:25 +01:00
Milos Kozak d897b778a0 Merge pull request #84 from MilosKozak/notifications
basic notification functionality
2016-12-06 23:05:23 +01:00
Milos Kozak 3a3fc5d508 one more ICF with 1 decimal 2016-12-06 23:03:45 +01:00
Milos Kozak 86755599df show IC and ICF with 1 decimal 2016-12-06 23:00:57 +01:00
Milos Kozak 0af894aa56 change info color to green 2016-12-06 22:57:49 +01:00
Milos Kozak b61108eb2b remove test data 2016-12-06 22:55:49 +01:00
AdrianLxM 1a20b637b6 limit readings to values above 38 2016-12-05 17:47:03 +01:00
Milos Kozak abfb832a10 basic notification functionality 2016-12-05 15:20:44 +01:00
Milos Kozak 4b389c2cad dana drivers switching working 2016-12-03 17:42:08 +01:00
AdrianLxM 1af28d007f wear make sendData() private 2016-12-01 12:10:58 +01:00
AdrianLxM 7eb8702a9c wear profile-null fix Toasts from strings.xml the second 2016-12-01 10:54:19 +01:00
AdrianLxM 68f4a2db50 wear profile-fix toast from strings.xml 2016-12-01 10:47:39 +01:00
AdrianLxM 0d8fd9df5c wear profile may be null 2016-12-01 09:30:39 +01:00
Milos Kozak db2fd55f7c copy files for Korean DanaR 2016-11-29 20:52:40 +01:00
Milos Kozak 97a22344e3 CZ translations 2016-11-29 19:07:09 +01:00
Milos Kozak 36d5f1dc29 proper danar errors detection 2016-11-29 18:28:36 +01:00
AdrianLxM 896503918c wear extract strings 2016-11-29 15:01:00 +01:00
AdrianLxM 1eacf35e47 Merge pull request #25 from AdrianLxM/wear-prepare-final
wear merge current master
2016-11-29 13:17:21 +01:00
Milos Kozak ee408ada79 Merge pull request #80 from warstar2187/master
Fix Insulin Activity and Korean update
2016-11-29 07:44:58 +01:00
warstar2187 7f97b232da Update Treatment.java 2016-11-29 12:08:45 +09:00
Milos Kozak 2912d1cce1 Merge pull request #79 from AdrianLxM/viktoria-permissions
Viktoria permissions
2016-11-28 19:02:28 +01:00
AdrianLxM 70338ac158 wear PoweRGbg fixes 2016-11-28 18:42:19 +01:00
AdrianLxM 87d49c03c8 wear product flavors 2016-11-26 07:10:22 +01:00
AdrianLxM b2d2f462f6 first check if element exist, then access it 2016-11-25 13:35:53 +01:00
LadyViktoria 39be1bb4c7 Android 6+ Permissions #6 2016-11-25 13:35:34 +01:00
AdrianLxM ff29a795db SMS permission crashfix 2016-11-25 13:32:27 +01:00
LadyViktoria 33d783e9b0 Android 6+ Permissions #4 2016-11-25 13:32:17 +01:00
LadyViktoria 1967602c70 Android 6+ Permissions #3 2016-11-25 13:32:07 +01:00
viktoria dd02fcaa85 Android 6+ Permissions #2 2016-11-25 13:31:52 +01:00
LadyViktoria f25715d87c Android 6+ Permissions 2016-11-25 13:31:43 +01:00
AdrianLxM 12e78656b7 wear settings 2016-11-24 16:23:31 +01:00
AdrianLxM c633904e8c wear fragment and reset button 2016-11-24 16:23:31 +01:00
AdrianLxM b306de49dc wear Emma 2016-11-24 16:23:31 +01:00
AdrianLxM ef0e30b2b3 wear big chart avgDelta working 2016-11-24 16:23:31 +01:00
AdrianLxM 5e3fddcc05 wear arrows working 2016-11-24 16:23:31 +01:00
AdrianLxM 95432e35e0 wear yet again current situation tweaks 2016-11-24 16:23:31 +01:00
AdrianLxM 663a865595 wear intent to express current situation better 2016-11-24 16:23:31 +01:00
AdrianLxM 8af4ac0daf wear bigchart fully functional 2016-11-24 16:23:31 +01:00
AdrianLxM afa5faf834 wear basal live 2016-11-24 16:23:31 +01:00
AdrianLxM 2b17fc5155 wear painting temps 2016-11-24 16:23:31 +01:00
AdrianLxM 70c3969f85 wear something is painting 2016-11-24 16:23:31 +01:00
AdrianLxM b93273d706 wear status working 2016-11-24 16:23:31 +01:00
AdrianLxM e2c3069374 resend(), bigchart watchface layout overhaul, fix nullpointer exception, only send when enabled 2016-11-24 16:23:31 +01:00
AdrianLxM 2e0ac569eb wear first bg and delta on watch 2016-11-24 16:23:31 +01:00
AdrianLxM 761077e8ae wear fix overeager refactoring and plugin pluggable 2016-11-24 16:23:31 +01:00
AdrianLxM 2fd93a8e31 wear installing on watch 2016-11-24 16:23:31 +01:00
ecorman da861a7108 Note basal start / end to see note in Xdrip+ with data 2016-11-23 23:59:11 +01:00
AdrianLxM ef847a7cc2 Make bolus progress dialog not cancalable 2016-11-21 19:50:27 +01:00
AdrianLxM b97920b3ef Integer: comparison by value not by reference
Why is there no compiler warning for this?
2016-11-18 15:21:07 +01:00
Radoslav Radev 8b5ee91c95 Update strings.xml 2016-11-17 22:40:51 +02:00
Radoslav Radev 56c83aac2f bg translation
1
2016-11-17 22:12:19 +02:00
Milos Kozak 41acb2d022 Merge pull request #70 from AdrianLxM/cpp_sum
Add sum to the overview of the basal profile.
2016-11-17 20:09:54 +01:00
AdrianLxM 505a135ac8 CPP add sum to basal rate representation 2016-11-17 13:35:38 +01:00
AdrianLxM b74c29d202 zip logfiles on daily rollover 2016-11-17 00:23:20 +01:00
AdrianLxM ade27a9460 CPP proper dialog handling 2016-11-15 18:59:38 +01:00
AdrianLxM 127c85effb CPP delete images that are not used 2016-11-15 17:40:16 +01:00
AdrianLxM 3da9a8c45c CPP limits 50 to 200 percent 2016-11-15 17:25:23 +01:00
AdrianLxM b01fb6ee6e CPP hard limits for percentage 2016-11-15 07:52:59 +01:00
AdrianLxM 513b2966c9 CPP cleanup and i18n 2016-11-14 18:19:17 +01:00
AdrianLxM 74ea6c4011 CPP working 2016-11-14 18:19:17 +01:00
AdrianLxM 85b052efda CPP copyprev buttons working 2016-11-14 18:19:17 +01:00
AdrianLxM c2d1fdb39e CPP edit base basal gui - without function yet 2016-11-14 18:19:17 +01:00
AdrianLxM dba81ede2a calculation for isf and ic. Tooltips. 2016-11-14 18:19:17 +01:00
AdrianLxM 0e5d18ec86 keep basal in order as required when writing to dana 2016-11-14 18:19:17 +01:00
AdrianLxM 3fe7c7a0fa CPP shiftfix and base profile view 2016-11-14 18:19:17 +01:00
AdrianLxM 2c5b20a721 CPP html-ify and send to pump button 2016-11-14 18:19:17 +01:00
AdrianLxM a57a864c24 CPP icons 2016-11-14 18:19:17 +01:00
AdrianLxM 4dbb20b8c5 CPP small redesign 2016-11-14 18:19:17 +01:00
AdrianLxM f815f7fce6 CPP ic and isf data 2016-11-14 18:19:17 +01:00
AdrianLxM 8c93925865 CPP simple representation string 2016-11-14 18:19:17 +01:00
AdrianLxM 364b3d6710 CPP percentage and shift working on hard coded basal rate 2016-11-14 18:19:17 +01:00
AdrianLxM be556cf388 CPP copy simple profile 2016-11-14 18:19:17 +01:00
AdrianLxM d94136bc95 overview dymanic height 2016-11-12 20:39:11 +01:00
warstar2187 2365dbac86 Update strings.xml 2016-11-13 01:54:28 +09:00
AdrianLxM 12fc454fe1 divisions with doubles to not do whole minute jumps 2016-11-12 13:16:11 +01:00
AdrianLxM 68acc3aca3 deltas per 5 minutes 2016-11-12 13:05:18 +01:00
Milos Kozak 0b56b7554c Merge pull request #64 from AdrianLxM/fill-presets2
Fill presets
2016-11-12 10:41:54 +01:00
Milos Kozak dce6acba54 Merge pull request #65 from AdrianLxM/german-update
German update
2016-11-12 10:28:01 +01:00
AdrianLxM 2fef497ce9 German updates 02 2016-11-11 17:59:23 +01:00
AdrianLxM 75889c24b3 German updates 01 2016-11-11 17:59:10 +01:00
Milos Kozak b5bd6749ae fix app crash when no profile set 2016-11-11 16:40:31 +01:00
AdrianLxM 401be6dd5b add U to buttons 2016-11-11 16:29:28 +01:00
AdrianLxM 1568f77229 fill preset buttons 2016-11-11 16:24:00 +01:00
warstar2187 2d54a068ad Update strings.xml 2016-11-11 23:07:32 +09:00
Milos Kozak c034f77b71 fix merge conflict 2 2016-11-11 13:09:50 +01:00
Milos Kozak a341fa4343 fix merge conflict 2016-11-11 13:09:11 +01:00
Milos Kozak ad475ace90 Merge pull request #63 from AdrianLxM/profileLongpress
profile switch dialog on long press on profile pill
2016-11-11 12:57:00 +01:00
Milos Kozak 753fb4664d Merge pull request #61 from AdrianLxM/fill-action
Fill action
2016-11-11 12:56:21 +01:00
AdrianLxM 4a23d4ce0d profile switch dialog on long press on profile pill 2016-11-11 12:29:13 +01:00
AdrianLxM 41e68a03a2 SimpleProfile as profile name 2016-11-11 01:45:41 +01:00
AdrianLxM 4b27c9212a DanaR as part of profile name 2016-11-11 01:45:28 +01:00
AdrianLxM a6d5d68938 fill action 2016-11-11 00:56:15 +01:00
Milos Kozak e8d169f078 allow automated actions only whem pump is initialized 2016-11-10 23:33:12 +01:00
Milos Kozak 86a3df1996 lower allowed diff to perform action from 0.1 to 0.05 2016-11-10 23:33:12 +01:00
AdrianLxM 7b4b4f7cfc Overview profile redesign 2016-11-10 23:20:23 +01:00
AdrianLxM 4ee87d1cca basal profile on overview 2016-11-10 21:03:26 +01:00
AdrianLxM a6ae92bb2f Receive profile updates on uploadOnly when NS-Profiles are used 2016-11-10 18:53:01 +01:00
AdrianLxM c900d6611c Warn on "refresh treatments from NS" button in upload only mode. 2016-11-10 18:52:42 +01:00
AdrianLxM f85f04d33f NS upload only 2016-11-10 18:33:50 +01:00
Milos Kozak 21f732b378 report app start/restart to NS 2016-11-10 16:42:59 +01:00
Milos Kozak a5778b4916 Merge pull request #58 from AdrianLxM/loadmorehightemps
Load more "extended bolus" high temps
2016-11-10 13:54:11 +01:00
AdrianLxM 5088b84417 Receive profile updates on uploadOnly when NS-Profiles are used 2016-11-10 13:50:13 +01:00
Milos Kozak 156f42da5f always report active profile 2016-11-10 13:15:23 +01:00
Milos Kozak 770f44118b Merge pull request #56 from AdrianLxM/hapticFeedback
Haptic feedback
2016-11-10 10:02:26 +01:00
Milos Kozak 8d360f837d Merge pull request #57 from warstar2187/master
kr translation update
2016-11-10 10:02:01 +01:00
AdrianLxM 3ee1cf5023 haptic feedback for loop pill on overview 2016-11-10 00:02:51 +01:00
Milos Kozak 8707b42526 Merge pull request #54 from AdrianLxM/confirm_reset_db
Confirm reset db
2016-11-08 23:02:03 +01:00
AdrianLxM aaba503cd0 Fix crash due to not found theme 2016-11-08 22:57:56 +01:00
Milos Kozak bad7e5d7c4 gradle fix 2016-11-08 22:55:08 +01:00
AdrianLxM 341d7222e5 Strings for reset DB 2016-11-08 22:36:47 +01:00
AdrianLxM 218ccc803b Ask before resetting DB 2016-11-08 22:35:57 +01:00
Milos Kozak a2d4f22bd7 added git HEAD and version to pump status and logs 2016-11-08 19:10:25 +01:00
Milos Kozak 94a7033e0c always upload current basal rate 2016-11-08 17:55:39 +01:00
Milos Kozak a4a9efd812 TAB_VIEW_PADDING_DIPS = 9 2016-11-08 14:24:02 +01:00
warstar2187 1f35018148 Update strings.xml 2016-11-08 20:04:19 +09:00
warstar2187 9ae3d88f9c Update DanaRPlugin.java 2016-11-08 19:59:54 +09:00
Milos Kozak 4a4dc04865 fix iob reporting to NS 2016-11-08 10:29:24 +01:00
AdrianLxM ff66edf064 Add TDD to DanaR daily view
... also don't show the time for the day. It is always 00:00 anyways.
2016-11-08 06:11:50 +01:00
AdrianLxM ede982c8c5 Update danar_history_item.xml 2016-11-08 06:08:12 +01:00
AdrianLxM 93accc0d9f Add in basalIOB.activity 2016-11-07 15:18:48 +01:00
AdrianLxM 8bdc86f359 Calculate activityContrib for TempBasal 2016-11-07 15:17:16 +01:00
AdrianLxM 2e6a37dcbd Add base basal rate to Overview when temp is running
Now that there is more space with less buttons, it should fit ;)
2016-11-07 10:18:16 +01:00
Milos Kozak d67ae5df78 version bump 1.0.20 2016-11-07 10:16:13 +01:00
Milos Kozak 925b5612fc Merge pull request #49 from AdrianLxM/disableLoopLongpress
Disable loop on Longpress on Loop-Status in Overview
2016-11-07 10:14:14 +01:00
Milos Kozak 3533ec16ba Merge pull request #50 from AdrianLxM/patch-7
fix for net IOB
2016-11-07 09:36:16 +01:00
Milos Kozak 6263b98683 Merge pull request #39 from warstar2187/master
Update strings.xml
2016-11-07 09:13:21 +01:00
AdrianLxM e948a6f955 fix for net IOB 2016-11-07 07:55:41 +01:00
AdrianLxM 686593986c Update PreferencesActivity.java 2016-11-07 01:02:08 +01:00
AdrianLxM c851aefc8e Update MainActivity.java 2016-11-07 01:01:33 +01:00
AdrianLxM 68be6179f8 Update EventRefreshGui.java 2016-11-07 01:00:50 +01:00
AdrianLxM be39a35d68 Update ConfigBuilderFragment.java 2016-11-07 00:59:47 +01:00
AdrianLxM c93322f2da Overview Loopdisable on longclick 1 2016-11-07 00:58:44 +01:00
Milos Kozak f84777bf00 Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS 2016-11-06 12:10:55 +01:00
Milos Kozak 95ffb03a26 fix resources crash 2016-11-06 12:10:24 +01:00