Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Wip/iob cob #589

Closed
wants to merge 157 commits into from
Closed

Wip/iob cob #589

wants to merge 157 commits into from

Commits on Sep 25, 2014

  1. intial IOB experiments

    Jason Calabrese committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    2801f07 View commit details
    Browse the repository at this point in the history

  2. Initial port of DIYPS IOB and insulin activity formulas

    @scottleibrand
    scottleibrand committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    36cac06 View commit details
    Browse the repository at this point in the history

  3. the most basic copy and paste profile api possible

    Jason Calabrese committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    b85690d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'wip/iob-cob' of github.com:nightscout/cgm-remote-monito… 

    …r into wip/iob-cob
    Jason Calabrese committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    00c20da View commit details
    Browse the repository at this point in the history

  5. removing @jasoncalabrese's copy

    @scottleibrand
    scottleibrand committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    35a21f8 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'wip/iob-cob' of github.com:nightscout/cgm-remote-monito… 

    …r into wip/iob-cob
    @scottleibrand
    scottleibrand committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    cdfe0e0 View commit details
    Browse the repository at this point in the history

  7. forgot to git add some profile api files

    Jason Calabrese committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    b040815 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'wip/iob-cob' of github.com:nightscout/cgm-remote-monito… 

    …r into wip/iob-cob
    Jason Calabrese committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    1762d57 View commit details
    Browse the repository at this point in the history

  9. no POSTs yet

    Jason Calabrese committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    98285a9 View commit details
    Browse the repository at this point in the history

  10. pull sensitivity and DIA from profiles collection via API

    @scottleibrand
    scottleibrand committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    c78aa0b View commit details
    Browse the repository at this point in the history

  11. Merge branch 'wip/iob-cob' of github.com:nightscout/cgm-remote-monito… 

    …r into wip/iob-cob
    @scottleibrand
    scottleibrand committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    4f3b702 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'master' into wip/iob-cob

    Jason Calabrese committed Sep 25, 2014
    Configuration menu
    Copy the full SHA
    d194aa6 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2014

  1. @danamlewis came up with some more intuitive labels

    @scottleibrand
    scottleibrand committed Sep 26, 2014
    Configuration menu
    Copy the full SHA
    0378ebe View commit details
    Browse the repository at this point in the history

  2. Added cob calculation

    @scottleibrand
    scottleibrand committed Sep 26, 2014
    Configuration menu
    Copy the full SHA
    e96b563 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2014

  1. include rawIsig and friends

    @scottleibrand
    scottleibrand committed Sep 27, 2014
    Configuration menu
    Copy the full SHA
    a96cd30 View commit details
    Browse the repository at this point in the history

  2. this writes rawBg to console, but doesn't display it

    @scottleibrand
    scottleibrand committed Sep 27, 2014
    Configuration menu
    Copy the full SHA
    9afd036 View commit details
    Browse the repository at this point in the history

  3. initial rawBg plot as white dot overlay

    @scottleibrand
    scottleibrand committed Sep 27, 2014
    Configuration menu
    Copy the full SHA
    97e8e79 View commit details
    Browse the repository at this point in the history

  4. fix updateBrushToNon typo, add error-checking in function rawIsigToRa… 

    …wBg, and make sgv plot over rawbg
    @scottleibrand
    scottleibrand committed Sep 27, 2014
    Configuration menu
    Copy the full SHA
    c937c5a View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2014

  1. don't run rawIsigToRawBg calcs on null values

    @scottleibrand
    scottleibrand committed Sep 29, 2014
    Configuration menu
    Copy the full SHA
    27510ac View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2014

  1. added BG predictions based on insulin and carb activity

    @scottleibrand
    scottleibrand committed Sep 30, 2014
    Configuration menu
    Copy the full SHA
    8bdfe67 View commit details
    Browse the repository at this point in the history

  2. fix isDecaying logic so carb impact works, and display total impact

    @scottleibrand
    scottleibrand committed Sep 30, 2014
    Configuration menu
    Copy the full SHA
    3116b78 View commit details
    Browse the repository at this point in the history

  3. working IOB and COB based BG predictions

    @scottleibrand
    scottleibrand committed Sep 30, 2014
    Configuration menu
    Copy the full SHA
    76729db View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2014

  1. Merge branch 'wip/iob-cob' of github.com:nightscout/cgm-remote-monito… 

    …r into wip/iob-cob
    Jason Calabrese committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    c693c00 View commit details
    Browse the repository at this point in the history

  2. nest profiles.list so loadData is only call once

    Jason Calabrese committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    c017405 View commit details
    Browse the repository at this point in the history

  3. pass time to retrospectively predict BGs

    @scottleibrand
    scottleibrand committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    f812cd0 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'wip/iob-cob' of github.com:nightscout/cgm-remote-monito… 

    …r into wip/iob-cob
    @scottleibrand
    scottleibrand committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    b7b4861 View commit details
    Browse the repository at this point in the history

  5. add separate line for Current Carb Impact

    @scottleibrand
    scottleibrand committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    2fb0e93 View commit details
    Browse the repository at this point in the history

  6. insulin impact should be negative

    @scottleibrand
    scottleibrand committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    a493a14 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'dev' into wip/iob-cob

    Jason Calabrese committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    519758e View commit details
    Browse the repository at this point in the history

  8. bgPrediction bugfixes, and switch to 1m ticks

    @scottleibrand
    scottleibrand committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    e601d24 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'wip/iob-cob' of github.com:nightscout/cgm-remote-monito… 

    …r into wip/iob-cob
    @scottleibrand
    scottleibrand committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    16b0471 View commit details
    Browse the repository at this point in the history

  10. predict 1h into the future, with 1m resolution

    @scottleibrand
    scottleibrand committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    8fb61b4 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'dev' into wip/iob-cob

    Jason Calabrese committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    1673c30 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2014

  1. added DIYPS S-curve predictions

    @scottleibrand
    scottleibrand committed Oct 2, 2014
    Configuration menu
    Copy the full SHA
    5197e45 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2014

  1. predict 2 hours ahead, and display 6h total

    @scottleibrand
    scottleibrand committed Oct 4, 2014
    Configuration menu
    Copy the full SHA
    b0dd5cd View commit details
    Browse the repository at this point in the history

  2. stop using rawbgs for predictions, and merge some stuff from predictA… 

    …RLookback into iob-cob / predictDIYPS
    @scottleibrand
    scottleibrand committed Oct 4, 2014
    Configuration menu
    Copy the full SHA
    a61805f View commit details
    Browse the repository at this point in the history

  3. display predict_hr of retrospective predictions instead of just 30m

    @scottleibrand
    scottleibrand committed Oct 4, 2014
    Configuration menu
    Copy the full SHA
    c8f3a5f View commit details
    Browse the repository at this point in the history

  4. replace sCurve with 30m of predictAR predictions

    @scottleibrand
    scottleibrand committed Oct 4, 2014
    Configuration menu
    Copy the full SHA
    fd4ca62 View commit details
    Browse the repository at this point in the history

  5. predict 4h and display 3h of predictions

    @scottleibrand
    scottleibrand committed Oct 4, 2014
    Configuration menu
    Copy the full SHA
    5ad13ce View commit details
    Browse the repository at this point in the history

  6. average impact of predBg and predAR, don't sum them

    @scottleibrand
    scottleibrand committed Oct 4, 2014
    Configuration menu
    Copy the full SHA
    4aa5b80 View commit details
    Browse the repository at this point in the history

  7. workaround to AR to support 1-minute resolution

    @scottleibrand
    scottleibrand committed Oct 4, 2014
    Configuration menu
    Copy the full SHA
    66402c5 View commit details
    Browse the repository at this point in the history

  8. Revert "workaround to AR to support 1-minute resolution" 

    The workaround didn't really work, and introduced all kinds of issues. Going back to 5m resolution for now.

This reverts commit 66402c5.
    @scottleibrand
    scottleibrand committed Oct 4, 2014
    Configuration menu
    Copy the full SHA
    69a9dca View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2014

  1. retrospective prediction: show with blue line where the 1h-prior pred… 

    …iction was (or would've been, if it'd been made knowing about all subsequent boluses and carbs)
    @scottleibrand
    scottleibrand committed Oct 6, 2014
    Configuration menu
    Copy the full SHA
    dd3e57e View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2014

  1. display carb ratios

    @scottleibrand
    scottleibrand committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    c34079b View commit details
    Browse the repository at this point in the history

  2. fix predictDIYPS to actually use predictAR

    @scottleibrand
    scottleibrand committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    d553285 View commit details
    Browse the repository at this point in the history

  3. show 4 days' data instead of 2

    @scottleibrand
    scottleibrand committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    1840fa6 View commit details
    Browse the repository at this point in the history

  4. use last 200 treatments for retroPrediction

    @scottleibrand
    scottleibrand committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    e799e0d View commit details
    Browse the repository at this point in the history

  5. start predictAR from most recent datapoint, not lookback-ago

    @scottleibrand
    scottleibrand committed Oct 8, 2014
    Configuration menu
    Copy the full SHA
    475b190 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2014

  1. use treatment.created_at not treatment.date to calculate COB

    @scottleibrand
    scottleibrand committed Oct 9, 2014
    Configuration menu
    Copy the full SHA
    08ea19e View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2014

  1. display IOB/COB, and make blue/white dots smaller

    @scottleibrand
    scottleibrand committed Oct 16, 2014
    Configuration menu
    Copy the full SHA
    27dd234 View commit details
    Browse the repository at this point in the history

  2. show IOB/COB properly for retrospective brushing too

    @scottleibrand
    scottleibrand committed Oct 16, 2014
    Configuration menu
    Copy the full SHA
    de3f751 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2014

  1. calculate Total Carbs Absorbed in last 8h

    @scottleibrand
    scottleibrand committed Oct 22, 2014
    Configuration menu
    Copy the full SHA
    12ef6de View commit details
    Browse the repository at this point in the history

  2. Display BG Impact, and better blend predBG and predAR results

    @scottleibrand
    scottleibrand committed Oct 22, 2014
    Configuration menu
    Copy the full SHA
    8fc5a36 View commit details
    Browse the repository at this point in the history

  3. attempt to prevent pebble to only read SGV values 

    Try to avoid reporting null for pebble by only considering SGV
records.

Many thanks to @ELUTE for raising flags on this.
    @bewest @scottleibrand
    bewest authored and scottleibrand committed Oct 22, 2014
    Configuration menu
    Copy the full SHA
    3788ce5 View commit details
    Browse the repository at this point in the history

  4. fix mmol panning to show mmol 

    Fixes a bug where panning would show "HIGH".
    @bewest @scottleibrand
    bewest authored and scottleibrand committed Oct 22, 2014
    Configuration menu
    Copy the full SHA
    fda9316 View commit details
    Browse the repository at this point in the history

  5. cherry-pick of give mbg's an outline to make them more distinct 

    Conflicts:
	static/js/client.js
    @scottleibrand
    Jason Calabrese authored and scottleibrand committed Oct 22, 2014
    Configuration menu
    Copy the full SHA
    636b5ea View commit details
    Browse the repository at this point in the history

  6. Added option to choose preferred date format (12 or 24 hours) 

    Conflicts:
	static/js/ui-utils.js
    @SidorovichAntonGodel @scottleibrand
    SidorovichAntonGodel authored and scottleibrand committed Oct 22, 2014
    Configuration menu
    Copy the full SHA
    0fe504a View commit details
    Browse the repository at this point in the history

  7. Merge branch 'dev' into wip/iob-cob 

    Conflicts:
	static/js/client.js
	static/js/ui-utils.js
    @scottleibrand
    scottleibrand committed Oct 22, 2014
    Configuration menu
    Copy the full SHA
    5207217 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2014

  1. make carb absorption a function of hepatic insulin activity

    @scottleibrand
    scottleibrand committed Oct 30, 2014
    Configuration menu
    Copy the full SHA
    551c07c View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2014

  1. s/tCOB/cCalc/g

    @scottleibrand
    scottleibrand committed Oct 31, 2014
    Configuration menu
    Copy the full SHA
    23123c7 View commit details
    Browse the repository at this point in the history

  2. make retroLookback UI-configurable

    @scottleibrand
    scottleibrand committed Oct 31, 2014
    Configuration menu
    Copy the full SHA
    3c9225f View commit details
    Browse the repository at this point in the history

  3. merged dev into iob-cob, fixed minor conflicts in server.js

    Jason Calabrese committed Oct 31, 2014
    Configuration menu
    Copy the full SHA
    28f6eb9 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dev' into wip/iob-cob

    Jason Calabrese committed Oct 31, 2014
    Configuration menu
    Copy the full SHA
    635bf65 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2014

  1. fix new insulin-dependent carb decay algorithm to use avgActivity ins… 

    …tead of iobChange
    @scottleibrand
    scottleibrand committed Nov 1, 2014
    Configuration menu
    Copy the full SHA
    05c7412 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'wip/iob-cob' of github.com:nightscout/cgm-remote-monito… 

    …r into wip/iob-cob
    @scottleibrand
    scottleibrand committed Nov 1, 2014
    Configuration menu
    Copy the full SHA
    d5af5bb View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2014

  1. Rough outline of DIYPS functions with refactored carb algorithms

    @scottleibrand
    scottleibrand committed Nov 2, 2014
    Configuration menu
    Copy the full SHA
    b1698d3 View commit details
    Browse the repository at this point in the history

  2. Rough outline of DIYPS functions with refactored carb algorithms

    @scottleibrand
    scottleibrand committed Nov 2, 2014
    Configuration menu
    Copy the full SHA
    7fd93e8 View commit details
    Browse the repository at this point in the history

  3. merged dev into wip/iob-cob; adds true websocket support and fixes fo… 

    …r 24hour time x axis
    Jason Calabrese committed Nov 2, 2014
    Configuration menu
    Copy the full SHA
    e91e0bc View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2014

  1. Merge latest nightscout:dev into wip/iob-cob

    @scottleibrand
    scottleibrand committed Nov 3, 2014
    Configuration menu
    Copy the full SHA
    f0f2161 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'wip/iob-cob' of https://github.com/nightscout/cgm-remot… 

    …e-monitor into nightscout-wip/iob-cob

Conflicts:
	static/js/client.js
    @scottleibrand
    scottleibrand committed Nov 3, 2014
    Configuration menu
    Copy the full SHA
    8e61145 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'nightscout-wip/iob-cob' into wip/iob-cob

    @scottleibrand
    scottleibrand committed Nov 3, 2014
    Configuration menu
    Copy the full SHA
    9239a58 View commit details
    Browse the repository at this point in the history

  4. process calData, and filtered/unfiltered/rssi fields in cgmData

    @scottleibrand
    scottleibrand committed Nov 3, 2014
    Configuration menu
    Copy the full SHA
    cb410e9 View commit details
    Browse the repository at this point in the history

  5. define and actually use calData

    @scottleibrand
    scottleibrand committed Nov 3, 2014
    Configuration menu
    Copy the full SHA
    0a62682 View commit details
    Browse the repository at this point in the history

  6. put cal records at the end of the patientData array, and don't check … 

    …them in is_different
    @scottleibrand
    scottleibrand committed Nov 3, 2014
    Configuration menu
    Copy the full SHA
    959cdd1 View commit details
    Browse the repository at this point in the history

  7. typofix

    @scottleibrand
    scottleibrand committed Nov 3, 2014
    Configuration menu
    Copy the full SHA
    f29e178 View commit details
    Browse the repository at this point in the history

  8. use Cookie cal records for rawBg

    @scottleibrand
    scottleibrand committed Nov 3, 2014
    Configuration menu
    Copy the full SHA
    5d361bb View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2014

  1. Merge pull request #217 from scottleibrand/wip/iob-cob 

    Display rawBGs based on cookie uploader calibration records
    @jasoncalabrese
    jasoncalabrese committed Nov 4, 2014
    Configuration menu
    Copy the full SHA
    93e8b31 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2014

  1. fix cal/rawBg bug

    @scottleibrand
    scottleibrand committed Nov 7, 2014
    Configuration menu
    Copy the full SHA
    d3905a1 View commit details
    Browse the repository at this point in the history

  2. fix cal/rawBg bugs, and scale by sgv/filtered ratio when available

    @scottleibrand
    scottleibrand committed Nov 7, 2014
    Configuration menu
    Copy the full SHA
    08bf696 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #230 from scottleibrand/wip/iob-cob 

    fix cal/rawBg bugs, and scale by sgv/filtered ratio when available
    @scottleibrand
    scottleibrand committed Nov 7, 2014
    Configuration menu
    Copy the full SHA
    7a77dcc View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2014

  1. display 5m SGV delta between SGV and arrow

    @scottleibrand
    scottleibrand committed Nov 12, 2014
    Configuration menu
    Copy the full SHA
    268acf2 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2014

  1. Merge pull request #249 from scottleibrand/wip/iob-cob 

    display 5m SGV delta between SGV and arrow
    @jasoncalabrese
    jasoncalabrese committed Nov 13, 2014
    Configuration menu
    Copy the full SHA
    a65298a View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2014

  1. make paths relative

    @scottleibrand
    scottleibrand committed Nov 14, 2014
    Configuration menu
    Copy the full SHA
    7bd2247 View commit details
    Browse the repository at this point in the history

  2. Merge wip/add-ssl (and everything it inherited from dev) into wip/iob… 

    …-cob
    @scottleibrand
    scottleibrand committed Nov 14, 2014
    Configuration menu
    Copy the full SHA
    f643459 View commit details
    Browse the repository at this point in the history

  3. Revert "make paths relative" 

    This reverts commit 7bd2247.
    @scottleibrand
    scottleibrand committed Nov 14, 2014
    Configuration menu
    Copy the full SHA
    305ce99 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'wip/add-ssl' of https://github.com/nightscout/cgm-remot… 

    …e-monitor into nightscout-wip/add-ssl

Conflicts:
	env.js
	static/js/client.js
    @scottleibrand
    scottleibrand committed Nov 14, 2014
    Configuration menu
    Copy the full SHA
    638103c View commit details
    Browse the repository at this point in the history

  5. Merge branch 'nightscout-wip/add-ssl' into wip/iob-cob

    @scottleibrand
    scottleibrand committed Nov 14, 2014
    Configuration menu
    Copy the full SHA
    f035952 View commit details
    Browse the repository at this point in the history

  6. disable websockets for now, causing more trouble then it's worth

    @scottleibrand
    scottleibrand committed Nov 14, 2014
    Configuration menu
    Copy the full SHA
    0b0b487 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into wip/iob-cob

    @scottleibrand
    scottleibrand committed Nov 14, 2014
    Configuration menu
    Copy the full SHA
    968c910 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #257 from nightscout/master 

    Merge master into wip/iob-cob
    @scottleibrand
    scottleibrand committed Nov 14, 2014
    Configuration menu
    Copy the full SHA
    efdc979 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2014

  1. disable retroPredictions while brushing

    @scottleibrand
    scottleibrand committed Nov 16, 2014
    Configuration menu
    Copy the full SHA
    8f36829 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'wip/iob-cob' into nightscout/wip/iob-cob 

    Conflicts:
	lib/websocket.js
    @scottleibrand
    scottleibrand committed Nov 16, 2014
    Configuration menu
    Copy the full SHA
    83d2c9d View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2014

  1. don't error if no calibration data

    @bewest
    bewest committed Nov 17, 2014
    Configuration menu
    Copy the full SHA
    3f865aa View commit details
    Browse the repository at this point in the history

  2. place customTitle before Nightscout for visibility on narrow tabs

    @scottleibrand
    scottleibrand committed Nov 17, 2014
    Configuration menu
    Copy the full SHA
    52f50f6 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2014

  1. Update iob-cob.html title to put Nightscout at the end

    @scottleibrand
    scottleibrand committed Nov 28, 2014
    Configuration menu
    Copy the full SHA
    eb58fe3 View commit details
    Browse the repository at this point in the history

  2. just display unadjusted white rawBg dots when sgv < 30 (error), and c… 

    …onsole-log it for debugging
    @scottleibrand
    scottleibrand committed Nov 28, 2014
    Configuration menu
    Copy the full SHA
    bf8cab1 View commit details
    Browse the repository at this point in the history

  3. first attempt to merge nightscout dev (including bgDelta stuff)

    @scottleibrand
    scottleibrand committed Nov 28, 2014
    Configuration menu
    Copy the full SHA
    e299ea6 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2014

  1. fix duplicate currentDelta merge error

    @scottleibrand
    scottleibrand committed Nov 29, 2014
    Configuration menu
    Copy the full SHA
    1f560ed View commit details
    Browse the repository at this point in the history

  2. add wip/iob-cob setup notes to README

    @scottleibrand
    scottleibrand committed Nov 29, 2014
    Configuration menu
    Copy the full SHA
    f75d95a View commit details
    Browse the repository at this point in the history

  3. math fix for averaging predBgDelta and predARDelta

    @scottleibrand
    scottleibrand committed Nov 29, 2014
    Configuration menu
    Copy the full SHA
    149e085 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2014

  1. Merge branch 'dev' into wip/iob-cob

    Jason Calabrese committed Nov 30, 2014
    Configuration menu
    Copy the full SHA
    03d979f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' into wip/iob-cob

    Jason Calabrese committed Nov 30, 2014
    Configuration menu
    Copy the full SHA
    51cdd94 View commit details
    Browse the repository at this point in the history

  3. moved BG impact to delta line

    Jason Calabrese committed Nov 30, 2014
    Configuration menu
    Copy the full SHA
    a687a67 View commit details
    Browse the repository at this point in the history

  4. return IOB to the pebble endpoint

    Jason Calabrese committed Nov 30, 2014
    Configuration menu
    Copy the full SHA
    9bba76b View commit details
    Browse the repository at this point in the history

  5. Merge branch 'dev' into wip/iob-cob

    Jason Calabrese committed Nov 30, 2014
    Configuration menu
    Copy the full SHA
    c3e7b47 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'dev' of github.com:nightscout/cgm-remote-monitor into w… 

    …ip/iob-cob
    Jason Calabrese committed Nov 30, 2014
    Configuration menu
    Copy the full SHA
    70d9528 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'dev' of github.com:nightscout/cgm-remote-monitor into w… 

    …ip/iob-pebble
    Jason Calabrese committed Nov 30, 2014
    Configuration menu
    Copy the full SHA
    90f3343 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'wip/iob-cob' of github.com:nightscout/cgm-remote-monito… 

    …r into wip/iob-cob
    Jason Calabrese committed Nov 30, 2014
    Configuration menu
    Copy the full SHA
    b9a0599 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2014

  1. added units back for the delta; removed the delta symbol

    Jason Calabrese committed Dec 1, 2014
    Configuration menu
    Copy the full SHA
    de9a611 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'wip/iob-cob' into wip/iob-pebble

    Jason Calabrese committed Dec 1, 2014
    Configuration menu
    Copy the full SHA
    3fb60c4 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #285 from jasoncalabrese/wip/iob-cob 

    Moved moved BG impact to delta line
    @jasoncalabrese
    jasoncalabrese committed Dec 1, 2014
    Configuration menu
    Copy the full SHA
    db5b9b9 View commit details
    Browse the repository at this point in the history

  4. a little clean up

    Jason Calabrese committed Dec 1, 2014
    Configuration menu
    Copy the full SHA
    2a0446d View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2014

  1. Merge branch 'dev' into wip/iob-cob

    Jason Calabrese committed Dec 2, 2014
    Configuration menu
    Copy the full SHA
    ba775fa View commit details
    Browse the repository at this point in the history

  2. get rid all the treatment slicing since we only return current data now

    Jason Calabrese committed Dec 2, 2014
    Configuration menu
    Copy the full SHA
    59d5ac3 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'wip/iob-cob' of github.com:nightscout/cgm-remote-monito… 

    …r into wip/iob-pebble
    Jason Calabrese committed Dec 2, 2014
    Configuration menu
    Copy the full SHA
    bb7c171 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #288 from jasoncalabrese/wip/iob-pebble 

    LGTM
    @scottleibrand
    scottleibrand committed Dec 2, 2014
    Configuration menu
    Copy the full SHA
    edb6a0c View commit details
    Browse the repository at this point in the history

  5. treatments.find now want an opts to set the number date range

    Jason Calabrese committed Dec 2, 2014
    Configuration menu
    Copy the full SHA
    79550f2 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2014

  1. quick fix for profile reader to ignore non-DIA documents (such as for… 

    … time-of-day basal rates)
    @scottleibrand
    scottleibrand committed Dec 14, 2014
    Configuration menu
    Copy the full SHA
    ab42e4f View commit details
    Browse the repository at this point in the history

  2. fix for mmol delta string

    Jason Calabrese committed Dec 14, 2014
    Configuration menu
    Copy the full SHA
    a065303 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #298 from jasoncalabrese/wip/iob-cob-mmolfix 

    Fix for mmol delta string in wip/iob-cob branch
    @jasoncalabrese
    jasoncalabrese committed Dec 14, 2014
    Configuration menu
    Copy the full SHA
    6de2726 View commit details
    Browse the repository at this point in the history

  4. only return the most recent treatment data via websockets; added opts… 

    … to treatments.list()
    @scottleibrand
    Jason Calabrese authored and scottleibrand committed Dec 14, 2014
    Configuration menu
    Copy the full SHA
    19bc40e View commit details
    Browse the repository at this point in the history

  5. don't try to add strings

    @scottleibrand
    scottleibrand committed Dec 14, 2014
    Configuration menu
    Copy the full SHA
    6e4b5cf View commit details
    Browse the repository at this point in the history

  6. Merge branch 'nightscout-dev' into wip/iob-cob

    @scottleibrand
    scottleibrand committed Dec 14, 2014
    Configuration menu
    Copy the full SHA
    8de8fba View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2014

  1. Merge branch 'dev' into wip/iob-cob

    Jason Calabrese committed Dec 16, 2014
    Configuration menu
    Copy the full SHA
    dcd8505 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2014

  1. Merge branch 'dev' into wip/iob-cob

    Jason Calabrese committed Dec 20, 2014
    Configuration menu
    Copy the full SHA
    a1ae249 View commit details
    Browse the repository at this point in the history

  2. css adjustments so IOB/COB displays whenin short-landscape mode

    Jason Calabrese committed Dec 20, 2014
    Configuration menu
    Copy the full SHA
    26d13e3 View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2014

  1. fixed filter so that we still get raw durring ???, fixes #295

    Jason Calabrese committed Dec 27, 2014
    Configuration menu
    Copy the full SHA
    4f031fd View commit details
    Browse the repository at this point in the history

  2. drop liverCarbImpactMax from 1 to .7

    @scottleibrand
    scottleibrand committed Dec 27, 2014
    Configuration menu
    Copy the full SHA
    43b4fe4 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'nightscout-dev' into wip/iob-cob

    @scottleibrand
    scottleibrand committed Dec 27, 2014
    Configuration menu
    Copy the full SHA
    6c475c9 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'nightscout-wip/iob-cob' into wip/iob-cob

    @scottleibrand
    scottleibrand committed Dec 27, 2014
    Configuration menu
    Copy the full SHA
    d9d6da8 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2014

  1. error checking for missing sgv data. use rawbg data if nothing else i… 

    …s visible.
    @scottleibrand
    scottleibrand committed Dec 28, 2014
    Configuration menu
    Copy the full SHA
    9079b1f View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2015

  1. merged dev into wip/iob-cob and corrected tons of conflicts

    Jason Calabrese committed Jan 7, 2015
    Configuration menu
    Copy the full SHA
    f1f999a View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2015

  1. merged dev into iob-cob and fixed minor conflict

    Jason Calabrese committed Jan 8, 2015
    Configuration menu
    Copy the full SHA
    ce0ce9b View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2015

  1. Merge branch 'dev' into wip/iob-cob

    Jason Calabrese committed Jan 11, 2015
    Configuration menu
    Copy the full SHA
    280caeb View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2015

  1. Merge branch 'nightscout-wip/iob-cob' into wip/iob-cob

    @scottleibrand
    scottleibrand committed Jan 12, 2015
    Configuration menu
    Copy the full SHA
    be9bb37 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2015

  1. Merge branch 'master' into wip/iob-cob

    Jason Calabrese committed Jan 14, 2015
    Configuration menu
    Copy the full SHA
    f75c15b View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2015

  1. merged dev into wip/iob-cob and fix some minor conflicts

    Jason Calabrese committed Jan 22, 2015
    Configuration menu
    Copy the full SHA
    66db6be View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2015

  1. Merge branch 'dev' into wip/iob-cob

    Jason Calabrese committed Jan 24, 2015
    Configuration menu
    Copy the full SHA
    f0f793d View commit details
    Browse the repository at this point in the history

  2. merge dev into iob-cob, fixed conflict with focusCircles

    Jason Calabrese committed Jan 24, 2015
    Configuration menu
    Copy the full SHA
    61007f2 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #314 from scottleibrand/wip/iob-cob 

    Add error checking for missing sgv data.
    @jasoncalabrese
    jasoncalabrese committed Jan 24, 2015
    Configuration menu
    Copy the full SHA
    23c808e View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2015

  1. Merge branch 'master' into wip/iob-cob

    Jason Calabrese committed Jan 28, 2015
    Configuration menu
    Copy the full SHA
    cde5da0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' into wip/iob-cob

    Jason Calabrese committed Jan 28, 2015
    Configuration menu
    Copy the full SHA
    fdffde3 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2015

  1. merged dev into iob-cob and fixed tons of conflicts

    @jasoncalabrese
    jasoncalabrese committed Feb 8, 2015
    Configuration menu
    Copy the full SHA
    1cd0c5d View commit details
    Browse the repository at this point in the history

  2. merged raw-checks into iob-cob and adjusted defaults so rawbg is auto… 

    … enabled for iob-cob
    @jasoncalabrese
    jasoncalabrese committed Feb 8, 2015
    Configuration menu
    Copy the full SHA
    0f3120c View commit details
    Browse the repository at this point in the history

  3. merged phablet-limits into iob-cob, fixed conflicts and improved iob-… 

    …cob display on narrow displays
    @jasoncalabrese
    jasoncalabrese committed Feb 8, 2015
    Configuration menu
    Copy the full SHA
    f809142 View commit details
    Browse the repository at this point in the history

  4. fixed bugs with the pebble endpoint after the merge, also removed non… 

    …-raw test since it doesn't apply to this branch
    @jasoncalabrese
    jasoncalabrese committed Feb 8, 2015
    Configuration menu
    Copy the full SHA
    f83fc2f View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2015

  1. fixed call to rawIsigToRawBg from bgPredictions when sgv is below dex… 

    …com limit
    @jasoncalabrese
    jasoncalabrese committed Feb 9, 2015
    Configuration menu
    Copy the full SHA
    b9a22df View commit details
    Browse the repository at this point in the history

  2. fixed IOB-COB display on the short/narrow screen of the iOS app on a … 

    …iPhone 5
    @jasoncalabrese
    jasoncalabrese committed Feb 9, 2015
    Configuration menu
    Copy the full SHA
    19fd818 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2015

  1. merged dev into iob-cob; fixed conflict and some mmol rounding bugs

    @jasoncalabrese
    jasoncalabrese committed Feb 10, 2015
    Configuration menu
    Copy the full SHA
    e7f2f2a View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2015

  1. merged dev into iob-cob-raw-update and fixed more conflict

    @jasoncalabrese
    jasoncalabrese committed Feb 12, 2015
    Configuration menu
    Copy the full SHA
    e874912 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2015

  1. Merge branch 'master' of https://github.com/nightscout/cgm-remote-mon… 

    …itor into wip/iob-cob-raw-update
    @jasoncalabrese
    jasoncalabrese committed Feb 14, 2015
    Configuration menu
    Copy the full SHA
    1139ba1 View commit details
    Browse the repository at this point in the history

  2. merge in master and fixed conflicts

    @jasoncalabrese
    jasoncalabrese committed Feb 14, 2015
    Configuration menu
    Copy the full SHA
    813cb63 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2015

  1. Merge pull request #399 from jasoncalabrese/wip/iob-cob-raw-update 

    Update IOB-COB with raw updates and other changes from dev
    @jasoncalabrese
    jasoncalabrese committed Feb 18, 2015
    Configuration menu
    Copy the full SHA
    37d74a9 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2015

  1. allow arbitrary DIAs in profile

    @mgranberry
    mgranberry committed Feb 25, 2015
    Configuration menu
    Copy the full SHA
    7f75ac6 View commit details
    Browse the repository at this point in the history

  2. align IOB calculations

    @mgranberry
    mgranberry committed Feb 25, 2015
    Configuration menu
    Copy the full SHA
    e25c6ab View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2015

  1. Merge branch 'dev' into wip/iob-cob

    @jasoncalabrese
    jasoncalabrese committed Feb 26, 2015
    Configuration menu
    Copy the full SHA
    ddfef10 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #436 from mgranberry/wip/iob-cob 

    allow arbitrary DIAs in profile
    @jasoncalabrese
    jasoncalabrese committed Feb 26, 2015
    Configuration menu
    Copy the full SHA
    141f00a View commit details
    Browse the repository at this point in the history