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 60 commits into
base: main
Choose a base branch
from
Open

Merge dev branch into main #10

wants to merge 60 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

Okay so https://github.com/nightscout/Open-iAPS/tree/current-oref is the branch I can test? I’ll pull it into my build this weekend then. Can someone tell me test pointers? Or things to look for? Happy to be of help with this.

Great, thanks! Yes, this is the branch. I will keep it up to date if anything changes in Oiref.

Jeremy made an actual change to timing of SMB on/off in profiles: c496240. Please test this at least.

Otherwise have a look at the history:
https://github.com/nightscout/open-iaps-oref/commits/dev/

Unfortunately, there are some changes that were reverted, so it doesn’t look too clean. We could possibly clean that up, not sure what people think?

@bjornoleh
Copy link
Contributor

It does not contain the latest oiref yet, so I pushed a PR to include the latest determinbasal into current.oref to get going

@mountrcg , I have made a script that does this more transparent than just copying the minimised files.

Please use this instead:
https://github.com/nightscout/open-iaps-oref/blob/dev/webpack-cp.sh

Besides, as I mentioned, the one missing change is just a minimal logging change (#9) , so no need to update for this, really.

@mountrcg
Copy link
Contributor

mountrcg commented Apr 5, 2024

@mountrcg , I have made a script that does this more transparent than just copying the minimised files.
Please use this instead: https://github.com/nightscout/open-iaps-oref/blob/dev/webpack-cp.sh

Yep, that makes sense to reference what has been used to minimize

Besides, as I mentioned, the one missing change is just a minimal logging change (#9) , so no need to update for this, really.

I would like to disagree, dev-OiAPS should be using dev-oiref for test transparency

@bjornoleh
Copy link
Contributor

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

avouspierre and others added 26 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
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.

None yet

9 participants