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

Commits on Feb 28, 2024

  1. Configuration menu
    Copy the full SHA
    05a1a2e View commit details
    Browse the repository at this point in the history
  2. Revert "Tzachi shared node phase2 (#1370)"

    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) {
    bjornoleh committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    6cf69ec View commit details
    Browse the repository at this point in the history
  3. Rename script to webpack-cp.sh, commit webpack.config.js

    -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
    bjornoleh committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    3ff4e0a View commit details
    Browse the repository at this point in the history
  4. Merge pull request #2 from bjornoleh/revert_1370

    Revert "Tzachi shared node phase2 (#1370)"
    JeremyStorring authored Feb 28, 2024
    Configuration menu
    Copy the full SHA
    1276c59 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #3 from bjornoleh/webpack

    Webpack
    JeremyStorring authored Feb 28, 2024
    Configuration menu
    Copy the full SHA
    30549a0 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    fc0e748 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2024

  1. Merge pull request #4 from JeremyStorring/minify_fixes

    Address review comments from Robert
    JeremyStorring authored Mar 1, 2024
    Configuration menu
    Copy the full SHA
    838038a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    256662c View commit details
    Browse the repository at this point in the history
  3. Merge pull request #6 from JeremyStorring/min_bg_threshold

    Adjusted min threshold
    JeremyStorring authored Mar 1, 2024
    Configuration menu
    Copy the full SHA
    b8f5997 View commit details
    Browse the repository at this point in the history
  4. fix for time calcs

    mountrcg committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    1f2b45f View commit details
    Browse the repository at this point in the history
  5. Merge pull request #7 from JeremyStorring/time-issues

    fix for time calcs
    mountrcg authored Mar 1, 2024
    Configuration menu
    Copy the full SHA
    8d739f5 View commit details
    Browse the repository at this point in the history
  6. fix from Deniz

    mountrcg committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    f295a47 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    cf1bc34 View commit details
    Browse the repository at this point in the history
  8. Merge pull request #8 from JeremyStorring/revert-7-time-issues

    Revert "fix for time calcs"
    mountrcg authored Mar 1, 2024
    Configuration menu
    Copy the full SHA
    559f96f View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    1230e23 View commit details
    Browse the repository at this point in the history
  10. fix for time calcs

    fix from Deniz
    mountrcg committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    e0714c5 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    41c42c5 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    f80c32a View commit details
    Browse the repository at this point in the history
  13. Merge pull request #5 from JeremyStorring/enableSmbBug

    Bug fix for profile overrides not canceling SMBs
    JeremyStorring authored Mar 1, 2024
    Configuration menu
    Copy the full SHA
    c496240 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    5cdd17d View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2024

  1. move currentTime check up

    use systemTime
    use currentHour in enableSMS
    mountrcg committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    b2cf75b View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2024

  1. Merge pull request #9 from JeremyStorring/time-issues

    fix for time calcs - Reloaded
    JeremyStorring authored Mar 3, 2024
    Configuration menu
    Copy the full SHA
    97b012a View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2024

  1. duplication of SMB ratio for tags

    has already been added to tddReason way before
    mountrcg committed Mar 6, 2024
    Configuration menu
    Copy the full SHA
    3add4a1 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2024

  1. index.js: use correct value (160) in comment for half_basal_exercise_…

    …target
    
    half_basal_exercise_target: 160 // when temptarget is 160 mg/dL
    bjornoleh authored Mar 7, 2024
    Configuration menu
    Copy the full SHA
    159b800 View commit details
    Browse the repository at this point in the history
  2. Update webpack-cp.sh

        - 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)
    bjornoleh committed Mar 7, 2024
    Configuration menu
    Copy the full SHA
    4f6de7c View commit details
    Browse the repository at this point in the history
  3. Merge pull request #3 from nightscout/webpack-cp_patch-1

    Update webpack-cp.sh
    bjornoleh authored Mar 7, 2024
    Configuration menu
    Copy the full SHA
    47d2485 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    1fda0fa View commit details
    Browse the repository at this point in the history
  5. Merge pull request #6 from nightscout/webpack-cp_patch-1

    webpack-cp.sh: Set apsDIR=../Open-iAPS, fix path for source files
    bjornoleh authored Mar 7, 2024
    Configuration menu
    Copy the full SHA
    acf203c View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2024

  1. Merge pull request #5 from nightscout/half_basal_target

    Use correct value (160) in comment for half_basal_exercise_target
    bjornoleh authored Mar 9, 2024
    Configuration menu
    Copy the full SHA
    8a6051c View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2024

  1. Configuration menu
    Copy the full SHA
    975245b View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2024

  1. Merge pull request #4 from nightscout/duplicate_SMBratio

    duplication of SMB ratio for tags
    JeremyStorring authored Mar 17, 2024
    Configuration menu
    Copy the full SHA
    f932754 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2024

  1. determine-basal.js smb_ratio log: if (smb_ratio != 0.5)

    Small change in logging of smb_ratio adjustments:
    
     if (smb_ratio != 0.5) {
                    console.error("SMB Delivery Ratio changed from default 0.5 to " + round(smb_ratio,2))
    bjornoleh authored Mar 18, 2024
    Configuration menu
    Copy the full SHA
    4b7676c View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2024

  1. Merge pull request #9 from nightscout/smb_ratio_log

    determine-basal.js smb_ratio log: if (smb_ratio != 0.5)
    JeremyStorring authored Apr 1, 2024
    Configuration menu
    Copy the full SHA
    1990e37 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2024

  1. Edit issue templates

    - The issue template files were adapted from openaps/oref0 (mainly default GH bug report and feature request templates, adapted to OpenAPS usage).
    - The config.yml file adds a clickable link to open the Open-iAPS Discord server invitation for Individual troubleshooting help.
    - The isue templates are only visible when included in the default branch (currently main). For testing: Copy the issue-template branch to your fork and
    change the default branch to issue-template.
    - Edits the issue templates of the `open-iaps-oref` repository as suggested
    in nightscout/Trio#4
    bjornoleh committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    f10ef66 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2024

  1. fix meal inputs with actualDate

    Fix error in populate mealInputs with a carb including actualDate
    avouspierre committed Apr 6, 2024
    Configuration menu
    Copy the full SHA
    444903e View commit details
    Browse the repository at this point in the history
  2. Revert "actualDate" changes to lib/meal/history.js

    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
    bjornoleh committed Apr 6, 2024
    Configuration menu
    Copy the full SHA
    a42e58f View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2024

  1. Merge pull request #14 from nightscout/revert_actualDate

    Revert "actualDate" changes to lib/meal/history.js
    bjornoleh authored Apr 7, 2024
    Configuration menu
    Copy the full SHA
    8d4f4ff View commit details
    Browse the repository at this point in the history
  2. allows to create Bundle directory for oiaps

    Add plugin to copy files and rename correctly for oiaps
    avouspierre committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    f3faea6 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4edc26c View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2024

  1. Update config.yml

    - minor symbol changes
    - addition of missing Oxford comma
    tmhastings authored Apr 8, 2024
    Configuration menu
    Copy the full SHA
    d76ed48 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #11 from nightscout/issue-template

    Edit  issue templates
    tmhastings authored Apr 8, 2024
    Configuration menu
    Copy the full SHA
    4438013 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    deefc58 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    3c321e3 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. Configuration menu
    Copy the full SHA
    4aba4e0 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #15 from avouspierre/dev

    Add scripts to rename files output and create bundle directory
    bjornoleh authored Apr 10, 2024
    Configuration menu
    Copy the full SHA
    b8aaf93 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #16 from bjornoleh/webpack-update

    Webpack update to use with copy-rename-webpack-plugin in #15
    bjornoleh authored Apr 10, 2024
    Configuration menu
    Copy the full SHA
    b89a39b View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2024

  1. Configuration menu
    Copy the full SHA
    d898eb1 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2024

  1. Separate Adjustment Factors for Logarithmic and Sigmoid

    Also changes defaults to 0.8 for Logarithmic and 0.5 for Sigmoid
    MikePlante1 committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    b777c77 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2024

  1. Configuration menu
    Copy the full SHA
    a29d9ce View commit details
    Browse the repository at this point in the history

Commits on May 1, 2024

  1. Merge pull request #17 from MikePlante1/console_error_refactor

    fix threshold console.error
    bjornoleh authored May 1, 2024
    Configuration menu
    Copy the full SHA
    e3a8d73 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #20 from MikePlante1/disable_smb_schedule

    rename smbIsAlwaysOff to smbIsScheduledOff
    bjornoleh authored May 1, 2024
    Configuration menu
    Copy the full SHA
    5774155 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #21 from MikePlante1/separate_adjustment_factors

    Separate Adjustment Factors for Logarithmic and Sigmoid
    bjornoleh authored May 1, 2024
    Configuration menu
    Copy the full SHA
    487bcbb View commit details
    Browse the repository at this point in the history

Commits on May 2, 2024

  1. tddAdjBasal pop-up correction

    Correct pop up text for 'tddAdjBasal' from 7 days to 10 days
    tmhastings authored May 2, 2024
    Configuration menu
    Copy the full SHA
    fc0ae69 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #22 from nightscout/tmhastings-tddAdjBasal

    tddAdjBasal pop-up correction
    MikePlante1 authored May 2, 2024
    Configuration menu
    Copy the full SHA
    fa373c9 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. Replace Open-iAPS with Trio (#23)

    * 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]>
    MikePlante1 and bjornoleh authored May 9, 2024
    Configuration menu
    Copy the full SHA
    e023125 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2024

  1. Configuration menu
    Copy the full SHA
    5b7affa View commit details
    Browse the repository at this point in the history

Commits on May 12, 2024

  1. update Discord url

    MikePlante1 authored May 12, 2024
    Configuration menu
    Copy the full SHA
    5319e39 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2024

  1. Merge pull request #24 from nightscout/Trio_renames

    Github issue templates and config.yml: rename from Open-iAPS to Trio
    bjornoleh authored May 13, 2024
    Configuration menu
    Copy the full SHA
    b454837 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. Configuration menu
    Copy the full SHA
    d9f1662 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2024

  1. Merge pull request #26 from MikePlante1/typo

    fix `threshold_setting` typo
    dnzxy authored May 23, 2024
    Configuration menu
    Copy the full SHA
    d1dfb70 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2024

  1. Harmonise profile defaults with openaps/oref0

    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
    bjornoleh committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    8f5f820 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2024

  1. Configuration menu
    Copy the full SHA
    2d695e1 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2024

  1. Merge pull request #28 from bjornoleh/harmonise_defaults

    Harmonise profile defaults with openaps/oref0
    MikePlante1 authored Aug 16, 2024
    Configuration menu
    Copy the full SHA
    363fd11 View commit details
    Browse the repository at this point in the history