-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
G7 cleanup #3220
G7 cleanup #3220
Conversation
Merge remote-tracking branch 'Navid200/Navid_2023_12_02' into schubi
Overall I think this is useful but I don't really like the logic too much because I think you're going to potentially have problems in the transition between when the sensor is active before and after firmware information has been read. Can you modify |
Can I open another PR to change "G6/Dex1 Support" to an array allowing 3 options (G5, G6/Dex1, or G7)? I will test transitions and everything. |
Consider that in the future, we may have other devices that use a 4-digit transmitter ID. |
I did the change. |
Will be tested before tomorrow. |
Tested with a G7. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like it should work other than if AAPS is fussy about the data source name but if so hopefully that can be resolved.
@@ -143,6 +145,9 @@ boolean alwaysSendBattery() { | |||
@Override | |||
String getDeviceName() { | |||
if (Ob1G5StateMachine.usingG6()) { | |||
if (shortTxId()) { // If using G7 | |||
return "G7 Device"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change to "G7 Transmitter";
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
G7 transmitter and sensor are together. There is no reason to call it a transmitter any longer. It is valid to call it a device to avoid calling it a transmitter.
Correcting some notes to show G7 when G7 is being used.
Adding G7 to the menu items that correspond to G7 as well.