caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

IT WORKS!!!

Browse source
This commit is contained in:
PoweRGbg 2018-06-13 15:57:42 +03:00
parent faab8fbc67
commit 5a197676fb
2 changed files with 33 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSetUserOptions.java
View file

@ -14,19 +14,6 @@ public class MsgSetUserOptions extends MessageBase {
private static Logger log = LoggerFactory.getLogger(MsgSetUserOptions.class); private static Logger log = LoggerFactory.getLogger(MsgSetUserOptions.class);
private int backlightOnTimeSec;
private int beepAndAlarm;
private int buttonScrollOnOff;
private int cannulaVolume;
private int error;
private int glucoseUnit;
private int lcdOnTimeSec;
private int lowReservoirRate;
private int refillRate;
private int selectedLanguage;
private int shutdownHour;
private int timeDisplayType;
byte[] newOptions;
public boolean done; public boolean done;
public MsgSetUserOptions(int timeDisplayType, int buttonScrollOnOff, int beepAndAlarm, int lcdOnTimeSec, int backlightOnTimeSec, int selectedLanguage, int glucoseUnit, int shutdownHour, int lowReservoirRate, int cannulaVolume, int refillRate) { public MsgSetUserOptions(int timeDisplayType, int buttonScrollOnOff, int beepAndAlarm, int lcdOnTimeSec, int backlightOnTimeSec, int selectedLanguage, int glucoseUnit, int shutdownHour, int lowReservoirRate, int cannulaVolume, int refillRate) {
@ -48,37 +35,45 @@ public class MsgSetUserOptions extends MessageBase {
log.debug("Units: " + (byte) glucoseUnit); log.debug("Units: " + (byte) glucoseUnit);
log.debug("Shutdown: " + (byte) shutdownHour); log.debug("Shutdown: " + (byte) shutdownHour);
log.debug("Low reservoir: " + (byte) lowReservoirRate); log.debug("Low reservoir: " + (byte) lowReservoirRate);
this.timeDisplayType = timeDisplayType; pump.userOptionsFrompump[0] = (byte) (pump.timeDisplayType == 1 ? 0 : 1);
this.buttonScrollOnOff = buttonScrollOnOff; pump.userOptionsFrompump[1] = (byte) pump.buttonScrollOnOff;
this.beepAndAlarm = beepAndAlarm; pump.userOptionsFrompump[2] = (byte) pump.beepAndAlarm;
this.lcdOnTimeSec = lcdOnTimeSec; pump.userOptionsFrompump[3] = (byte) pump.lcdOnTimeSec;
this.backlightOnTimeSec = backlightOnTimeSec; pump.userOptionsFrompump[4] = (byte) pump.backlightOnTimeSec;
this.selectedLanguage = selectedLanguage; pump.userOptionsFrompump[5] = (byte) pump.selectedLanguage;
this.glucoseUnit = glucoseUnit; pump.userOptionsFrompump[8] = (byte) pump.units;
this.shutdownHour = shutdownHour; pump.userOptionsFrompump[9] = (byte) pump.shutdownHour;
this.lowReservoirRate = lowReservoirRate; pump.userOptionsFrompump[27] = (byte) pump.lowReservoirRate;
this.cannulaVolume = cannulaVolume;
this.refillRate = refillRate;
pump.userOptionsFrompump[0] = (byte) (timeDisplayType == 1 ? 0 : 1);
pump.userOptionsFrompump[1] = (byte) buttonScrollOnOff;
pump.userOptionsFrompump[2] = (byte) beepAndAlarm;
pump.userOptionsFrompump[3] = (byte) lcdOnTimeSec;
pump.userOptionsFrompump[4] = (byte) backlightOnTimeSec;
pump.userOptionsFrompump[5] = (byte) selectedLanguage;
pump.userOptionsFrompump[8] = (byte) glucoseUnit;
pump.userOptionsFrompump[9] = (byte) shutdownHour;
pump.userOptionsFrompump[27] = (byte) lowReservoirRate;
for(int i=0; i<pump.userOptionsFrompump.length; i++){ for(int i=0; i<pump.userOptionsFrompump.length; i++){
AddParamByte(pump.userOptionsFrompump[i]); // AddParamByte(pump.userOptionsFrompump[i]);
log.debug("rgDebug:userOptions["+i+"]="+pump.userOptionsFrompump[i]);
} }
} }
public MsgSetUserOptions() { public MsgSetUserOptions() {
SetCommand(0x330B); SetCommand(0x330B);
DanaRPump pump = DanaRPump.getInstance();
if (pump.userOptionsFrompump == null) {
// No options set -> Exitting
log.debug("NO USER OPTIONS LOADED EXITTING!");
return;
}
pump.userOptionsFrompump[0] = (byte) (pump.timeDisplayType == 1 ? 0 : 1);
pump.userOptionsFrompump[1] = (byte) pump.buttonScrollOnOff;
pump.userOptionsFrompump[2] = (byte) pump.beepAndAlarm;
pump.userOptionsFrompump[3] = (byte) pump.lcdOnTimeSec;
pump.userOptionsFrompump[4] = (byte) pump.backlightOnTimeSec;
pump.userOptionsFrompump[5] = (byte) pump.selectedLanguage;
pump.userOptionsFrompump[8] = (byte) pump.units;
pump.userOptionsFrompump[9] = (byte) pump.shutdownHour;
pump.userOptionsFrompump[27] = (byte) pump.lowReservoirRate;
for(int i=0; i<pump.userOptionsFrompump.length; i++){
AddParamByte(pump.userOptionsFrompump[i]);
log.debug("rgDebug:userOptions["+i+"]="+pump.userOptionsFrompump[i]);
}
} }
public void handleMessage(byte[] bytes) { public void handleMessage(byte[] bytes) {
log.debug("Entering handleMessage ");
int result = intFromBuff(bytes, 0, 1); int result = intFromBuff(bytes, 0, 1);
if (result != 1) { if (result != 1) {
failed = true; failed = true;

3
app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/comm/MsgSettingUserOptions.java
View file

@ -41,6 +41,9 @@ public class MsgSettingUserOptions extends MessageBase {
int selectableLanguage4 = bytes[13]; int selectableLanguage4 = bytes[13];
int selectableLanguage5 = bytes[14]; int selectableLanguage5 = bytes[14];
*/ */
for(int i=0; i<pump.userOptionsFrompump.length; i++){
log.debug("rgDebug:userOptions["+i+"]="+pump.userOptionsFrompump[i]);
}
// if (Config.logDanaMessageDetail) { // if (Config.logDanaMessageDetail) {