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 f134c31ec7..eef8c94189 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,8 +17,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import info.nightscout.androidaps.plugins.PumpCombo.spi.PumpState; -import info.nightscout.androidaps.plugins.PumpCombo.spi.CommandResult; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi.PumpState; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi.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 fde3410c89..300c12a5e5 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 @@ -29,11 +29,11 @@ import info.nightscout.androidaps.interfaces.PumpInterface; import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin; import info.nightscout.androidaps.plugins.Overview.events.EventOverviewBolusProgress; import info.nightscout.androidaps.plugins.PumpCombo.events.EventComboPumpUpdateGUI; -import info.nightscout.androidaps.plugins.PumpCombo.scripter.RuffyScripter; -import info.nightscout.androidaps.plugins.PumpCombo.spi.BolusProgressReporter; -import info.nightscout.androidaps.plugins.PumpCombo.spi.CommandResult; -import info.nightscout.androidaps.plugins.PumpCombo.spi.PumpState; -import info.nightscout.androidaps.plugins.PumpCombo.spi.RuffyCommands; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.RuffyScripter; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi.BolusProgressReporter; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi.CommandResult; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi.PumpState; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi.RuffyCommands; import info.nightscout.utils.DateUtil; import info.nightscout.utils.SP; 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 4988508e1b..83fb0d03fe 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,8 +5,8 @@ import android.support.annotation.Nullable; import java.util.Date; -import info.nightscout.androidaps.plugins.PumpCombo.spi.PumpState; -import info.nightscout.androidaps.plugins.PumpCombo.spi.CommandResult; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi.PumpState; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi.CommandResult; class ComboPump { @Nullable diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/RuffyScripter.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/RuffyScripter.java similarity index 95% rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/RuffyScripter.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/RuffyScripter.java index 655cf7acc9..d2d796976a 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/RuffyScripter.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/RuffyScripter.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.PumpCombo.scripter; +package info.nightscout.androidaps.plugins.PumpCombo.ruffy; import android.content.ComponentName; import android.content.Context; @@ -24,22 +24,22 @@ import java.util.Date; import java.util.List; import info.nightscout.androidaps.MainApp; -import info.nightscout.androidaps.plugins.PumpCombo.scripter.internal.commands.BolusCommand; -import info.nightscout.androidaps.plugins.PumpCombo.scripter.internal.commands.CancelTbrCommand; -import info.nightscout.androidaps.plugins.PumpCombo.scripter.internal.commands.Command; -import info.nightscout.androidaps.plugins.PumpCombo.scripter.internal.commands.CommandException; -import info.nightscout.androidaps.plugins.PumpCombo.scripter.internal.commands.GetPumpStateCommand; -import info.nightscout.androidaps.plugins.PumpCombo.scripter.internal.commands.ReadBasalProfileCommand; -import info.nightscout.androidaps.plugins.PumpCombo.scripter.internal.commands.ReadHistoryCommand; -import info.nightscout.androidaps.plugins.PumpCombo.scripter.internal.commands.ReadReserverLevelCommand; -import info.nightscout.androidaps.plugins.PumpCombo.scripter.internal.commands.SetBasalProfileCommand; -import info.nightscout.androidaps.plugins.PumpCombo.scripter.internal.commands.SetTbrCommand; -import info.nightscout.androidaps.plugins.PumpCombo.spi.BasalProfile; -import info.nightscout.androidaps.plugins.PumpCombo.spi.BolusProgressReporter; -import info.nightscout.androidaps.plugins.PumpCombo.spi.CommandResult; -import info.nightscout.androidaps.plugins.PumpCombo.spi.PumpHistory; -import info.nightscout.androidaps.plugins.PumpCombo.spi.PumpState; -import info.nightscout.androidaps.plugins.PumpCombo.spi.RuffyCommands; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.internal.scripter.commands.BolusCommand; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.internal.scripter.commands.CancelTbrCommand; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.internal.scripter.commands.Command; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.internal.scripter.commands.CommandException; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.internal.scripter.commands.GetPumpStateCommand; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.internal.scripter.commands.ReadBasalProfileCommand; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.internal.scripter.commands.ReadHistoryCommand; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.internal.scripter.commands.ReadReserverLevelCommand; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.internal.scripter.commands.SetBasalProfileCommand; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.internal.scripter.commands.SetTbrCommand; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi.BasalProfile; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi.BolusProgressReporter; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi.CommandResult; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi.PumpHistory; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi.PumpState; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi.RuffyCommands; // 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/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/BaseCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/BaseCommand.java similarity index 76% rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/BaseCommand.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/BaseCommand.java index 97d88eeb6a..4075a8b666 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/BaseCommand.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/BaseCommand.java @@ -1,6 +1,6 @@ -package info.nightscout.androidaps.plugins.PumpCombo.scripter.internal.commands; +package info.nightscout.androidaps.plugins.PumpCombo.ruffy.internal.scripter.commands; -import info.nightscout.androidaps.plugins.PumpCombo.scripter.RuffyScripter; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.RuffyScripter; public abstract class BaseCommand implements Command { // RS will inject itself here diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/BolusCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/BolusCommand.java similarity index 96% rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/BolusCommand.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/BolusCommand.java index f60ac734b6..047da7be1d 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/BolusCommand.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/BolusCommand.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.PumpCombo.scripter.internal.commands; +package info.nightscout.androidaps.plugins.PumpCombo.ruffy.internal.scripter.commands; import android.os.SystemClock; @@ -11,11 +11,11 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import info.nightscout.androidaps.plugins.PumpCombo.scripter.RuffyScripter; -import info.nightscout.androidaps.plugins.PumpCombo.spi.BolusProgressReporter; -import info.nightscout.androidaps.plugins.PumpCombo.spi.CommandResult; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.RuffyScripter; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi.BolusProgressReporter; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi.CommandResult; -import static info.nightscout.androidaps.plugins.PumpCombo.spi.BolusProgressReporter.State.*; +import static info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi.BolusProgressReporter.State.*; public class BolusCommand extends BaseCommand { private static final Logger log = LoggerFactory.getLogger(BolusCommand.class); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/CancelTbrCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/CancelTbrCommand.java similarity index 92% rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/CancelTbrCommand.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/CancelTbrCommand.java index 98bd17409e..1bb667bf96 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/CancelTbrCommand.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/CancelTbrCommand.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.PumpCombo.scripter.internal.commands; +package info.nightscout.androidaps.plugins.PumpCombo.ruffy.internal.scripter.commands; import org.monkey.d.ruffy.ruffy.driver.display.MenuType; import org.slf4j.Logger; @@ -7,9 +7,9 @@ import org.slf4j.LoggerFactory; import java.util.Collections; import java.util.List; -import info.nightscout.androidaps.plugins.PumpCombo.spi.PumpState; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi.PumpState; import info.nightscout.androidaps.MainApp; -import info.nightscout.androidaps.plugins.PumpCombo.spi.CommandResult; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi.CommandResult; // TODO robustness: can a TBR run out, whilst we're trying to cancel it? // Hm, we could just ignore TBRs that run out within the next 60s (0:01 or even 0:02 diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/Command.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/Command.java similarity index 66% rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/Command.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/Command.java index d68bed2907..02f620e834 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/Command.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/Command.java @@ -1,9 +1,9 @@ -package info.nightscout.androidaps.plugins.PumpCombo.scripter.internal.commands; +package info.nightscout.androidaps.plugins.PumpCombo.ruffy.internal.scripter.commands; import java.util.List; -import info.nightscout.androidaps.plugins.PumpCombo.scripter.RuffyScripter; -import info.nightscout.androidaps.plugins.PumpCombo.spi.CommandResult; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.RuffyScripter; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi.CommandResult; /** * Interface for all commands to be executed by the pump. diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/CommandException.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/CommandException.java similarity index 88% rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/CommandException.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/CommandException.java index 2368edbfa3..db9f57dd9a 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/CommandException.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/CommandException.java @@ -1,6 +1,6 @@ -package info.nightscout.androidaps.plugins.PumpCombo.scripter.internal.commands; +package info.nightscout.androidaps.plugins.PumpCombo.ruffy.internal.scripter.commands; -import info.nightscout.androidaps.plugins.PumpCombo.spi.CommandResult; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi.CommandResult; public class CommandException extends RuntimeException { public boolean success = false; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/GetBasalRateProfileCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/GetBasalRateProfileCommand.java similarity index 95% rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/GetBasalRateProfileCommand.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/GetBasalRateProfileCommand.java index 2a83c666e5..1241d99ae6 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/GetBasalRateProfileCommand.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/GetBasalRateProfileCommand.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.PumpCombo.scripter.internal.commands; +package info.nightscout.androidaps.plugins.PumpCombo.ruffy.internal.scripter.commands; import android.util.Log; @@ -10,8 +10,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import info.nightscout.androidaps.plugins.PumpCombo.scripter.RuffyScripter; -import info.nightscout.androidaps.plugins.PumpCombo.spi.CommandResult; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.RuffyScripter; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi.CommandResult; public class GetBasalRateProfileCommand extends BaseCommand { private static final Logger log = LoggerFactory.getLogger(GetBasalRateProfileCommand.class); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/GetPumpStateCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/GetPumpStateCommand.java similarity index 94% rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/GetPumpStateCommand.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/GetPumpStateCommand.java index 8fa6a267cd..392825a3bb 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/GetPumpStateCommand.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/GetPumpStateCommand.java @@ -1,13 +1,13 @@ -package info.nightscout.androidaps.plugins.PumpCombo.scripter.internal.commands; +package info.nightscout.androidaps.plugins.PumpCombo.ruffy.internal.scripter.commands; import org.monkey.d.ruffy.ruffy.driver.display.MenuType; import java.util.Collections; import java.util.List; -import info.nightscout.androidaps.plugins.PumpCombo.spi.CommandResult; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi.CommandResult; -import static info.nightscout.androidaps.plugins.PumpCombo.scripter.internal.commands.GetPumpStateCommand.Stepper.runStep; +import static info.nightscout.androidaps.plugins.PumpCombo.ruffy.internal.scripter.commands.GetPumpStateCommand.Stepper.runStep; public class GetPumpStateCommand extends BaseCommand { interface Step { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/ReadBasalProfileCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/ReadBasalProfileCommand.java similarity index 58% rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/ReadBasalProfileCommand.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/ReadBasalProfileCommand.java index a4267f317b..548743a372 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/ReadBasalProfileCommand.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/ReadBasalProfileCommand.java @@ -1,9 +1,9 @@ -package info.nightscout.androidaps.plugins.PumpCombo.scripter.internal.commands; +package info.nightscout.androidaps.plugins.PumpCombo.ruffy.internal.scripter.commands; import java.util.List; -import info.nightscout.androidaps.plugins.PumpCombo.scripter.RuffyScripter; -import info.nightscout.androidaps.plugins.PumpCombo.spi.CommandResult; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.RuffyScripter; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi.CommandResult; public class ReadBasalProfileCommand implements Command { @Override diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/ReadHistoryCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/ReadHistoryCommand.java similarity index 55% rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/ReadHistoryCommand.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/ReadHistoryCommand.java index 39a36c2819..108de2ccc9 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/ReadHistoryCommand.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/ReadHistoryCommand.java @@ -1,10 +1,10 @@ -package info.nightscout.androidaps.plugins.PumpCombo.scripter.internal.commands; +package info.nightscout.androidaps.plugins.PumpCombo.ruffy.internal.scripter.commands; import java.util.List; -import info.nightscout.androidaps.plugins.PumpCombo.spi.PumpHistory; -import info.nightscout.androidaps.plugins.PumpCombo.scripter.RuffyScripter; -import info.nightscout.androidaps.plugins.PumpCombo.spi.CommandResult; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi.PumpHistory; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.RuffyScripter; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi.CommandResult; public class ReadHistoryCommand implements Command { public ReadHistoryCommand(PumpHistory knownHistory) { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/ReadReserverLevelCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/ReadReserverLevelCommand.java similarity index 58% rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/ReadReserverLevelCommand.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/ReadReserverLevelCommand.java index 55741e0ee5..9afea6751c 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/ReadReserverLevelCommand.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/ReadReserverLevelCommand.java @@ -1,9 +1,9 @@ -package info.nightscout.androidaps.plugins.PumpCombo.scripter.internal.commands; +package info.nightscout.androidaps.plugins.PumpCombo.ruffy.internal.scripter.commands; import java.util.List; -import info.nightscout.androidaps.plugins.PumpCombo.scripter.RuffyScripter; -import info.nightscout.androidaps.plugins.PumpCombo.spi.CommandResult; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.RuffyScripter; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi.CommandResult; public class ReadReserverLevelCommand implements Command { @Override diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/SetBasalProfileCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/SetBasalProfileCommand.java similarity index 55% rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/SetBasalProfileCommand.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/SetBasalProfileCommand.java index 1c3fdd6ba5..228bf713e4 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/SetBasalProfileCommand.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/SetBasalProfileCommand.java @@ -1,10 +1,10 @@ -package info.nightscout.androidaps.plugins.PumpCombo.scripter.internal.commands; +package info.nightscout.androidaps.plugins.PumpCombo.ruffy.internal.scripter.commands; import java.util.List; -import info.nightscout.androidaps.plugins.PumpCombo.spi.BasalProfile; -import info.nightscout.androidaps.plugins.PumpCombo.scripter.RuffyScripter; -import info.nightscout.androidaps.plugins.PumpCombo.spi.CommandResult; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi.BasalProfile; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.RuffyScripter; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi.CommandResult; public class SetBasalProfileCommand implements Command { public SetBasalProfileCommand(BasalProfile basalProfile) { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/SetBasalRateProfileCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/SetBasalRateProfileCommand.java similarity index 64% rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/SetBasalRateProfileCommand.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/SetBasalRateProfileCommand.java index cde616be28..87c530015e 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/SetBasalRateProfileCommand.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/SetBasalRateProfileCommand.java @@ -1,8 +1,8 @@ -package info.nightscout.androidaps.plugins.PumpCombo.scripter.internal.commands; +package info.nightscout.androidaps.plugins.PumpCombo.ruffy.internal.scripter.commands; import java.util.List; -import info.nightscout.androidaps.plugins.PumpCombo.spi.CommandResult; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi.CommandResult; public class SetBasalRateProfileCommand extends BaseCommand { @Override diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/SetTbrCommand.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/SetTbrCommand.java similarity index 98% rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/SetTbrCommand.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/SetTbrCommand.java index f9b5df4621..e3e6398700 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/scripter/internal/commands/SetTbrCommand.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/internal/scripter/commands/SetTbrCommand.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.PumpCombo.scripter.internal.commands; +package info.nightscout.androidaps.plugins.PumpCombo.ruffy.internal.scripter.commands; import android.os.SystemClock; @@ -12,7 +12,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import info.nightscout.androidaps.plugins.PumpCombo.spi.CommandResult; +import info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi.CommandResult; public class SetTbrCommand extends BaseCommand { private static final Logger log = LoggerFactory.getLogger(SetTbrCommand.class); diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/spi/BasalProfile.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/spi/BasalProfile.java new file mode 100644 index 0000000000..96c6f0a4bd --- /dev/null +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/spi/BasalProfile.java @@ -0,0 +1,4 @@ +package info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi; + +public class BasalProfile { +} diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/spi/BolusProgressReporter.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/spi/BolusProgressReporter.java similarity index 77% rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/spi/BolusProgressReporter.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/spi/BolusProgressReporter.java index c6955eac47..f7cdb0d36e 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/spi/BolusProgressReporter.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/spi/BolusProgressReporter.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.PumpCombo.spi; +package info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi; public interface BolusProgressReporter { enum State { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/spi/CommandResult.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/spi/CommandResult.java similarity index 96% rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/spi/CommandResult.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/spi/CommandResult.java index 57b366775a..6a73235d79 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/spi/CommandResult.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/spi/CommandResult.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.PumpCombo.spi; +package info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi; import java.util.Date; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/spi/PumpHistory.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/spi/PumpHistory.java new file mode 100644 index 0000000000..9f326ac247 --- /dev/null +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/spi/PumpHistory.java @@ -0,0 +1,4 @@ +package info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi; + +public class PumpHistory { +} diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/spi/PumpState.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/spi/PumpState.java similarity index 97% rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/spi/PumpState.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/spi/PumpState.java index b6952b9308..5038913e7a 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/spi/PumpState.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/spi/PumpState.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.PumpCombo.spi; +package info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi; import java.util.Date; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/spi/RuffyCommands.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/spi/RuffyCommands.java similarity index 91% rename from app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/spi/RuffyCommands.java rename to app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/spi/RuffyCommands.java index fa6047d8ef..991c0c6ed2 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/spi/RuffyCommands.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffy/spi/RuffyCommands.java @@ -1,4 +1,4 @@ -package info.nightscout.androidaps.plugins.PumpCombo.spi; +package info.nightscout.androidaps.plugins.PumpCombo.ruffy.spi; import java.util.Date; diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/spi/BasalProfile.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/spi/BasalProfile.java deleted file mode 100644 index fa9b6931ae..0000000000 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/spi/BasalProfile.java +++ /dev/null @@ -1,4 +0,0 @@ -package info.nightscout.androidaps.plugins.PumpCombo.spi; - -public class BasalProfile { -} diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/spi/PumpHistory.java b/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/spi/PumpHistory.java deleted file mode 100644 index 7ce5d8920e..0000000000 --- a/app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/spi/PumpHistory.java +++ /dev/null @@ -1,4 +0,0 @@ -package info.nightscout.androidaps.plugins.PumpCombo.spi; - -public class PumpHistory { -}