Skip to content

Conversation

@jaylagorio
Copy link
Contributor

Changed files:
oref0-setup.sh

oref0-cron-every-minute.sh

  • Reincluding support for offline CGM, with optional upload, for G5 and G6 receivers

… receivers

Changed files:
`oref0-setup.sh`
- Includes cgm_loop_path fix found by @chuckj for both G5 and G6 (8799a13 to fix #1149) and includes support for G5/G6 touch receivers (previously under #1182)

`oref0-cron-every-minute.sh`
- Reincluding support for offline CGM, with optional upload, for G5 and G6 receivers
@jaylagorio
Copy link
Contributor Author

It looks like a test went bad, but it's not clear to me why considering this PR doesn't have anything to do with basal/bolus/suspension or anything dosing related.

ok 191 IOB should calculate IOB without counting time pump suspended at end of basal
not ok 192 IOB should calculate IOB without counting time pump suspended in middle of basal
  AssertionError: expected -0.01 to be 0.235
      at Assertion.fail (node_modules/should/lib/assertion.js:180:17)
      at Assertion.prop.value (node_modules/should/lib/assertion.js:65:17)
      at Context.<anonymous> (tests/iob.test.js:973:38)
ok 193 IOB should calculate IOB without counting time pump suspended surrounding a basal

@tzachi-dar
Copy link
Contributor

Why did you remove lines like:
adddate openaps.pump-loop | uncolor |tee -a /var/log/openaps/openaps-date.log ?

This are needed in order to allow people to read the logs using apache-chainsaw.
See https://openaps.readthedocs.io/en/latest/docs/While%20You%20Wait%20For%20Gear/monitoring-OpenAPS.html?highlight=chainsaw#apache-chainsaw

@jaylagorio
Copy link
Contributor Author

I didn't remove those lines. My suspician is there was a change between the time I pulled the file, those lines were added, and when and made my changes and committed because I wouldn't have removed those lines in those places. I'll add them back and commit.

@tzachi-dar
Copy link
Contributor

tzachi-dar commented Mar 9, 2019 via email

@jaylagorio
Copy link
Contributor Author

Fixed the above logging lines for apache-chainsaw. As for the conflict listed above, I think I can't hit the resolve button without commit rights but as of right now the conflict diff between dev and this PR is that this PR adds three lines. The correct resolution is to add those three lines (the dev branch side of the diff is empty).

cd $CGM_LOOPDIR
if ! is_bash_process_running_named oref0-g4-loop; then
oref0-g4-loop | tee -a /var/log/openaps/cgm-loop.log | adddate openaps.cgm-loop | uncolor |tee -a /var/log/openaps/openaps-date.log &
oref0-g4-loop | tee -a /var/log/openaps/cgm-loop.log &
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this one need to be re-added too?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's right, sorry. Fixed.

@scottleibrand scottleibrand merged commit dcb5cfd into openaps:dev Mar 11, 2019
@jaylagorio jaylagorio deleted the jaylagorio-patch-3 branch March 11, 2019 16:18
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.

3 participants