PR for dev to master in prep for 0.5.0 release #424

Conflicts: lib/determine-basal/cob-autosens.js lib/profile/index.js

Conflicts: lib/determine-basal/determine-basal.js lib/profile/index.js

…ratio_null

… use that" This reverts commit 687edb8.

… use that" This reverts commit 35d506e.

Conflicts: bin/oref0-pump-loop.sh

* comment * remove unused code from autotune debugging (3c34aa0) * #447: if rewind_resets_autosens, use BG data since lastSiteChange * only do padding in autosens mode, not COB calc mode * don't do lastSiteChange stuff for oref0-meal * Add explanation of preferences var * Explanatory comments for preferences items

Conflicts: lib/determine-basal/cob-autosens.js lib/profile/index.js

* adjust target BG if needed to safely bring down high BG faster without causing lows * start at 85 for safety, which implies 100->130 * don't use adjustedTargetBG if it's above target_bg * add adjust_targets_when_high preference (default true) * fix variable name * fix variable name * formula fix * adjust min_bg and max_bg too * consolidate output onto single lines * consolidate output onto single lines * debugging * debugging * debugging * Change name of preference value to adv_target_adjustments * test 80 for minimum adjustedTargetBG * only lower adjustedTarget to 80 when BG >~ 160, not >~140 * default adv_target_adjustments: false * don't do redundant JSON parsing (#442) * syntax * wait on glucose data that is newer than last action (#438) * wait on glucose data that is newer than last action * revert move of timestamp updating outside of oref0-pump-loop * un-revert the change that actually checks pump_loop_completed * break if monitor/pump_loop_completed doesn't yet exist * consider pump_loop_completed even if no bolus needed * print basal and sens when unchanged * differentiate autosens adjustments from adjust_targets_when_high ones * log when not Adjusting targets for high BG * whitespace * Reset autosens on site change (#451) * comment * remove unused code from autotune debugging (3c34aa0) * #447: if rewind_resets_autosens, use BG data since lastSiteChange * only do padding in autosens mode, not COB calc mode * don't do lastSiteChange stuff for oref0-meal * Add explanation of preferences var * Explanatory comments for preferences items * fix logic to do cgm-loop stuff for g4-upload, not g4-local (#449)

Conflicts: lib/determine-basal/determine-basal.js lib/profile/index.js

…seInsulinReq this will allow it to stop zero temping sooner when it's not longer really needed.

* if carb_ratio is null buy we have a valid carb_ratios object, use that * if carb_ratio is null buy we have a valid carb_ratios object, use that * if profile.json contains null carb_ratio use profile.pump.json * Revert "if carb_ratio is null buy we have a valid carb_ratios object, use that" This reverts commit 687edb8. * Revert "if carb_ratio is null buy we have a valid carb_ratios object, use that" This reverts commit 35d506e. * check for carb_ratio==null if oref0-autotune-core fails

* workaround for hanging rig-pump communication (with WW pump) and improve logging, more robust killing of reset.py if it hangs * fix scotts review remarks * fix python closing " * improve log statement for US pump users * also create cgm-loop for G4-upload

…ed COB+UAM mode

…if lower

this was accidently broken since sed was removed, see d13cee4#diff-704a2fd9a43fd79bf52037b1668c146dL586

* only do UAMpredBGs within DIA hours of a bolus * enable bolus snooze if we don't have COB * enableUAM after bolus or eating soon; enableSMB for COB too * don't SMB when minPredBG is already below max_bg * syntax * print out IOB/COB/UAM predBG in reason field * only calculate minDeviationSlope from maxDeviation to now * only calculate minDeviationSlope from maxDeviation to now * remove extra comma in reason field * change back to 1h of data (45m of deviations) fo UAM * use minAvgDelta for calculating predicted CI from UAM * only display IOB/COB/UAM predBG when used * only display each predBG if used * only consider carbs from last DIA hours as a workaround for undead carbs * predUCI debugging on * let's try decaying predicted CI from UAM at minDeviationSlope/2 * spacing for pebble * use the higher of minCOBPredBG or minUAMPredBG as minPredBG * debugging * spacing for pebble * debugging * debugging * define minPredBG outside the if clause * clean up old comments and whitespace * ignore future temps and reduce predBG oscillation * UAMduration off by 5m * Project UAM impact out to DIA hours Now that we're excluding future temps from predBGs, they're not as much "up and to the right" when we have a long zero temp running. So it should be safter to extend UAM impact out up to DIA hours when we're at peak recent deviations. As soon as deviations start to come down that'll limit the UAM impact predictions. * undefined-check basalprofile_data[0] * don't cancel low temps unless unneeded for naive_eventualBG too * only enact after refresh_old_pumphistory in non-SMB mode * debugging * return maxDeviation * return maxDeviation * run autosens every 90m if edison-battery < 60% * run autosens every 90m if edison-battery < 60% * wait up to 5 minutes for new BG if rig battery low * wait up to 5 minutes for new BG if rig battery low * syntax * syntax * inline * to -n or not to -n * run low_battery_wait on regular pump-loop too * run low_battery_wait on regular pump-loop too * simplify break-out logic * set mtime of glucose.json to time of most recent glucose value * don't SMB for a trace of bolusiob due to a microbolus delivered when basal was higher * run battery mode any time Edison isn't charged/charging * if no monitor/temp_basal.json file, break * check if monitor/edison-battery.json exists * clarity * don't print filename with ls * copy-pasta * to -n or not to -n * 60-70% inclusive = charging * allow high-temps 5mg/dL lower: at 70 instead of 75 when target is 100 * set Carb Impact high enough to absorb all meal carbs over 4 hours * syntax * formula was right originally; commented * only killall if stuff really gets stuck * wait longer for silence before giving up * don't print filename with ls * if we can't keep pumphistory refreshed, defer to other rigs * if we can't keep pumphistory refreshed, defer to other rigs * if we can't keep pumphistory refreshed, defer to other rigs * wait longer for silence before giving up * adjust the target ISF to be a weighted average of fullNewISF and pumpISF * cap adjustedISF before applying 10% * allow SMBs every 3 minutes * don't use a minPredBG that's higher than any maxPredBG * debugging * fix formulas * round meal_carbimpact * meal_carbimpact * 2 since it linearly decays to zero * use 6 hours for now, until we fix the TODO * instead of profile.min_5m_carbimpact, assume all carbs absorb over 4h * allow SMBs every 3 minutes * totalCI can't be negative * fix formulas * generate COBpredBGs if remainingCI > 0; don't let ci be negative * debugging * stop adding remainingCI after 4h * if UAM is enabled, use the higher of minCOBPredBG or minUAMPredBG * need to allow negative CI to get good downward predictions * truncate all BG predictions at 3 hours * don't allow negative durations * don't allow negative ci to mess up predCI * don't use long_avgdelta for minDelta, to respond more quickly to upticks * if naive_eventualBG < 40, set a 30m zero temp * only use maxUAMPredBG if enableUAM; otherwise it's current bg We don't need maxCOBPredBG here, because that is always >= minCOBPredBG, which we just used * don't let maxUAMPredBG prevent high-temping for carbs * cap remainingCarbs at 90g * include 0m-ago data points in now * chmod +x ./bin/*.py * Allow wider BG target adjustment for autosens * fix minPredBG logic for high-temping based on minIOBPredBG * set minPredBG etc. regardless of ci * re-add reset_spi_serial.py until oref0_init_pump_comms.py is fixed * kill pump-loop after 5 minutes of not writing to pump-loop.log * exclude the last 1/3 of carbs from remainingCarbs * skip SMB stuff if No bolus needed (yet) * syntax * don't return false (it forces a retry) * squelch stdout from enact/smb-suggested.json * debugging * newlines etc. * newlines etc. * wait on glucose data that is newer than last action * spacing * truncate all BG predictions at 3.5 hours * only use data from the same device as the most recent BG data point * set "charging" voltage at 58-68% * only wait 4 minutes for new BG (pump-loop takes at least 1 minute) * only wait 3 minutes for new BG (pump-loop takes at least 1 minute) * require enableUAM: true in preferences.json to enable UAM * go back to using minDeviationSlope to decay UAM CI * adjust target BG if needed to safely bring down high BG faster without causing lows * start at 85 for safety, which implies 100->130 * don't use adjustedTargetBG if it's above target_bg * add adjust_targets_when_high preference (default true) * fix variable name * revert move of timestamp updating outside of oref0-pump-loop * fix variable name * fix variable name * formula fix * formula fix * adjust min_bg and max_bg too * adjust min_bg and max_bg too * consolidate output onto single lines * consolidate output onto single lines * consolidate output onto single lines * consolidate output onto single lines * debugging * debugging * debugging * debugging * syntax * debugging * debugging * debugging * test 80 for minimum adjustedTargetBG * debugging * debugging * debugging * debugging * debugging * debugging * debugging * debugging * wait 90m before setting minIOBPredBG and 60m before setting COB and UAM * disable SMB/UAM except after a manual bolus for now * only lower adjustedTarget to 80 when BG >~ 160, not >~140 * add preferences.json settings for enableSMB with bolus, COB, or temp targets * revert autosens target range to 93-117 (for 100) * Change name of preference value to adv_target_adjustments * test 80 for minimum adjustedTargetBG * only lower adjustedTarget to 80 when BG >~ 160, not >~140 * default adv_target_adjustments: false * Call maxCOB var * create maxCOB and defaults to 120 create maxCOB and defaults to 120 because that's the most a typical body can absorb over 4 hours. (If someone enters more carbs or stacks more; OpenAPS will just truncate dosing based on 120. Essentially, this just limits AMA as a safety cap against weird COB calculations) * comment * un-revert the change that actually checks pump_loop_completed * break if monitor/pump_loop_completed doesn't yet exist * narrow the ranges for charged/charging * consider pump_loop_completed even if no bolus needed * wait 4 minutes for new BG now that we're doing it right * always wait_for_bg regardless of battery level * echo truthfully * syntax * comment out minutes_running code now that we're not incorporating future temps into eventualBG * try also waiting for upto30s after radio reset before mmtuning * whitespace * grammar * disable SMB when a high temptarget is set * if both minUAMPredBG or minCOBPredBG are set, average them for now * weighed average minUAMPredBG and minCOBPredBG based on how many carbs remain as COB * wait for longer silence the weaker mmtune RSSI is * grammar * rounding and debugging * grammar * calculate minCOBPredBG if remainingCI > 0 * make sure minIOBPredBG is at least 40 * average the minIOBPredBG and minUAMPredBG for minPredBG * we don't need to ignore low minPredBGs any more * print basal and sens when unchanged * include minPredBG in rT object * update to smb_enact_temp based on pump_loop_completed * add minPredBG to rT object * syntax * simplify and linearize rssi_wait * comment * remove unused code from autotune debugging (3c34aa0) * #447: if rewind_resets_autosens, use BG data since lastSiteChange * only do padding in autosens mode, not COB calc mode * cap all minPredBGs at 39 to avoid biasing averages * differentiate autosens adjustments from adjust_targets_when_high ones * allow temp rate within 0.025U/hr for decocare floating point math * profile.adjust_targets_when_high renamed to adv_target_adjustments * log when not Adjusting targets for high BG * whitespace * without COB, use max of minIOBPredBG,minUAMPredBG * if carb_ratio is null buy we have a valid carb_ratios object, use that * move carb_ratio null check to oref0-autotune-prep.js * variable name * if carb_ratio is null buy we have a valid carb_ratios object, use that * if carb_ratio is null buy we have a valid carb_ratios object, use that * if profile.json contains null carb_ratio use profile.pump.json * Revert "if carb_ratio is null buy we have a valid carb_ratios object, use that" This reverts commit 687edb8. * Revert "if carb_ratio is null buy we have a valid carb_ratios object, use that" This reverts commit 35d506e. * check for carb_ratio==null if oref0-autotune-core fails * don't do lastSiteChange stuff for oref0-meal * wait for a full 30s silence before mmtuning * grammar * wait for a full 30s silence before mmtuning * adv_target_adjustments comment * allow setting of adjustmentFraction via preferences.json * add remainingCarbsCap to preferences.json, defaulting to zero * always run mocha in color mode * don't set snoozeBG if minPredBG >= 400 * fix some tests; disable others * use average of naive_eventualBG and minIOBPredBG to calculate worstCaseInsulinReq this will allow it to stop zero temping sooner when it's not longer really needed. * only mmtune 20% of the time now that we're waiting longer * increase default min_5m_carbimpact to help avoid overestimating COB * Update oref0-setup.sh (#454) floating-carbs updated to allow comparison between NS and drip data and not update if values haven't changed.

because the ~/.bash_profile takes preferences above ~/.profile, the cli commands with Nightscout didn't have access to the NIGHTSCOUT_HOST and API_SECRET environment variables. This was caused by #402 use ~/.bash_profile instead of ~/.profile to make

* use the higher of minCOBPredBG or minUAMPredBG as minPredBG * debugging * spacing for pebble * debugging * debugging * define minPredBG outside the if clause * clean up old comments and whitespace * ignore future temps and reduce predBG oscillation * UAMduration off by 5m * Project UAM impact out to DIA hours Now that we're excluding future temps from predBGs, they're not as much "up and to the right" when we have a long zero temp running. So it should be safter to extend UAM impact out up to DIA hours when we're at peak recent deviations. As soon as deviations start to come down that'll limit the UAM impact predictions. * undefined-check basalprofile_data[0] * don't cancel low temps unless unneeded for naive_eventualBG too * only enact after refresh_old_pumphistory in non-SMB mode * debugging * return maxDeviation * return maxDeviation * run autosens every 90m if edison-battery < 60% * run autosens every 90m if edison-battery < 60% * wait up to 5 minutes for new BG if rig battery low * wait up to 5 minutes for new BG if rig battery low * syntax * syntax * inline * to -n or not to -n * run low_battery_wait on regular pump-loop too * run low_battery_wait on regular pump-loop too * simplify break-out logic * set mtime of glucose.json to time of most recent glucose value * don't SMB for a trace of bolusiob due to a microbolus delivered when basal was higher * run battery mode any time Edison isn't charged/charging * if no monitor/temp_basal.json file, break * check if monitor/edison-battery.json exists * clarity * don't print filename with ls * copy-pasta * to -n or not to -n * 60-70% inclusive = charging * allow high-temps 5mg/dL lower: at 70 instead of 75 when target is 100 * set Carb Impact high enough to absorb all meal carbs over 4 hours * syntax * formula was right originally; commented * only killall if stuff really gets stuck * wait longer for silence before giving up * don't print filename with ls * if we can't keep pumphistory refreshed, defer to other rigs * if we can't keep pumphistory refreshed, defer to other rigs * if we can't keep pumphistory refreshed, defer to other rigs * wait longer for silence before giving up * adjust the target ISF to be a weighted average of fullNewISF and pumpISF * cap adjustedISF before applying 10% * allow SMBs every 3 minutes * don't use a minPredBG that's higher than any maxPredBG * debugging * fix formulas * round meal_carbimpact * meal_carbimpact * 2 since it linearly decays to zero * use 6 hours for now, until we fix the TODO * instead of profile.min_5m_carbimpact, assume all carbs absorb over 4h * allow SMBs every 3 minutes * totalCI can't be negative * fix formulas * generate COBpredBGs if remainingCI > 0; don't let ci be negative * debugging * stop adding remainingCI after 4h * if UAM is enabled, use the higher of minCOBPredBG or minUAMPredBG * need to allow negative CI to get good downward predictions * truncate all BG predictions at 3 hours * don't allow negative durations * don't allow negative ci to mess up predCI * don't use long_avgdelta for minDelta, to respond more quickly to upticks * if naive_eventualBG < 40, set a 30m zero temp * only use maxUAMPredBG if enableUAM; otherwise it's current bg We don't need maxCOBPredBG here, because that is always >= minCOBPredBG, which we just used * don't let maxUAMPredBG prevent high-temping for carbs * cap remainingCarbs at 90g * include 0m-ago data points in now * chmod +x ./bin/*.py * Allow wider BG target adjustment for autosens * fix minPredBG logic for high-temping based on minIOBPredBG * set minPredBG etc. regardless of ci * re-add reset_spi_serial.py until oref0_init_pump_comms.py is fixed * kill pump-loop after 5 minutes of not writing to pump-loop.log * exclude the last 1/3 of carbs from remainingCarbs * skip SMB stuff if No bolus needed (yet) * syntax * don't return false (it forces a retry) * squelch stdout from enact/smb-suggested.json * debugging * newlines etc. * newlines etc. * wait on glucose data that is newer than last action * spacing * truncate all BG predictions at 3.5 hours * only use data from the same device as the most recent BG data point * set "charging" voltage at 58-68% * only wait 4 minutes for new BG (pump-loop takes at least 1 minute) * only wait 3 minutes for new BG (pump-loop takes at least 1 minute) * require enableUAM: true in preferences.json to enable UAM * go back to using minDeviationSlope to decay UAM CI * adjust target BG if needed to safely bring down high BG faster without causing lows * start at 85 for safety, which implies 100->130 * don't use adjustedTargetBG if it's above target_bg * add adjust_targets_when_high preference (default true) * fix variable name * revert move of timestamp updating outside of oref0-pump-loop * fix variable name * fix variable name * formula fix * formula fix * adjust min_bg and max_bg too * adjust min_bg and max_bg too * consolidate output onto single lines * consolidate output onto single lines * consolidate output onto single lines * consolidate output onto single lines * debugging * debugging * debugging * debugging * syntax * debugging * debugging * debugging * test 80 for minimum adjustedTargetBG * debugging * debugging * debugging * debugging * debugging * debugging * debugging * debugging * wait 90m before setting minIOBPredBG and 60m before setting COB and UAM * disable SMB/UAM except after a manual bolus for now * only lower adjustedTarget to 80 when BG >~ 160, not >~140 * add preferences.json settings for enableSMB with bolus, COB, or temp targets * revert autosens target range to 93-117 (for 100) * Change name of preference value to adv_target_adjustments * test 80 for minimum adjustedTargetBG * only lower adjustedTarget to 80 when BG >~ 160, not >~140 * default adv_target_adjustments: false * Call maxCOB var * create maxCOB and defaults to 120 create maxCOB and defaults to 120 because that's the most a typical body can absorb over 4 hours. (If someone enters more carbs or stacks more; OpenAPS will just truncate dosing based on 120. Essentially, this just limits AMA as a safety cap against weird COB calculations) * comment * un-revert the change that actually checks pump_loop_completed * break if monitor/pump_loop_completed doesn't yet exist * narrow the ranges for charged/charging * consider pump_loop_completed even if no bolus needed * wait 4 minutes for new BG now that we're doing it right * always wait_for_bg regardless of battery level * echo truthfully * syntax * comment out minutes_running code now that we're not incorporating future temps into eventualBG * try also waiting for upto30s after radio reset before mmtuning * whitespace * grammar * disable SMB when a high temptarget is set * if both minUAMPredBG or minCOBPredBG are set, average them for now * weighed average minUAMPredBG and minCOBPredBG based on how many carbs remain as COB * wait for longer silence the weaker mmtune RSSI is * grammar * rounding and debugging * grammar * calculate minCOBPredBG if remainingCI > 0 * make sure minIOBPredBG is at least 40 * average the minIOBPredBG and minUAMPredBG for minPredBG * we don't need to ignore low minPredBGs any more * print basal and sens when unchanged * include minPredBG in rT object * update to smb_enact_temp based on pump_loop_completed * add minPredBG to rT object * syntax * simplify and linearize rssi_wait * comment * remove unused code from autotune debugging (3c34aa0) * #447: if rewind_resets_autosens, use BG data since lastSiteChange * only do padding in autosens mode, not COB calc mode * cap all minPredBGs at 39 to avoid biasing averages * differentiate autosens adjustments from adjust_targets_when_high ones * allow temp rate within 0.025U/hr for decocare floating point math * profile.adjust_targets_when_high renamed to adv_target_adjustments * log when not Adjusting targets for high BG * whitespace * without COB, use max of minIOBPredBG,minUAMPredBG * if carb_ratio is null buy we have a valid carb_ratios object, use that * move carb_ratio null check to oref0-autotune-prep.js * variable name * if carb_ratio is null buy we have a valid carb_ratios object, use that * if carb_ratio is null buy we have a valid carb_ratios object, use that * if profile.json contains null carb_ratio use profile.pump.json * Revert "if carb_ratio is null buy we have a valid carb_ratios object, use that" This reverts commit 687edb8. * Revert "if carb_ratio is null buy we have a valid carb_ratios object, use that" This reverts commit 35d506e. * check for carb_ratio==null if oref0-autotune-core fails * don't do lastSiteChange stuff for oref0-meal * wait for a full 30s silence before mmtuning * grammar * wait for a full 30s silence before mmtuning * adv_target_adjustments comment * allow setting of adjustmentFraction via preferences.json * add remainingCarbsCap to preferences.json, defaulting to zero * always run mocha in color mode * don't set snoozeBG if minPredBG >= 400 * fix some tests; disable others * use average of naive_eventualBG and minIOBPredBG to calculate worstCaseInsulinReq this will allow it to stop zero temping sooner when it's not longer really needed. * only mmtune 20% of the time now that we're waiting longer * set zero temps long enough to eventually correct back up to target * grammar * increase default min_5m_carbimpact to help avoid overestimating COB * increase default min_5m_carbimpact to help avoid overestimating COB * grammar * support 515/715 for SMB as well * support 515/715 for SMB as well * use lower of minUAMPredBG or avgPredBG instead of avgMinPredBG in mixed COB+UAM mode * add minPredBG to reason field * grammar * use higher of minIOBPredBG, minUAMPredBG * if we have COB, use max(minCOBPredBG,blendedMinPredBG), or avgPredBG if lower * grammar * grammar * grammar * ordering * define IOBpredBG to make tests happier * default IOBpredBG to eventualBG for tests * comment out overly prescriptive text regex checks

Conflicts: lib/basal-set-temp.js lib/determine-basal/determine-basal.js lib/meal/total.js

* oref0-set-system-clock for smb_enact_temp too * move "incorrectly" check to smb_verify_suggested above deliverAt check * that's smb-suggested.json

* Adding aliases for other common commands * Update index.js * Update index.js * changed to nano from vi * loop removed from two log aliases

….130.117.68)

…ixes

drop --enable-experimental upgrade bluez from 5.44 to 5.45. Changes: Fix issue with agent support in Bluetooth client tool. Fix issue with handling re-connection policy. Fix issue with handling unknown ATT commands. Fix issue with handling GATT Service Includes property. Fix issue with handling PullAll for OBEX transfers. Fix issue with handling delay in AVDTP Suspend responses. Fix issue with handling decoding of management frames. Add support for frame counters in Bluetooth monitor tool.

…or higher)

… zero temp

…target_bg, don't set a zero temp

fixes: - change ns-temptargets and ns-meal-carbs to use ns device (part of #299 ) - upgrade bluez from 5.44 to 5.45 and drop the experimental flags (see if it works) - make it possible to enter access token in oref0-setup.sh - test the nightscout instance access at setup time and fail if it doesn't work - test the needed security permissions needed with nightscout, fail if permissions are not ok This will: - make it possible to use per rig authentication to nightscout - use v2 nightscout authentication

* if configured for MDT CGM, openaps get-bg * syntax * syntax * syntax

… a last resort

…ixes

…705_fixes

…upload

* stop adding remainingCI after 4h * if UAM is enabled, use the higher of minCOBPredBG or minUAMPredBG * need to allow negative CI to get good downward predictions * truncate all BG predictions at 3 hours * don't allow negative durations * don't allow negative ci to mess up predCI * don't use long_avgdelta for minDelta, to respond more quickly to upticks * if naive_eventualBG < 40, set a 30m zero temp * only use maxUAMPredBG if enableUAM; otherwise it's current bg We don't need maxCOBPredBG here, because that is always >= minCOBPredBG, which we just used * don't let maxUAMPredBG prevent high-temping for carbs * cap remainingCarbs at 90g * include 0m-ago data points in now * chmod +x ./bin/*.py * Allow wider BG target adjustment for autosens * fix minPredBG logic for high-temping based on minIOBPredBG * set minPredBG etc. regardless of ci * re-add reset_spi_serial.py until oref0_init_pump_comms.py is fixed * kill pump-loop after 5 minutes of not writing to pump-loop.log * exclude the last 1/3 of carbs from remainingCarbs * skip SMB stuff if No bolus needed (yet) * syntax * don't return false (it forces a retry) * squelch stdout from enact/smb-suggested.json * debugging * newlines etc. * newlines etc. * wait on glucose data that is newer than last action * spacing * truncate all BG predictions at 3.5 hours * only use data from the same device as the most recent BG data point * set "charging" voltage at 58-68% * only wait 4 minutes for new BG (pump-loop takes at least 1 minute) * only wait 3 minutes for new BG (pump-loop takes at least 1 minute) * require enableUAM: true in preferences.json to enable UAM * go back to using minDeviationSlope to decay UAM CI * adjust target BG if needed to safely bring down high BG faster without causing lows * start at 85 for safety, which implies 100->130 * don't use adjustedTargetBG if it's above target_bg * add adjust_targets_when_high preference (default true) * fix variable name * revert move of timestamp updating outside of oref0-pump-loop * fix variable name * fix variable name * formula fix * formula fix * adjust min_bg and max_bg too * adjust min_bg and max_bg too * consolidate output onto single lines * consolidate output onto single lines * consolidate output onto single lines * consolidate output onto single lines * debugging * debugging * debugging * debugging * syntax * debugging * debugging * debugging * test 80 for minimum adjustedTargetBG * debugging * debugging * debugging * debugging * debugging * debugging * debugging * debugging * wait 90m before setting minIOBPredBG and 60m before setting COB and UAM * disable SMB/UAM except after a manual bolus for now * only lower adjustedTarget to 80 when BG >~ 160, not >~140 * add preferences.json settings for enableSMB with bolus, COB, or temp targets * revert autosens target range to 93-117 (for 100) * Change name of preference value to adv_target_adjustments * test 80 for minimum adjustedTargetBG * only lower adjustedTarget to 80 when BG >~ 160, not >~140 * default adv_target_adjustments: false * Call maxCOB var * create maxCOB and defaults to 120 create maxCOB and defaults to 120 because that's the most a typical body can absorb over 4 hours. (If someone enters more carbs or stacks more; OpenAPS will just truncate dosing based on 120. Essentially, this just limits AMA as a safety cap against weird COB calculations) * comment * un-revert the change that actually checks pump_loop_completed * break if monitor/pump_loop_completed doesn't yet exist * narrow the ranges for charged/charging * consider pump_loop_completed even if no bolus needed * wait 4 minutes for new BG now that we're doing it right * always wait_for_bg regardless of battery level * echo truthfully * syntax * comment out minutes_running code now that we're not incorporating future temps into eventualBG * try also waiting for upto30s after radio reset before mmtuning * whitespace * grammar * disable SMB when a high temptarget is set * if both minUAMPredBG or minCOBPredBG are set, average them for now * weighed average minUAMPredBG and minCOBPredBG based on how many carbs remain as COB * wait for longer silence the weaker mmtune RSSI is * grammar * rounding and debugging * grammar * calculate minCOBPredBG if remainingCI > 0 * make sure minIOBPredBG is at least 40 * average the minIOBPredBG and minUAMPredBG for minPredBG * we don't need to ignore low minPredBGs any more * print basal and sens when unchanged * include minPredBG in rT object * update to smb_enact_temp based on pump_loop_completed * add minPredBG to rT object * syntax * simplify and linearize rssi_wait * comment * remove unused code from autotune debugging (3c34aa0) * #447: if rewind_resets_autosens, use BG data since lastSiteChange * only do padding in autosens mode, not COB calc mode * cap all minPredBGs at 39 to avoid biasing averages * differentiate autosens adjustments from adjust_targets_when_high ones * allow temp rate within 0.025U/hr for decocare floating point math * profile.adjust_targets_when_high renamed to adv_target_adjustments * log when not Adjusting targets for high BG * whitespace * without COB, use max of minIOBPredBG,minUAMPredBG * if carb_ratio is null buy we have a valid carb_ratios object, use that * move carb_ratio null check to oref0-autotune-prep.js * variable name * if carb_ratio is null buy we have a valid carb_ratios object, use that * if carb_ratio is null buy we have a valid carb_ratios object, use that * if profile.json contains null carb_ratio use profile.pump.json * Revert "if carb_ratio is null buy we have a valid carb_ratios object, use that" This reverts commit 687edb8. * Revert "if carb_ratio is null buy we have a valid carb_ratios object, use that" This reverts commit 35d506e. * check for carb_ratio==null if oref0-autotune-core fails * don't do lastSiteChange stuff for oref0-meal * wait for a full 30s silence before mmtuning * grammar * wait for a full 30s silence before mmtuning * adv_target_adjustments comment * allow setting of adjustmentFraction via preferences.json * add remainingCarbsCap to preferences.json, defaulting to zero * always run mocha in color mode * don't set snoozeBG if minPredBG >= 400 * fix some tests; disable others * use average of naive_eventualBG and minIOBPredBG to calculate worstCaseInsulinReq this will allow it to stop zero temping sooner when it's not longer really needed. * only mmtune 20% of the time now that we're waiting longer * set zero temps long enough to eventually correct back up to target * grammar * increase default min_5m_carbimpact to help avoid overestimating COB * increase default min_5m_carbimpact to help avoid overestimating COB * grammar * support 515/715 for SMB as well * support 515/715 for SMB as well * use lower of minUAMPredBG or avgPredBG instead of avgMinPredBG in mixed COB+UAM mode * add minPredBG to reason field * grammar * use higher of minIOBPredBG, minUAMPredBG * if we have COB, use max(minCOBPredBG,blendedMinPredBG), or avgPredBG if lower * grammar * grammar * grammar * ordering * define IOBpredBG to make tests happier * default IOBpredBG to eventualBG for tests * comment out overly prescriptive text regex checks * calcualte and display carbsReq * debug and fix carbsReq calculation * grammar * grammar * grammar * use only naive_eventualBG to avoid overreacting to downticks * grammar * grammar * add maxBolus to reason when it's active * populate rT.carbsReq too * script to send pushover alerts for carbsReq/insulinReq (w/ maxBolus) * usage * syntax * exit * syntax, and output when no action required * add oref0-pushover * don't use old suggested.json files * debugging * debugging * print date for logs * add pushover to oref0-setup * cd $directory * carbsReq for low glucose suspend mode * don't display Eventual BG 68 >= 80 in SMB mode * fix maxBolus check * compare maxBolus to microBolus, not insulinReq * move add'l carbs req up before first return * remove second now-duplicate carbsReq stanza * clarify action = temp, not SMB * round maxBolus * only recommend carbsReq if really needed * add hostname to message * enact long temps even if a > 20m one is running * don't mmtune if Pump suspended * logic is hard * only pushover for microBolus >= maxBolus * actually set durationReq m zero temp. * re-check pump status if suspended * don't set 0-minute temps (cancels) * a zero temp request gets misinterpreted as 1270m - don't allow that * oref0-set-system-clock for smb_enact_temp too * move "incorrectly" check to smb_verify_suggested above deliverAt check * that's smb-suggested.json * update tests to allow >30m temps * disconnect any previous connection attempts before connecting * disable networking restart dhclient kill to see if that's more stable * deal with icanhazip.com proxy format (172.19.131.138, 10.36.65.138,12.130.117.68) * don't print minCOBPredBG or minUAMPredBG if they're 999 * only microbolus if 0.1U SMB represents 20m or less of basal (0.3U/hr or higher) * enable bolus snooze when COB will eventually get BG above target * if no microBolus required, and lastCOBpredBG > target_bg, don't set a zero temp * if no microBolus required, snoozeBG > target_bg, and lastCOBpredBG > target_bg, don't set a zero temp * print wlan0 SSID properly * renew wlan0 IP if wifi is connected w/o an IP * don't print SSID when checking it * comment * allow high temps or SMBs when bg < threshold if IOB is highly negative * if pump clock is more than 1m off, attempt to reset it * don't renew wlan0 if it has no SSID * sleep 120 after releasing wifi IP * update tests * newline * install jq with SMB to fix #469 * capture stderr too * regex update; if we still can't get online, try cycling networking as a last resort

…ixes

* only skip low glucose suspend if IOB > - 20m worth of basal and BG is rising faster than predicted * syntax * grammar space * fix 20m of IOB calculation * don't low glucose suspend if IOB is already super negative and BG is rising faster than predicted * print IOB * only print LGS-bypass stuff if bg < threshold

…ixes

…oref0-find-ti cleanup files that are not necessary. oref0-find-ti is not needed because oref0_subg_ww_radio_parameters.py reads the parameters from pump.ini

(must be replaced with check only script)

…ort for token authentication

source: http://stefaanlippens.net/bashrc_and_others/

restore "Copy tuned profile produced by autotune to profile.json for use with next day of data"

Summary: Formatting and colors for readability. AMA, autosens, and autotune are now out of advanced features Advanced features sub-menu now holds Pushover setup prompts, and a reminder to manually enable oref1 features if you want them. maxIOB will now be set here, with a note about recommending 0 or 1 hour of basal to newbies; it defaults to zero if not set. * only skip low glucose suspend if IOB > - 20m worth of basal and BG is rising faster than predicted * syntax * grammar space * fix 20m of IOB calculation * don't low glucose suspend if IOB is already super negative and BG is rising faster than predicted * print IOB * only print LGS-bypass stuff if bg < threshold * remove oref0-mint-max-iob * #475: if max_iob is unspecified, allow up to 1h worth of extra basal as IOB * Setup script (#481) * Fix low glucose suspend (#476) * only skip low glucose suspend if IOB > - 20m worth of basal and BG is rising faster than predicted * syntax * grammar space * fix 20m of IOB calculation * don't low glucose suspend if IOB is already super negative and BG is rising faster than predicted * print IOB * only print LGS-bypass stuff if bg < threshold * Setup script adding pushover prompt questions Saving pushover flags in runagain script hidden microbolus enable prompt (for future use) adding bt question * typo fix * Update determine-basal.js * Update determine-basal.js * Moving AMA, autosens, autotune and hiding advanced feature menu Moving AMA autosens and autotune out of advanced features. Hiding advanced features Q until we're ready to prompt for SMB. * Adding max_IOB prompt to oref0-setup.sh * Update oref0-setup.sh * Fix spacing at end * De-bugging attempt2 * Debugging attempt3 * Debugging attempt4 * Fix invalid arithmetic operator eror * Errant fi removal * Add echocolor to make echo's blue, plus format longer text prompts * Formatting improvements and typo catches * Reordering for visibility and readability * Readability improvements * Even more formatting tweaks * Fixing formatting * Final formatting change * Broken thing fixed * Fix attempt2 * Missing " * Add if fi clause to maxiob * Improve if clause around max_iob * More formatting tweaks * Moving Pushover to advanced features menu & tweaking language * Add confirmation statements to some of the y/N's * Adding negative confirmations * Negative for advanced features * Fix if/fi * Fixing * Spacing for end * Make continue prompt more clear * Clarify advanced features are in docs * Spacing * Final spacing * Remove auto maxiob (because maxIOB will default to zero per setup script if not specified) * Final tweaks * Fix auto to zero * Re-adding a -n * Formatting * Fixing things again * Add a space * No, the real fix this time * clean up whitespace and other minor stuff (#488)

* only skip low glucose suspend if IOB > - 20m worth of basal and BG is rising faster than predicted * syntax * grammar space * fix 20m of IOB calculation * don't low glucose suspend if IOB is already super negative and BG is rising faster than predicted * print IOB * only print LGS-bypass stuff if bg < threshold * make remainingCarbsFraction a preference * restore "Copy tuned profile produced by autotune to profile.json for use with next day of data" (#485) Per suggestion for dev branch from tynbendad. * remove erroneous +'s

- remove loop in main() and smb_main(). keeping the loop running is a responsibility of cron. This makes it possible to stop the pump loop with `/etc/init.d/cron stop` and will not let `killall` kill oref0-pump-loops. - write in the logs when a pump loop is aborted (because of an error of one of the commands) - descreased maybe_mmtune. . a limit of 26214 will mmtune in ~ 44% time which seems too much (don't understand why)

* Update mdt-cgm.json Changes to make nightscout/glucose.json happen during format of MDT cgm data. * Update oref0-pump-loop.sh Changes to touch -d "$(date -R -d @$(jq .[0].date/1000 monitor/glucose.json))" monitor/glucose.json to get rid of jq: error: null and number cannot be divided date: invalid date ‘@’ error * Update oref0-pump-loop.sh * make setglucosetimestamp a function, and go back to using grep "MDT cgm" openaps.ini

@scottleibrand

as discussed with @scottleibrand . Fixed a bug: "if we can successfully talk to the pump and find that it's suspended, that does not indicate a pump comms issue that would justify mmtune, but rather just means the user suspended their pump. There's no point in running mmtune at that point: better to just wait for the user to resume the pump."

…ixes

…xists

…e if they still exist

…t_bg (#490)

…ixes

…rn user that microbolus-related features will be disabled.

…atting fixes)

Adding a check for existing autotune folder. If it does not exist, warn user that microbolus-related features will be disabled.

…ixes

you can test it with ``` for i in `seq 0 100` do echo LINE $i [[ $((RANDOM%100)) > 85 ]] && echo YES $i done ``` and `grep -c` the `YES`es. It turned out orginal code mmtune in 80% (100-20%) from the cases

* comment out debug statements * include minutesAboveMinBG worth of zero temps in calculating carbsReq * print minutesAboveMinBG in reason field * nothing to do here, as carbsReq is already added outside the if() * minutesAboveMinBG can come from either COBpredBG or IOBpredBG * always include at least 30m worth of zero temp (carbs to 80, low temp up to target) * add zeroTempDuration to debug output

* fix mraa on dev. temporary stick to v1.7.0 release of mraa * mraa fix for dev

this PR is needed to test eclipse/mraa#771 with OpenAPS

…ixes

scott asked to temporary not include the removal of the `until` loop in the oref1 pump loop. this fixes problems for ww pumps users (mostly tested with single rig), but might have influence on multi rig users. I will create a seperate PR for this later, because (possibly) endless loops in a pump loop can cause strange effects (e.g. pump loops that get killed by killall, and therefore messing up the rig-pump communication)

* unsuspend pump automatically if temp basal duration is zero * Add unsuspend_if_no_temp: false to preferences * only unsuspend if unsuspend_if_no_temp set to true in preferences * refresh status.json before checking it * syntax

…509) * check pump clock after pumphistory to alleviate #477 race condition * check pump clock right before time check to alleviate #477 race condition * syntax * Revert "check pump clock after pumphistory to alleviate #477 race condition" This reverts commit 344b2eb.

…o PieterGit-201705_fixes

* Clarifying SMB manual enable, NS URL example * Default AMA always on and adding safety gate check for oref1 * fix a bunch of safety gate syntax/logic * oref0-setup only enables SMB, not UAM * Add some spacing

* per #419, ignore bolus wizard carb entries without a bolus * skip bolus wizard carb entries without a corresponding bolus * update test to reflect #512 behavior

* merge_pumphistory and use pumphistory-merged.json for COB calculations in meal.json * consider carbs from up to 6 hours ago in calculating COB * newline

* raise default min_5m_carbimpact from 5 to 8 to help with reappearing carbs * change remainingCarbs defaults to 90g and 100% * change comment about default value * display only selected default settings by default * enable rewind_resets_autosens and adv_target_adjustments by default

* Update oref0-pump-loop.sh add the get CGM data from MDT into pump-loop.sh * Update some status messages and add some comments

* Fix color and spacing around token auth in setup script * change token auth default from Y to N for now, and whitespace

* find last BG from before a meal, and interpolate any gaps * log autosens ratio in pump-loop.log; better rounding * consistent y/[N] prompts

@Bender1061

* mmtune 25% of the time; remove unless() loop * per @Bender1061 suggestion, retry preflight model check * change 'retrying' language since we don't; remove upto10s sleep * space * move unsuspend_if_no_temp stuff into Retrying SMB checks

Fix Echo errors for MDT

…#521)

* whitespace * revert #512 for NS uploads (only)

…#530)

* no newline after Continue prompt * create echocolor-n function for echo -n behavior

* switch non-SMB users over to oref0-pump-loop * run refresh_old_pumphistory after refresh_old_pumphistory_24h * use pumphistory-merged.json for ns-meal-carbs * remove debugging line * remove debugging line * wait for seconds of silence on Old pumphistory-24h * no need to print out enact/smb-suggested.json

* move unsuspend_if_no_temp somewhere it can actually be executed * move unsuspend_if_no_temp somewhere it can actually be executed * typo * move unsuspend_if_no_temp somewhere it can actually be executed * if smb_verify_enacted, check if suspended

Conflicts: bin/oref0-setup.sh package.json

PR for dev to master in prep for 0.5.0 release #424

PR for dev to master in prep for 0.5.0 release #424

Commits on Apr 27, 2017

Commits on Apr 28, 2017

Commits on Apr 29, 2017

Commits on Apr 30, 2017

Commits on May 1, 2017

Commits on May 2, 2017

Commits on May 3, 2017

Commits on May 4, 2017

Commits on May 5, 2017

Commits on May 6, 2017

Commits on May 7, 2017

Commits on May 8, 2017

Commits on May 9, 2017

Commits on May 12, 2017

Commits on May 13, 2017

Commits on May 14, 2017

Commits on May 15, 2017

Commits on May 16, 2017

Commits on May 17, 2017

Commits on May 18, 2017

Commits on May 19, 2017

Commits on May 20, 2017

Commits on May 21, 2017

Commits on May 23, 2017

Commits on May 24, 2017

Commits on May 31, 2017

Commits on Jun 1, 2017

Commits on Jun 2, 2017

Commits on Jun 3, 2017

Commits on Jun 5, 2017

Commits on Jun 7, 2017

Commits on Jun 9, 2017

Commits on Jun 10, 2017

Commits on Jun 18, 2017

Commits on Jun 20, 2017

Commits on Jun 24, 2017

Commits on Jun 25, 2017

Commits on Jun 26, 2017

Commits on Jun 28, 2017

Commits on Jun 29, 2017

Commits on Jul 1, 2017

Commits on Jul 2, 2017

Commits on Jul 3, 2017

Commits on Jul 4, 2017

Commits on Jul 5, 2017

Commits on Jul 6, 2017

Commits on Jul 9, 2017

Commits on Jul 11, 2017

Commits on Jul 12, 2017

Commits on Jul 14, 2017