caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

- Fix for Unabsorbed and items without date set

Browse source
This commit is contained in:
Andy Rozman 2019-04-14 14:53:00 +01:00
parent c7f6eb79f0
commit dbb9c132f4
4 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/info/nightscout/androidaps/plugins/pump/common/utils/DateTimeUtil.java
View file

@ -147,7 +147,11 @@ public class DateTimeUtil {
}
public static int getYear(long atechDateTime) {
public static int getYear(Long atechDateTime) {
if (atechDateTime==null || atechDateTime==0) {
return 2000;
}
int year = (int)(atechDateTime / 10000000000L);
return year;

8
app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/MedtronicPumpHistoryDecoder.java
View file

@ -211,7 +211,6 @@ public class MedtronicPumpHistoryDecoder extends MedtronicHistoryDecoder<PumpHis
case ClearAlarm:
case ChangeAlarmNotifyMode: // ChangeUtility:
case ToggleRemote:
case UnabsorbedInsulin:
case BGReceived: // Ian3F: CGMS
case SensorAlert: // Ian08 CGMS
case ChangeTimeFormat:
@ -272,10 +271,8 @@ public class MedtronicPumpHistoryDecoder extends MedtronicHistoryDecoder<PumpHis
case EventUnknown_MM522_0x4c:
case EventUnknown_MM512_0x10:
case EventUnknown_MM512_0x2e:
case EventUnknown_MM512_0x37:
case EventUnknown_MM512_0x38:
case EventUnknown_MM512_0x4e:
case EventUnknown_MM522_0x70:
case EventUnknown_MM512_0x88:
@ -287,6 +284,9 @@ public class MedtronicPumpHistoryDecoder extends MedtronicHistoryDecoder<PumpHis
LOG.debug(" -- ignored Pump Entry: " + entry);
return RecordDecodeStatus.Ignored;
case UnabsorbedInsulin:
return RecordDecodeStatus.Ignored;
// **** Implemented records ****
case DailyTotals522:
@ -423,7 +423,7 @@ public class MedtronicPumpHistoryDecoder extends MedtronicHistoryDecoder<PumpHis
// FIXME displayable
return RecordDecodeStatus.WIP;
return RecordDecodeStatus.OK;
}

5
app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/history/pump/PumpHistoryResult.java
View file

@ -102,6 +102,11 @@ public class PumpHistoryResult {
// clearOrPrepareList();
for (PumpHistoryEntry unprocessedEntry : unprocessedEntries) {
if (unprocessedEntry.atechDateTime==null || unprocessedEntry.atechDateTime==0) {
continue;
}
if (unprocessedEntry.isAfter(this.searchDate)) {
this.validEntries.add(unprocessedEntry);
} else {

2
app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/DailyTotalsDTO.java
View file

@ -117,7 +117,7 @@ public class DailyTotalsDTO {
// Daily
byte body[] = data; // entry.getBody();
System.out.println("Totoals 522");
System.out.println("Totals 522");
for (int i = 0; i < body.length - 2; i++) {