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.

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

Merge dev branch into main #10

Open
wants to merge 63 commits into
base: main
Choose a base branch
from
Open

Merge dev branch into main #10

wants to merge 63 commits into from

Conversation

JeremyStorring
Copy link
Contributor

No description provided.

jeremy-storring and others added 30 commits February 28, 2024 09:10
This reverts commit 912ab07.

Reverting this commit to allow oref0 algorithm to run in iAPS.

Conflicting changes in lib/profile/carbs.js were kept:

orenaps/oref0:
if (carbRatio < 0.1 || carbRatio > 250) {

oref2:
if (carbRatio < 3 || carbRatio > 150) {
-Include running nxp webpack
-Use relative paths, assuming oref0 and iAPS are cloned to the same parent directory
-write oref0 branch and git ref to file
-copy oref0/lib/ to iAPS root

Commit webpack.config.js, remove from .gitignore
Revert "Tzachi shared node phase2 (#1370)"
Address review comments from Robert
fix from Deniz
Bug fix for profile overrides not canceling SMBs
use systemTime
use currentHour in enableSMS
has already been added to tddReason way before
…target

half_basal_exercise_target: 160 // when temptarget is 160 mg/dL
    - echo "copying /lib/ source files to Open-iAPS/open-iaps-oref"
    - append last 30 commits to oref0_source_version.txt
    - copy source files to open-iaps-oref directory
    - add informational .txt about open-iaps-oref source files when copying files
    - update comments with the correct filename (webpack-cp.sh)
webpack-cp.sh: Set apsDIR=../Open-iAPS, fix path for source files
Use correct value (160) in comment for half_basal_exercise_target
@bjornoleh
Copy link
Contributor

current-oref is up to date now:
nightscout/Trio@239f381

avouspierre and others added 29 commits April 6, 2024 16:29
Fix error in populate mealInputs with a carb including actualDate
This partially reverts "Updated oref2 files based on findings in minimised files in iAPS v3.0.3", commit 05a1a2e.

The "actualDate" changes are not relevat to the starting point of the Open-iAPS fork, based on iAPS v2.3.3
Revert "actualDate" changes to lib/meal/history.js
Add plugin to copy files and rename correctly for oiaps
- minor symbol changes
- addition of missing Oxford comma
Add scripts to rename files output and create bundle directory
Webpack update to use with copy-rename-webpack-plugin in #15
Also changes defaults to 0.8 for Logarithmic and 0.5 for Sigmoid
rename smbIsAlwaysOff to smbIsScheduledOff
Separate Adjustment Factors for Logarithmic and Sigmoid
Correct pop up text for 'tddAdjBasal' from 7 days to 10 days
* Replace Open-iAPS with Trio, rename path in script to trio-oref

* webpack-cp.sh: add url to the trio-oref repository

---------

Co-authored-by: bjornoleh <[email protected]>
Github issue templates and config.yml: rename from Open-iAPS to Trio
fix `threshold_setting` typo
Harmonised with openaps/oref0:

max_iob: 0 // if max_iob is not provided, will default to zero
    , max_daily_safety_multiplier: 3
    , current_basal_safety_multiplier: 4
    , autosens_max: 1.2
    , autosens_min: 0.7

    , enableSMB_with_COB: false // enable supermicrobolus while COB is positive
    , enableSMB_with_temptarget: false // enable supermicrobolus for eating soon temp targets

    , allowSMB_with_high_temptarget: false // allow supermicrobolus (if otherwise enabled) even with high temp targets
    , maxSMBBasalMinutes: 30 // maximum minutes of basal that can be delivered as a single SMB with uncovered COB
    , maxUAMSMBBasalMinutes: 30 // maximum minutes of basal that can be delivered as a single SMB when IOB exceeds COB

    , bolus_increment: 0.1 // minimum bolus that can be delivered as an SMB

    , insulinPeakTime: 75 // number of minutes after a bolus activity peaks.  defaults to 55m for Fiasp if useCustomPeakTime: false

Moving these lines to harmonise the relative position in the file:

    , enableSMB_high_bg: false // enable SMBs when a high BG is detected, based on the high BG target (adjusted or profile)
    , enableSMB_high_bg_target: 110 // set the value enableSMB_high_bg will compare against to enable SMB. If BG > than this value, SMBs should enable.

Will keep these defaults different from openaps/oref0:

    ,sensitivity_raises_target: false ( openaps/oref0 = `true`
)

Not included from openaps/oref0:

    ,bolussnooze_dia_divisor: 2

    , edison_battery_shutdown_voltage: 3050
    , pi_battery_shutdown_percent: 2


Other profile variables related to dynamic ISF and `smb_delivery_ratio` which diverge from openaps/oref0 are kept:

    , smb_delivery_ratio: 0.5 //Default value: 0.5 Used if flexible delivery ratio is not used. This is another key OpenAPS safety cap, and specifies what share of the total insulin required can be delivered as SMB. This is to prevent people from getting into dangerous territory by setting SMB requests from the caregivers phone at the same time. Increase this experimental value slowly and with caution.
    , adjustmentFactor: 0.8
    , adjustmentFactorSigmoid: 0.5
    , useNewFormula: false
    , enableDynamicCR: false
    , sigmoid: false
    , weightPercentage: 0.65 
    , tddAdjBasal: false // Enable adjustment of basal based on the ratio of 24 h : 10 day average TDD
    , threshold_setting: 60 // Use a configurable threshold setting

Removed this redundant comment:
     // autoISF variables
Harmonise profile defaults with openaps/oref0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants