caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #62 from AdrianLxM/profileprefix

Browse source 
Show DanaR as part of profile name
This commit is contained in:
Milos Kozak 2016-11-11 08:30:11 +01:00 committed by GitHub
commit 33100ea6b8
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/info/nightscout/androidaps/plugins/DanaR/DanaRPump.java
View file

@ -22,6 +22,8 @@ public class DanaRPump {
public static final int UNITS_MGDL = 0; public static final int UNITS_MGDL = 0;
public static final int UNITS_MMOL = 1; public static final int UNITS_MMOL = 1;
public static final String PROFILE_PREFIX = "DanaR-";
public Date lastConnection = new Date(0); public Date lastConnection = new Date(0);
public Date lastSettingsRead = new Date(0); public Date lastSettingsRead = new Date(0);
@ -106,7 +108,7 @@ public class DanaRPump {
double car = SafeParse.stringToDouble(SP.getString("danarprofile_car", "20")); double car = SafeParse.stringToDouble(SP.getString("danarprofile_car", "20"));
try { try {
json.put("defaultProfile", "" + (activeProfile + 1)); json.put("defaultProfile", PROFILE_PREFIX + (activeProfile + 1));
json.put("store", store); json.put("store", store);
profile.put("dia", dia); profile.put("dia", dia);
@ -139,20 +141,20 @@ public class DanaRPump {
} else { } else {
time = df.format(h) + ":00"; time = df.format(h) + ":00";
} }
basals.put(new JSONObject().put("time", time).put("timeAsSeconds", h * basalIncrement).put("value", pumpProfiles[activeProfile][h])); basals.put(new JSONObject().put("time", time).put("timeAsSeconds", h * basalIncrement).put("value", pumpProfiles[activeProfile][h]));
} }
profile.put("basal", basals); profile.put("basal", basals);
profile.put("target_low", new JSONArray().put(new JSONObject().put("time", "00:00").put("timeAsSeconds", 0).put("value", currentTarget))); profile.put("target_low", new JSONArray().put(new JSONObject().put("time", "00:00").put("timeAsSeconds", 0).put("value", currentTarget)));
profile.put("target_high", new JSONArray().put(new JSONObject().put("time", "00:00").put("timeAsSeconds", 0).put("value", currentTarget))); profile.put("target_high", new JSONArray().put(new JSONObject().put("time", "00:00").put("timeAsSeconds", 0).put("value", currentTarget)));
profile.put("units", units == UNITS_MGDL ? Constants.MGDL : Constants.MMOL); profile.put("units", units == UNITS_MGDL ? Constants.MGDL : Constants.MMOL);
store.put("" + (activeProfile + 1), profile); store.put(PROFILE_PREFIX + (activeProfile + 1), profile);
} catch (JSONException e) { } catch (JSONException e) {
e.printStackTrace(); e.printStackTrace();
} catch (Exception e) { } catch (Exception e) {
return null; return null;
} }
return new NSProfile(json, "" + (activeProfile + 1)); return new NSProfile(json, PROFILE_PREFIX + (activeProfile + 1));
} }
} }

6
app/src/main/java/info/nightscout/androidaps/plugins/SimpleProfile/SimpleProfilePlugin.java
View file

@ -217,7 +217,7 @@ public class SimpleProfilePlugin implements PluginBase, ProfileInterface {
JSONObject profile = new JSONObject(); JSONObject profile = new JSONObject();
try { try {
json.put("defaultProfile", "Profile"); json.put("defaultProfile", "SimpleProfile");
json.put("store", store); json.put("store", store);
profile.put("dia", dia); profile.put("dia", dia);
profile.put("carbratio", new JSONArray().put(new JSONObject().put("timeAsSeconds", 0).put("value", ic))); profile.put("carbratio", new JSONArray().put(new JSONObject().put("timeAsSeconds", 0).put("value", ic)));
@ -227,11 +227,11 @@ public class SimpleProfilePlugin implements PluginBase, ProfileInterface {
profile.put("target_low", new JSONArray().put(new JSONObject().put("timeAsSeconds", 0).put("value", targetLow))); profile.put("target_low", new JSONArray().put(new JSONObject().put("timeAsSeconds", 0).put("value", targetLow)));
profile.put("target_high", new JSONArray().put(new JSONObject().put("timeAsSeconds", 0).put("value", targetHigh))); profile.put("target_high", new JSONArray().put(new JSONObject().put("timeAsSeconds", 0).put("value", targetHigh)));
profile.put("units", mgdl ? Constants.MGDL : Constants.MMOL); profile.put("units", mgdl ? Constants.MGDL : Constants.MMOL);
store.put("Profile", profile); store.put("SimpleProfile", profile);
} catch (JSONException e) { } catch (JSONException e) {
e.printStackTrace(); e.printStackTrace();
} }
convertedProfile = new NSProfile(json, null); convertedProfile = new NSProfile(json, "SimpleProfile");
} }
@Override @Override