Rename smbIsAlwaysOff to smbIsScheduledOff (alpha) #120
Conversation
Also rewords "Last Hour SMBs are Off" to "First Hour SMBs are Resumed" to hopefully be a little clearer, and hides "Schedule when SMBs are Off" switch when "Disable SMBs" is switched on instead of disabling it when "Disable SMBs" is switched off.
| @@ -1,5 +1,5 @@ | |||
| <?xml version="1.0" encoding="UTF-8" standalone="yes"?> | |||
| <model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="21754" systemVersion="22F82" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier=""> | |||
| <model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22757" systemVersion="23E224" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier=""> | |||
There was a problem hiding this comment.
Not sure what this change is about or if it's needed as it seems it was altered automatically.
MikePlante1
changed the title
|
Renamed to EDIT: good to go now |
Refactored by @polscm32 for readability. Logic changes by @MikePlante1 : + Removed checking `smbIsOff` from `defaultProfile` + Added checking for `smbIsScheduledOff` to `allSettingsDefault` + Removed checking `isf` and `cr` from `allSettingsDefault` Co-Authored-By: polscm32 <107251660+polscm32@users.noreply.github.com>
MikePlante1
changed the title
|
The scheduling of SMBs work as expected. Tested: setting disable and resume times with resume one hour after disabling. SMBs were issued before and after , but not during the SMB disabled timeframe. Did not test setting resume hours < disable hours. Please note, the profile status no longer displays the |
Good catch. It has to do with the changing of the toggle logic. You used to have to toggle on I'll look into adding something like |
|
That’s great. @kylmcw mentioned something about a comma |
Displays time range in label when SMBs are scheduled off in profile override. For example, if the range is set from 22:00-6:00 it would display ⃠ 22-6
Just added a commit to address this. |
When `Disable SMBs` or `Schedule When SMBs are Off` is the only thing changed. Note, this commit does not fix that changes to SMB minutes are not displayed in the label.
|
If you have one, please voice your opinion on changing the |
|
The comma issue is resolved now. I tried all combinations I could think of. |
The OpenAPS setting for SMB is called "Enable SMB Always", so perhaps "Disable SMB Always" fits well? |
|
"Enable SMB Always" means SMB is enabled (allowed) any time, regardless of how long it has been since carb entry, or what COB is. "Disable SMB Always" would imply that SMB is always disabled at any time, regardless of how long it has been since carb entry, or what COB is. I don't think that's what your setting does (24x7 disable, overriding everything else)? Can someone describe which settings you have for enabling and disabling SMB, and what they do? That should make it more apparent what the names should be. |
SMBs are fully disabled when this setting is on, for the duration the profile (similar to a Loop override). So I think it is accurate enough. When the profile ends, SMBs will be enabled if the main settings allows. The duration can be timed or indefinite. |
|
So, “SMBs temporarily disabled”? I think “always” implies a more permanent setting. |
This is a setting that is configured when defining a profile/override, so the temporary nature is implied. I could agree though, but the name also needs to be seen in context with the alternative scheduled disabling of SMBs that is also an option. This will disable SMB during set hours of the day (some find it useful to disable during the night). If not scheduled, SMBs are off till the end of the profile/override. Perhaps @MikePlante1 has screenshots, I don’t have this build on my phone right now. |
|
Ok, I had a screenshot after all:
The “Schedule when SMBs are off” toggle is hidden when “Disable SMBs” is enabled, hence it’s useful to hint at the possibility to disable on schedule. |
|
Changes here look good, was a bit concerned about the profiles view changing but the changes make sense (and reading comments here helped) |
|
@MikePlante1, this works as expected in the app, and is technically good to go. Which way do you lean regarding the name of the Disable SMBs toggle string? |
Thanks for that reminder. I went ahead and pushed "Always Disable SMBs" |
Merge pull request #2 from nightscout/alpha
MikePlante1
changed the title
Includes open-iaps-oref PR 20 and PR 17 (console error fix) Last commits: +5774155 Merge pull request 20 from MikePlante1/disable_smb_schedule +e3a8d73 Merge pull request 17 from MikePlante1/console_error_refactor +a29d9ce rename smbIsAlwaysOff to smbIsScheduledOff +d898eb1 fix threshold console.error Co-authored-by: Mike Plante <mikeplante1@gmail.com>
Update oref0 for #120 Rename smbIsAlwaysOff to smbIsScheduledOff
|
Merging this into alpha now. Only changes in the last commit is the proper copying of oref0 files including readable js source code. |
Also rewords "Last Hour SMBs are Off" to "First Hour SMBs are Resumed" to hopefully be a little clearer, and hides "Schedule when SMBs are Off" switch when "Disable SMBs" is switched on instead of disabling it when "Disable SMBs" is switched off.
Fix and refactor unChanged() for Profile Overrides
Refactored by @polscm32 for readability.
Logic changes by @MikePlante1 :
smbIsOfffromdefaultProfilesmbIsScheduledOfftoallSettingsDefaultisfandcrfromallSettingsDefaultDo not merge until nightscout/trio-oref#20 is merged, since the changes to determine-basal.js in this Oi PR are reflected in that Oiref PR.