Tzachi OpenAPS data 3 #1303

tzachi-dar · 2020-04-14T13:04:11Z

This PR allows xdrip to display OAPS data (basal rate, iob, cob and last connected).

Works when xdrip is uploading to NS and also in ns client mode.

Also send the data when in follower mode.

I have tested this code for a few month and it works well for me.

… of the DB. Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

Still need to download it when working in nightscout follower mode. Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

(It ended by sending too much data to followers.) Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

# Conflicts: # app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BgGraphBuilder.java

Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

tzachi-dar · 2020-04-14T13:07:03Z

Here is an example to the output.

old-square-eyes · 2020-10-29T22:13:59Z

Would love the OpenAPS data on My SWR50. Is this part of the PR?

old-square-eyes · 2020-10-29T22:29:34Z

Also... what is "ns client mode" in this context? I use NSClient currently and would love to only use one app. I'm hoping xDrip will have enough features to get rid of NSclient from my phone (it's a battery hog).

tolot27 · 2020-11-06T19:08:09Z

Also... what is "ns client mode" in this context? I use NSClient currently and would love to only use one app. I'm hoping xDrip will have enough features to get rid of NSclient from my phone (it's a battery hog).

What do you mean by NSClient? xDrip itself has a builtin NS client (Follower mode). Did you test it, already?

old-square-eyes · 2020-11-06T20:00:40Z

@tolot27 that's the point... I don't know :) Was asking @tzachi-dar what they were talking about. NSClient is a build of AAPS I use as a client for Nightscout to visualise icicles, OpenAPS IOB + predictions, and enter Careportal treatments. Ideally I'd just like one app but xDrip doesn't have nearly the feature set.

tolot27 · 2020-11-06T20:10:05Z

@tolot27 that's the point... I don't know :) Was asking @tzachi-dar what they were talking about. NSClient is a build of AAPS I use as a client for Nightscout to visualise icicles, OpenAPS IOB + predictions, and enter Careportal treatments. Ideally I'd just like one app but xDrip doesn't have nearly the feature set.

Why don't you use the Nightscout Follower Hardware Data source or configure Nightscout in the Sync settings if you use a different data source? You don't need a separate client for it, just xDrip+.

old-square-eyes · 2020-11-06T20:37:12Z

Nightscout Follower Hardware Data source

Because I use xDrip to collect from my G6, and all the other fore mentioned reasons (for having a separate NS client)... Icicles, OpenAPS IOB + predictions, and entering Careportal treatments. AAPS NSClient is superior for those. But if xDrip improved its OpenAPS visuals (such as I suspect is in this PR) I could probably drop AAPS NSClient.

I never said I use a different data source.

tolot27 · 2020-11-15T14:11:12Z

@tzachi-dar Please can you rebase this PR on master to get the conflicts resolved?

tolot27

General comment: Please use a consistant code format.

app/src/main/java/com/eveningoutpost/dexdrip/utils/LibreTrendUtil.java

app/src/main/java/com/eveningoutpost/dexdrip/Models/BgReading.java

tolot27 · 2020-11-15T14:25:47Z

app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BgGraphBuilder.java

@@ -375,7 +378,7 @@ private void extend_line(List<PointValue> points, float x, float y) {
                line.setSquare(true);
                line.setPointRadius(1);
                line.setReverseYAxis(true);
-                line.setBackgroundUnclipped(true);
+                line.setBackgroundUnclipped(true); // acording to google, we are it's only users. It caused problems on zoom.


according
Please can you raise/link an issue if xDrip is somehow affected?

tolot27 · 2020-11-15T14:28:25Z

app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/NightscoutStatus.java

+str1= {created_at:  "2019-04-27T21:44:22.550Z",
+openaps: {enacted : {timestamp: "2019-04-27T21:16:24.885Z", recieved: true}}}
+
+function toMoments (status) {


Is this comment part still needed?

tolot27 · 2020-11-15T14:28:39Z

app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/NightscoutStatus.java

+    }
+}
+
+// Looking for: lastLoopMoment


Is this comment part still needed?

tolot27 · 2020-11-15T14:31:21Z

app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/NightscoutTreatments.java

            }
        }
        return new_data;
    }
+    private static boolean HandleTempBassal(JSONObject tr) throws JSONException {
+        // Code here is trying to do what the nightscout code does for this kind of bassals.


bassals -> basals

Please turn this comment into a Java Docs function description.

tolot27 · 2020-11-15T14:33:40Z

app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/NightscoutUploader.java

-
+
+    // return value tells if new data was found
+    private boolean downloadTreatments(final NightscoutService nightscoutService, final String hashedSecret, String baseURI, URI uri) throws Exception{


downloadTreatments and downloadDeviceStatus share many identical code lines. Please refactor it to avoid these duplications.

tolot27 · 2020-11-15T14:37:31Z

app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/StatusLine.java

+                    //Log.e("xxxx", "basal ago " + basalAgo);
+                    if(basalAgo < 0) {
+                        // Basal stops if no basal was given.
+                        // Todo upload NS default basal profile.


Will you add something here?

tolot27 · 2020-11-15T14:39:18Z

app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollow.java

                }
            }
+


There is no reason to have two empty lines here.

tolot27 · 2020-11-15T14:42:03Z

app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/NightscoutStatus.java

+        return ret;
+    }
+
+    public static void test() {


Can you move this function to a unit test?

tolot27 · 2021-04-28T19:32:05Z

@tzachi-dar What is the state of this PR? Will you continue to clean it up or replace it by another PR?

tzachi-dar · 2021-04-28T20:33:31Z

Yes, I'll do more cleaning and send it in a few weeks. I want to finish with libre before it.

…

On Wed, 28 Apr 2021 at 22:32, Mathias Walter ***@***.***> wrote: @tzachi-dar <https://github.com/tzachi-dar> What is the state of this PR? Will you continue to clean it up or replace it by another PR? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#1303 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AB4TBZASARJNBAGFOZFYADTTLBPETANCNFSM4MHXES6Q> .

marciogranzotto · 2021-11-08T16:34:37Z

@tzachi-dar it's been a few months... I can take this PR and do the requested changes if you don't have the time right now.

tolot27 · 2022-01-06T23:45:34Z

@tzachi-dar @marciogranzotto How can we proceed on this PR?

rafaeldelrey · 2022-04-23T23:49:25Z

I would love to see such features on xDrip.

tzachi-dar and others added 20 commits April 10, 2020 15:55

Read the basal data from the treatments and store it to xDrip as part…

2a77d3e

… of the DB. Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

Take the downloadTreatments functions code to a function of it's own.

8908b52

Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

Download device status as well.

c652cd5

Still need to download it when working in nightscout follower mode. Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

Create the openaps device status.

f32020d

Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

Start showing openaps values to the screen.

b0ca510

Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

Send openaps data to followers.

41f46e9

Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

Read openaps status also when in NS follower mode.

34ba36a

Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

Verify that names exists before accessing them.

10627d9

Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

Fix a typo.

7219196

Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

Make sure not to work on duplicate data.

c5dd89e

(It ended by sending too much data to followers.) Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

Remove unneeded debug logs.

d4eb478

Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

Fix a typo.

06fc2f8

A minor status line refactor.

0710df3

Start plotting basal data to the screen.

1ba20fa

Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

Start displaying the basal data to the screen.

db8ded2

# Conflicts: # app/src/main/java/com/eveningoutpost/dexdrip/UtilityModels/BgGraphBuilder.java

Change HasGradientToTransparent to false.

0dbc8ce

Add adjutant basals with the same value to one.

59fa701

Fix a typo in merging of objects with same basal rate.

f26a0b5

Make the function treatmentDownloadEnabled public.

8653b51

Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

Minor code refactoring and organization.

3527219

Signed-off-by: Tzachi Dar <tzachi.dar@gmail.com>

This was referenced Oct 29, 2020

xdrip to display openaps data #868

Closed

Not getting Temp Basals as a Nightscout Follower #895

Closed

tolot27 requested a review from jamorham November 15, 2020 14:09

tolot27 changed the title ~~Tzachi opeanps data 3~~ Tzachi OpenAPS data 3 Nov 15, 2020

tolot27 requested changes Nov 15, 2020

View reviewed changes

tolot27 added enhancement insulin-basal sync-nightscout labels Nov 15, 2020

tzachi-dar mentioned this pull request Nov 28, 2020

Tzachi cleanup #1529

Merged

Navid200 mentioned this pull request Jun 12, 2021

The glucose readings aren't added in 5 minute intervals anymore #1537

Closed

tolot27 linked an issue Jan 6, 2022 that may be closed by this pull request

Not getting Temp Basals as a Nightscout Follower #895

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Tzachi OpenAPS data 3 #1303

Tzachi OpenAPS data 3 #1303

tzachi-dar commented Apr 14, 2020

tzachi-dar commented Apr 14, 2020

old-square-eyes commented Oct 29, 2020

old-square-eyes commented Oct 29, 2020

tolot27 commented Nov 6, 2020

old-square-eyes commented Nov 6, 2020 •

edited

Loading

tolot27 commented Nov 6, 2020

old-square-eyes commented Nov 6, 2020 •

edited

Loading

tolot27 commented Nov 15, 2020

tolot27 left a comment

tolot27 Nov 15, 2020

tolot27 Nov 15, 2020

tolot27 Nov 15, 2020

tolot27 Nov 15, 2020

tolot27 Nov 15, 2020

tolot27 Nov 15, 2020

tolot27 Nov 15, 2020

tolot27 Nov 15, 2020

tolot27 commented Apr 28, 2021

tzachi-dar commented Apr 28, 2021 via email

marciogranzotto commented Nov 8, 2021

tolot27 commented Jan 6, 2022

rafaeldelrey commented Apr 23, 2022



		// return value tells if new data was found
		private boolean downloadTreatments(final NightscoutService nightscoutService, final String hashedSecret, String baseURI, URI uri) throws Exception{

Tzachi OpenAPS data 3 #1303

Are you sure you want to change the base?

Tzachi OpenAPS data 3 #1303

Conversation

tzachi-dar commented Apr 14, 2020

tzachi-dar commented Apr 14, 2020

old-square-eyes commented Oct 29, 2020

old-square-eyes commented Oct 29, 2020

tolot27 commented Nov 6, 2020

old-square-eyes commented Nov 6, 2020 • edited Loading

tolot27 commented Nov 6, 2020

old-square-eyes commented Nov 6, 2020 • edited Loading

tolot27 commented Nov 15, 2020

tolot27 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tolot27 commented Apr 28, 2021

tzachi-dar commented Apr 28, 2021 via email

marciogranzotto commented Nov 8, 2021

tolot27 commented Jan 6, 2022

rafaeldelrey commented Apr 23, 2022

old-square-eyes commented Nov 6, 2020 •

edited

Loading

old-square-eyes commented Nov 6, 2020 •

edited

Loading