diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java index f4d49c0a94..ef974b8046 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java @@ -17,9 +17,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import de.jotomo.ruffyscripter.PumpState; -import de.jotomo.ruffyscripter.commands.Command; -import de.jotomo.ruffyscripter.commands.CommandResult; +import info.nightscout.androidaps.plugins.PumpCombo.scripter.PumpState; +import info.nightscout.androidaps.plugins.PumpCombo.scripter.commands.Command; +import info.nightscout.androidaps.plugins.PumpCombo.scripter.commands.CommandResult; import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.R; import info.nightscout.androidaps.plugins.PumpCombo.events.EventComboPumpUpdateGUI; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java index 0fe788d72e..2441584928 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java @@ -23,15 +23,15 @@ import org.slf4j.LoggerFactory; import java.util.Date; -import de.jotomo.ruffyscripter.PumpState; -import de.jotomo.ruffyscripter.RuffyScripter; -import de.jotomo.ruffyscripter.commands.BolusCommand; -import de.jotomo.ruffyscripter.commands.CancelTbrCommand; -import de.jotomo.ruffyscripter.commands.CancellableBolusCommand; -import de.jotomo.ruffyscripter.commands.Command; -import de.jotomo.ruffyscripter.commands.CommandResult; -import de.jotomo.ruffyscripter.commands.GetPumpStateCommand; -import de.jotomo.ruffyscripter.commands.SetTbrCommand; +import info.nightscout.androidaps.plugins.PumpCombo.scripter.PumpState; +import info.nightscout.androidaps.plugins.PumpCombo.scripter.RuffyScripter; +import info.nightscout.androidaps.plugins.PumpCombo.scripter.commands.BolusCommand; +import info.nightscout.androidaps.plugins.PumpCombo.scripter.commands.CancelTbrCommand; +import info.nightscout.androidaps.plugins.PumpCombo.scripter.commands.CancellableBolusCommand; +import info.nightscout.androidaps.plugins.PumpCombo.scripter.commands.Command; +import info.nightscout.androidaps.plugins.PumpCombo.scripter.commands.CommandResult; +import info.nightscout.androidaps.plugins.PumpCombo.scripter.commands.GetPumpStateCommand; +import info.nightscout.androidaps.plugins.PumpCombo.scripter.commands.SetTbrCommand; import info.nightscout.androidaps.BuildConfig; import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.R; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPump.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPump.java index d24a31607c..3160a32fee 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPump.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPump.java @@ -5,9 +5,9 @@ import android.support.annotation.Nullable; import java.util.Date; -import de.jotomo.ruffyscripter.PumpState; -import de.jotomo.ruffyscripter.commands.Command; -import de.jotomo.ruffyscripter.commands.CommandResult; +import info.nightscout.androidaps.plugins.PumpCombo.scripter.PumpState; +import info.nightscout.androidaps.plugins.PumpCombo.scripter.commands.Command; +import info.nightscout.androidaps.plugins.PumpCombo.scripter.commands.CommandResult; class ComboPump { @NonNull diff --git a/app/src/main/java/de/jotomo/ruffyscripter/History.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/History.java similarity index 54% rename from app/src/main/java/de/jotomo/ruffyscripter/History.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/History.java index cfe514565b..ed9ac66061 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/History.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/History.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter; +package info.nightscout.androidaps.plugins.PumpCombo.scripter; /** * The history data read from "My data" diff --git a/app/src/main/java/de/jotomo/ruffyscripter/PumpState.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/PumpState.java similarity index 97% rename from app/src/main/java/de/jotomo/ruffyscripter/PumpState.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/PumpState.java index 9323ab71a5..0db577bf7a 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/PumpState.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/PumpState.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter; +package info.nightscout.androidaps.plugins.PumpCombo.scripter; import java.util.Date; diff --git a/app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/RuffyScripter.java similarity index 98% rename from app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/RuffyScripter.java index 24aeb792eb..d0d126235e 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/RuffyScripter.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter; +package info.nightscout.androidaps.plugins.PumpCombo.scripter; import android.os.RemoteException; import android.os.SystemClock; @@ -16,10 +16,10 @@ import org.slf4j.LoggerFactory; import java.util.List; -import de.jotomo.ruffyscripter.commands.Command; -import de.jotomo.ruffyscripter.commands.CommandException; -import de.jotomo.ruffyscripter.commands.CommandResult; -import de.jotomo.ruffyscripter.commands.GetPumpStateCommand; +import info.nightscout.androidaps.plugins.PumpCombo.scripter.commands.Command; +import info.nightscout.androidaps.plugins.PumpCombo.scripter.commands.CommandException; +import info.nightscout.androidaps.plugins.PumpCombo.scripter.commands.CommandResult; +import info.nightscout.androidaps.plugins.PumpCombo.scripter.commands.GetPumpStateCommand; // TODO regularly read "My data" history (boluses, TBR) to double check all commands ran successfully. // Automatically compare against AAPS db, or log all requests in the PumpInterface (maybe Milos diff --git a/app/src/main/java/de/jotomo/ruffyscripter/commands/BaseCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/BaseCommand.java similarity index 82% rename from app/src/main/java/de/jotomo/ruffyscripter/commands/BaseCommand.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/BaseCommand.java index 45370187f0..1a145c3efc 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/commands/BaseCommand.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/BaseCommand.java @@ -1,11 +1,11 @@ -package de.jotomo.ruffyscripter.commands; +package info.nightscout.androidaps.plugins.PumpCombo.scripter.commands; import android.os.SystemClock; import org.monkey.d.ruffy.ruffy.driver.display.MenuAttribute; import org.monkey.d.ruffy.ruffy.driver.display.MenuType; -import de.jotomo.ruffyscripter.RuffyScripter; +import info.nightscout.androidaps.plugins.PumpCombo.scripter.RuffyScripter; public abstract class BaseCommand implements Command { // RS will inject itself here diff --git a/app/src/main/java/de/jotomo/ruffyscripter/commands/BolusCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/BolusCommand.java similarity index 99% rename from app/src/main/java/de/jotomo/ruffyscripter/commands/BolusCommand.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/BolusCommand.java index 4e689a851d..5593974281 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/commands/BolusCommand.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/BolusCommand.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter.commands; +package info.nightscout.androidaps.plugins.PumpCombo.scripter.commands; import android.os.SystemClock; diff --git a/app/src/main/java/de/jotomo/ruffyscripter/commands/CancelTbrCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/CancelTbrCommand.java similarity index 95% rename from app/src/main/java/de/jotomo/ruffyscripter/commands/CancelTbrCommand.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/CancelTbrCommand.java index 7d6fa98d37..de4bb27862 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/commands/CancelTbrCommand.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/CancelTbrCommand.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter.commands; +package info.nightscout.androidaps.plugins.PumpCombo.scripter.commands; import org.monkey.d.ruffy.ruffy.driver.display.MenuType; import org.slf4j.Logger; @@ -7,7 +7,7 @@ import org.slf4j.LoggerFactory; import java.util.Collections; import java.util.List; -import de.jotomo.ruffyscripter.PumpState; +import info.nightscout.androidaps.plugins.PumpCombo.scripter.PumpState; import info.nightscout.androidaps.MainApp; // TODO robustness: can a TBR run out, whilst we're trying to cancel it? diff --git a/app/src/main/java/de/jotomo/ruffyscripter/commands/CancellableBolusCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/CancellableBolusCommand.java similarity index 92% rename from app/src/main/java/de/jotomo/ruffyscripter/commands/CancellableBolusCommand.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/CancellableBolusCommand.java index b1194ae0c6..92edfff6b1 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/commands/CancellableBolusCommand.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/CancellableBolusCommand.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter.commands; +package info.nightscout.androidaps.plugins.PumpCombo.scripter.commands; import android.os.SystemClock; @@ -11,13 +11,13 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import de.jotomo.ruffyscripter.PumpState; -import de.jotomo.ruffyscripter.RuffyScripter; +import info.nightscout.androidaps.plugins.PumpCombo.scripter.PumpState; +import info.nightscout.androidaps.plugins.PumpCombo.scripter.RuffyScripter; -import static de.jotomo.ruffyscripter.commands.CancellableBolusCommand.ProgressReportCallback.State.DELIVERED; -import static de.jotomo.ruffyscripter.commands.CancellableBolusCommand.ProgressReportCallback.State.DELIVERING; -import static de.jotomo.ruffyscripter.commands.CancellableBolusCommand.ProgressReportCallback.State.STOPPED; -import static de.jotomo.ruffyscripter.commands.CancellableBolusCommand.ProgressReportCallback.State.STOPPING; +import static info.nightscout.androidaps.plugins.PumpCombo.scripter.commands.CancellableBolusCommand.ProgressReportCallback.State.DELIVERED; +import static info.nightscout.androidaps.plugins.PumpCombo.scripter.commands.CancellableBolusCommand.ProgressReportCallback.State.DELIVERING; +import static info.nightscout.androidaps.plugins.PumpCombo.scripter.commands.CancellableBolusCommand.ProgressReportCallback.State.STOPPED; +import static info.nightscout.androidaps.plugins.PumpCombo.scripter.commands.CancellableBolusCommand.ProgressReportCallback.State.STOPPING; public class CancellableBolusCommand extends BolusCommand { private static final Logger log = LoggerFactory.getLogger(CancellableBolusCommand.class); diff --git a/app/src/main/java/de/jotomo/ruffyscripter/commands/Command.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/Command.java similarity index 75% rename from app/src/main/java/de/jotomo/ruffyscripter/commands/Command.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/Command.java index 60fa3c730f..f1572f56aa 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/commands/Command.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/Command.java @@ -1,8 +1,8 @@ -package de.jotomo.ruffyscripter.commands; +package info.nightscout.androidaps.plugins.PumpCombo.scripter.commands; import java.util.List; -import de.jotomo.ruffyscripter.RuffyScripter; +import info.nightscout.androidaps.plugins.PumpCombo.scripter.RuffyScripter; /** * Interface for all commands to be executed by the pump. diff --git a/app/src/main/java/de/jotomo/ruffyscripter/commands/CommandException.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/CommandException.java similarity index 94% rename from app/src/main/java/de/jotomo/ruffyscripter/commands/CommandException.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/CommandException.java index d2f31cc8e2..75cac9014a 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/commands/CommandException.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/CommandException.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter.commands; +package info.nightscout.androidaps.plugins.PumpCombo.scripter.commands; public class CommandException extends RuntimeException { public boolean success = false; diff --git a/app/src/main/java/de/jotomo/ruffyscripter/commands/CommandResult.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/CommandResult.java similarity index 88% rename from app/src/main/java/de/jotomo/ruffyscripter/commands/CommandResult.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/CommandResult.java index 9d1bbb321e..c99c6f29df 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/commands/CommandResult.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/CommandResult.java @@ -1,9 +1,9 @@ -package de.jotomo.ruffyscripter.commands; +package info.nightscout.androidaps.plugins.PumpCombo.scripter.commands; import java.util.Date; -import de.jotomo.ruffyscripter.History; -import de.jotomo.ruffyscripter.PumpState; +import info.nightscout.androidaps.plugins.PumpCombo.scripter.History; +import info.nightscout.androidaps.plugins.PumpCombo.scripter.PumpState; public class CommandResult { public boolean success; diff --git a/app/src/main/java/de/jotomo/ruffyscripter/commands/GetBasalRateProfileCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/GetBasalRateProfileCommand.java similarity index 96% rename from app/src/main/java/de/jotomo/ruffyscripter/commands/GetBasalRateProfileCommand.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/GetBasalRateProfileCommand.java index ff842af5dd..4e4aeafbca 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/commands/GetBasalRateProfileCommand.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/GetBasalRateProfileCommand.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter.commands; +package info.nightscout.androidaps.plugins.PumpCombo.scripter.commands; import android.util.Log; @@ -10,7 +10,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import de.jotomo.ruffyscripter.RuffyScripter; +import info.nightscout.androidaps.plugins.PumpCombo.scripter.RuffyScripter; public class GetBasalRateProfileCommand extends BaseCommand { private static final Logger log = LoggerFactory.getLogger(GetBasalRateProfileCommand.class); diff --git a/app/src/main/java/de/jotomo/ruffyscripter/commands/GetPumpStateCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/GetPumpStateCommand.java similarity index 96% rename from app/src/main/java/de/jotomo/ruffyscripter/commands/GetPumpStateCommand.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/GetPumpStateCommand.java index b298fcb41e..1f29580216 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/commands/GetPumpStateCommand.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/GetPumpStateCommand.java @@ -1,11 +1,11 @@ -package de.jotomo.ruffyscripter.commands; +package info.nightscout.androidaps.plugins.PumpCombo.scripter.commands; import org.monkey.d.ruffy.ruffy.driver.display.MenuType; import java.util.Collections; import java.util.List; -import static de.jotomo.ruffyscripter.commands.GetPumpStateCommand.Stepper.runStep; +import static info.nightscout.androidaps.plugins.PumpCombo.scripter.commands.GetPumpStateCommand.Stepper.runStep; public class GetPumpStateCommand extends BaseCommand { interface Step { diff --git a/app/src/main/java/de/jotomo/ruffyscripter/commands/GetReservoirLevelCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/GetReservoirLevelCommand.java similarity index 91% rename from app/src/main/java/de/jotomo/ruffyscripter/commands/GetReservoirLevelCommand.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/GetReservoirLevelCommand.java index 3a620a0fef..b6c80cb1a6 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/commands/GetReservoirLevelCommand.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/GetReservoirLevelCommand.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter.commands; +package info.nightscout.androidaps.plugins.PumpCombo.scripter.commands; import java.util.List; diff --git a/app/src/main/java/de/jotomo/ruffyscripter/commands/SetBasalRateProfileCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/SetBasalRateProfileCommand.java similarity index 80% rename from app/src/main/java/de/jotomo/ruffyscripter/commands/SetBasalRateProfileCommand.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/SetBasalRateProfileCommand.java index 6d98c94d42..7dd2d029ba 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/commands/SetBasalRateProfileCommand.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/SetBasalRateProfileCommand.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter.commands; +package info.nightscout.androidaps.plugins.PumpCombo.scripter.commands; import java.util.List; diff --git a/app/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/SetTbrCommand.java similarity index 99% rename from app/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/SetTbrCommand.java index 4ebee15fe6..b5449ffc7d 100644 --- a/app/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/commands/SetTbrCommand.java @@ -1,4 +1,4 @@ -package de.jotomo.ruffyscripter.commands; +package info.nightscout.androidaps.plugins.PumpCombo.scripter.commands; import android.os.SystemClock;