caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Move ruffyscripter to combo plugin package.

Browse source
This commit is contained in:
Johannes Mockenhaupt 2018-01-28 22:16:58 +01:00
parent 6c4c662c31
commit 3fde47d283
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
33 changed files with 96 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboAlertHistoryDialog.java
View file

@ -10,7 +10,7 @@ import android.widget.TextView;
import java.text.DateFormat; import java.text.DateFormat;
import java.util.List; import java.util.List;
import de.jotomo.ruffyscripter.history.PumpAlert; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpAlert;
import info.nightscout.androidaps.R; import info.nightscout.androidaps.R;
public class ComboAlertHistoryDialog extends DialogFragment { public class ComboAlertHistoryDialog extends DialogFragment {

4
app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboFragment.java
View file

@ -14,8 +14,8 @@ import android.widget.TextView;
import com.squareup.otto.Subscribe; import com.squareup.otto.Subscribe;
import de.jotomo.ruffyscripter.PumpState; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpState;
import de.jotomo.ruffyscripter.history.Bolus; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Bolus;
import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R; import info.nightscout.androidaps.R;
import info.nightscout.androidaps.plugins.Common.SubscriberFragment; import info.nightscout.androidaps.plugins.Common.SubscriberFragment;

24
app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPlugin.java
View file

@ -11,18 +11,18 @@ import org.slf4j.LoggerFactory;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import de.jotomo.ruffyscripter.BasalProfile; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BasalProfile;
import de.jotomo.ruffyscripter.BolusProgressReporter; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BolusProgressReporter;
import de.jotomo.ruffyscripter.CommandResult; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.CommandResult;
import de.jotomo.ruffyscripter.PumpState; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpState;
import de.jotomo.ruffyscripter.PumpWarningCodes; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpWarningCodes;
import de.jotomo.ruffyscripter.RuffyCommands; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.RuffyCommands;
import de.jotomo.ruffyscripter.RuffyScripter; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.RuffyScripter;
import de.jotomo.ruffyscripter.WarningOrErrorCode; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.WarningOrErrorCode;
import de.jotomo.ruffyscripter.history.Bolus; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Bolus;
import de.jotomo.ruffyscripter.history.PumpHistory; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpHistory;
import de.jotomo.ruffyscripter.history.PumpHistoryRequest; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpHistoryRequest;
import de.jotomo.ruffyscripter.history.Tbr; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Tbr;
import info.nightscout.androidaps.BuildConfig; import info.nightscout.androidaps.BuildConfig;
import info.nightscout.androidaps.MainApp; import info.nightscout.androidaps.MainApp;
import info.nightscout.androidaps.R; import info.nightscout.androidaps.R;

10
app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboPump.java
View file

@ -6,11 +6,11 @@ import android.support.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import de.jotomo.ruffyscripter.BasalProfile; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BasalProfile;
import de.jotomo.ruffyscripter.PumpState; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpState;
import de.jotomo.ruffyscripter.history.Bolus; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Bolus;
import de.jotomo.ruffyscripter.history.PumpAlert; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpAlert;
import de.jotomo.ruffyscripter.history.Tdd; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Tdd;
class ComboPump { class ComboPump {
boolean initialized = false; boolean initialized = false;

2
app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ComboTddHistoryDialog.java
View file

@ -11,7 +11,7 @@ import java.text.DateFormat;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import de.jotomo.ruffyscripter.history.Tdd; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Tdd;
import info.nightscout.androidaps.R; import info.nightscout.androidaps.R;
public class ComboTddHistoryDialog extends DialogFragment { public class ComboTddHistoryDialog extends DialogFragment {

2
app/src/main/java/de/jotomo/ruffyscripter/BasalProfile.java → app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/BasalProfile.java
View file

@ -1,4 +1,4 @@
package de.jotomo.ruffyscripter; package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter;
import java.util.Arrays; import java.util.Arrays;

2
app/src/main/java/de/jotomo/ruffyscripter/BolusProgressReporter.java → app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/BolusProgressReporter.java
View file

@ -1,4 +1,4 @@
package de.jotomo.ruffyscripter; package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter;
public interface BolusProgressReporter { public interface BolusProgressReporter {
enum State { enum State {

6
app/src/main/java/de/jotomo/ruffyscripter/CommandResult.java → app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/CommandResult.java
View file

@ -1,12 +1,12 @@
package de.jotomo.ruffyscripter; package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import de.jotomo.ruffyscripter.history.Bolus; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Bolus;
import de.jotomo.ruffyscripter.history.PumpHistory; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpHistory;
public class CommandResult { public class CommandResult {
/** Whether the command was executed successfully. */ /** Whether the command was executed successfully. */

2
app/src/main/java/de/jotomo/ruffyscripter/PumpErrorCodes.java → app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/PumpErrorCodes.java
View file

@ -1,4 +1,4 @@
package de.jotomo.ruffyscripter; package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter;
public class PumpErrorCodes { public class PumpErrorCodes {
public static final int CARTRIDGE_EMPTY = 1; public static final int CARTRIDGE_EMPTY = 1;

2
app/src/main/java/de/jotomo/ruffyscripter/PumpState.java → app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/PumpState.java
View file

@ -1,4 +1,4 @@
package de.jotomo.ruffyscripter; package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter;
/** State displayed on the main screen of the pump. */ /** State displayed on the main screen of the pump. */
public class PumpState { public class PumpState {

2
app/src/main/java/de/jotomo/ruffyscripter/PumpWarningCodes.java → app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/PumpWarningCodes.java
View file

@ -1,4 +1,4 @@
package de.jotomo.ruffyscripter; package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter;
public class PumpWarningCodes { public class PumpWarningCodes {
public static final int CARTRIDGE_LOW = 1; public static final int CARTRIDGE_LOW = 1;

4
app/src/main/java/de/jotomo/ruffyscripter/RuffyCommands.java → app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/RuffyCommands.java
View file

@ -1,6 +1,6 @@
package de.jotomo.ruffyscripter; package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter;
import de.jotomo.ruffyscripter.history.PumpHistoryRequest; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpHistoryRequest;
public interface RuffyCommands { public interface RuffyCommands {
/** Issues a bolus issues updates on progress through via {@link BolusProgressReporter}. */ /** Issues a bolus issues updates on progress through via {@link BolusProgressReporter}. */

28
app/src/main/java/de/jotomo/ruffyscripter/RuffyScripter.java → app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/RuffyScripter.java
View file

@ -1,4 +1,4 @@
package de.jotomo.ruffyscripter; package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
@ -28,18 +28,18 @@ import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import de.jotomo.ruffyscripter.history.PumpHistoryRequest; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpHistoryRequest;
import de.jotomo.ruffyscripter.commands.BolusCommand; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.BolusCommand;
import de.jotomo.ruffyscripter.commands.CancelTbrCommand; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.CancelTbrCommand;
import de.jotomo.ruffyscripter.commands.Command; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.Command;
import de.jotomo.ruffyscripter.commands.CommandException; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.CommandException;
import de.jotomo.ruffyscripter.commands.ConfirmAlertCommand; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.ConfirmAlertCommand;
import de.jotomo.ruffyscripter.commands.ReadBasalProfileCommand; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.ReadBasalProfileCommand;
import de.jotomo.ruffyscripter.commands.ReadHistoryCommand; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.ReadHistoryCommand;
import de.jotomo.ruffyscripter.commands.ReadPumpStateCommand; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.ReadPumpStateCommand;
import de.jotomo.ruffyscripter.commands.ReadReservoirLevelAndLastBolus; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.ReadReservoirLevelAndLastBolus;
import de.jotomo.ruffyscripter.commands.SetBasalProfileCommand; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.SetBasalProfileCommand;
import de.jotomo.ruffyscripter.commands.SetTbrCommand; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands.SetTbrCommand;
import info.nightscout.androidaps.BuildConfig; import info.nightscout.androidaps.BuildConfig;
/** /**
@ -74,7 +74,7 @@ public class RuffyScripter implements RuffyCommands {
@Override @Override
public void fail(String message) throws RemoteException { public void fail(String message) throws RemoteException {
// TODO 10-28 19:50:54.059 1426 1826 W RuffyScripter: [Thread-268] WARN [de.jotomo.ruffyscripter.RuffyScripter$1:78]: Ruffy warns: no connection possible // TODO 10-28 19:50:54.059 1426 1826 W RuffyScripter: [Thread-268] WARN [info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.RuffyScripter$1:78]: Ruffy warns: no connection possible
log.warn("Ruffy warns: " + message); log.warn("Ruffy warns: " + message);
} }

2
app/src/main/java/de/jotomo/ruffyscripter/WarningOrErrorCode.java → app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/WarningOrErrorCode.java
View file

@ -1,4 +1,4 @@
package de.jotomo.ruffyscripter; package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;

8
app/src/main/java/de/jotomo/ruffyscripter/commands/BaseCommand.java → app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/BaseCommand.java
View file

@ -1,11 +1,11 @@
package de.jotomo.ruffyscripter.commands; package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import de.jotomo.ruffyscripter.CommandResult; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.CommandResult;
import de.jotomo.ruffyscripter.PumpWarningCodes; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpWarningCodes;
import de.jotomo.ruffyscripter.RuffyScripter; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.RuffyScripter;
public abstract class BaseCommand implements Command { public abstract class BaseCommand implements Command {
// RS will inject itself here // RS will inject itself here

22
app/src/main/java/de/jotomo/ruffyscripter/commands/BolusCommand.java → app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/BolusCommand.java
View file

@ -1,4 +1,4 @@
package de.jotomo.ruffyscripter.commands; package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands;
import android.os.SystemClock; import android.os.SystemClock;
@ -11,17 +11,17 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import de.jotomo.ruffyscripter.BolusProgressReporter; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BolusProgressReporter;
import de.jotomo.ruffyscripter.PumpWarningCodes; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpWarningCodes;
import de.jotomo.ruffyscripter.WarningOrErrorCode; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.WarningOrErrorCode;
import de.jotomo.ruffyscripter.history.Bolus; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Bolus;
import de.jotomo.ruffyscripter.RuffyScripter; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.RuffyScripter;
import static de.jotomo.ruffyscripter.BolusProgressReporter.State.DELIVERED; import static info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BolusProgressReporter.State.DELIVERED;
import static de.jotomo.ruffyscripter.BolusProgressReporter.State.DELIVERING; import static info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BolusProgressReporter.State.DELIVERING;
import static de.jotomo.ruffyscripter.BolusProgressReporter.State.PROGRAMMING; import static info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BolusProgressReporter.State.PROGRAMMING;
import static de.jotomo.ruffyscripter.BolusProgressReporter.State.STOPPED; import static info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BolusProgressReporter.State.STOPPED;
import static de.jotomo.ruffyscripter.BolusProgressReporter.State.STOPPING; import static info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BolusProgressReporter.State.STOPPING;
public class BolusCommand extends BaseCommand { public class BolusCommand extends BaseCommand {
private static final Logger log = LoggerFactory.getLogger(BolusCommand.class); private static final Logger log = LoggerFactory.getLogger(BolusCommand.class);

6
app/src/main/java/de/jotomo/ruffyscripter/commands/CancelTbrCommand.java → app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/CancelTbrCommand.java
View file

@ -1,11 +1,11 @@
package de.jotomo.ruffyscripter.commands; package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands;
import org.monkey.d.ruffy.ruffy.driver.display.MenuType; import org.monkey.d.ruffy.ruffy.driver.display.MenuType;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import de.jotomo.ruffyscripter.PumpState; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpState;
import de.jotomo.ruffyscripter.PumpWarningCodes; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpWarningCodes;
public class CancelTbrCommand extends BaseCommand { public class CancelTbrCommand extends BaseCommand {
private static final Logger log = LoggerFactory.getLogger(CancelTbrCommand.class); private static final Logger log = LoggerFactory.getLogger(CancelTbrCommand.class);

6
app/src/main/java/de/jotomo/ruffyscripter/commands/Command.java → app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/Command.java
View file

@ -1,9 +1,9 @@
package de.jotomo.ruffyscripter.commands; package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands;
import java.util.List; import java.util.List;
import de.jotomo.ruffyscripter.RuffyScripter; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.RuffyScripter;
import de.jotomo.ruffyscripter.CommandResult; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.CommandResult;
/** /**
* Interface for all commands to be executed by the pump. * Interface for all commands to be executed by the pump.

2
app/src/main/java/de/jotomo/ruffyscripter/commands/CommandException.java → app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/CommandException.java
View file

@ -1,4 +1,4 @@
package de.jotomo.ruffyscripter.commands; package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands;
public class CommandException extends RuntimeException { public class CommandException extends RuntimeException {
public CommandException(String message) { public CommandException(String message) {

2
app/src/main/java/de/jotomo/ruffyscripter/commands/ConfirmAlertCommand.java → app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ConfirmAlertCommand.java
View file

@ -1,4 +1,4 @@
package de.jotomo.ruffyscripter.commands; package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands;
public class ConfirmAlertCommand extends BaseCommand { public class ConfirmAlertCommand extends BaseCommand {
private final int warningCode; private final int warningCode;

6
app/src/main/java/de/jotomo/ruffyscripter/commands/ReadBasalProfileCommand.java → app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ReadBasalProfileCommand.java
View file

@ -1,4 +1,4 @@
package de.jotomo.ruffyscripter.commands; package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands;
import org.monkey.d.ruffy.ruffy.driver.display.Menu; import org.monkey.d.ruffy.ruffy.driver.display.Menu;
import org.monkey.d.ruffy.ruffy.driver.display.MenuAttribute; import org.monkey.d.ruffy.ruffy.driver.display.MenuAttribute;
@ -9,8 +9,8 @@ import org.slf4j.LoggerFactory;
import java.util.Arrays; import java.util.Arrays;
import de.jotomo.ruffyscripter.BasalProfile; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BasalProfile;
import de.jotomo.ruffyscripter.PumpState; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpState;
public class ReadBasalProfileCommand extends BaseCommand { public class ReadBasalProfileCommand extends BaseCommand {
private static final Logger log = LoggerFactory.getLogger(ReadBasalProfileCommand.class); private static final Logger log = LoggerFactory.getLogger(ReadBasalProfileCommand.class);

14
app/src/main/java/de/jotomo/ruffyscripter/commands/ReadHistoryCommand.java → app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ReadHistoryCommand.java
View file

@ -1,4 +1,4 @@
package de.jotomo.ruffyscripter.commands; package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
@ -13,12 +13,12 @@ import org.slf4j.LoggerFactory;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import de.jotomo.ruffyscripter.history.Bolus; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Bolus;
import de.jotomo.ruffyscripter.history.PumpAlert; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpAlert;
import de.jotomo.ruffyscripter.history.PumpHistory; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpHistory;
import de.jotomo.ruffyscripter.history.PumpHistoryRequest; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.PumpHistoryRequest;
import de.jotomo.ruffyscripter.history.Tbr; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Tbr;
import de.jotomo.ruffyscripter.history.Tdd; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Tdd;
// Note: TBRs are added to history only after they've completed running // Note: TBRs are added to history only after they've completed running
// TODO remove duplication // TODO remove duplication

2
app/src/main/java/de/jotomo/ruffyscripter/commands/ReadPumpStateCommand.java → app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ReadPumpStateCommand.java
View file

@ -1,4 +1,4 @@
package de.jotomo.ruffyscripter.commands; package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands;
public class ReadPumpStateCommand extends BaseCommand { public class ReadPumpStateCommand extends BaseCommand {
@Override @Override

4
app/src/main/java/de/jotomo/ruffyscripter/commands/ReadReservoirLevelAndLastBolus.java → app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/ReadReservoirLevelAndLastBolus.java
View file

@ -1,4 +1,4 @@
package de.jotomo.ruffyscripter.commands; package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
@ -10,7 +10,7 @@ import org.monkey.d.ruffy.ruffy.driver.display.menu.MenuTime;
import java.util.Date; import java.util.Date;
import de.jotomo.ruffyscripter.history.Bolus; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history.Bolus;
public class ReadReservoirLevelAndLastBolus extends BaseCommand { public class ReadReservoirLevelAndLastBolus extends BaseCommand {
@Override @Override

6
app/src/main/java/de/jotomo/ruffyscripter/commands/SetBasalProfileCommand.java → app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/SetBasalProfileCommand.java
View file

@ -1,4 +1,4 @@
package de.jotomo.ruffyscripter.commands; package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands;
import android.os.SystemClock; import android.os.SystemClock;
@ -12,8 +12,8 @@ import org.slf4j.LoggerFactory;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import de.jotomo.ruffyscripter.BasalProfile; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.BasalProfile;
import de.jotomo.ruffyscripter.PumpState; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpState;
public class SetBasalProfileCommand extends BaseCommand { public class SetBasalProfileCommand extends BaseCommand {
private static final Logger log = LoggerFactory.getLogger(SetBasalProfileCommand.class); private static final Logger log = LoggerFactory.getLogger(SetBasalProfileCommand.class);

8
app/src/main/java/de/jotomo/ruffyscripter/commands/SetTbrCommand.java → app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/commands/SetTbrCommand.java
View file

@ -1,4 +1,4 @@
package de.jotomo.ruffyscripter.commands; package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.commands;
import android.os.SystemClock; import android.os.SystemClock;
@ -12,9 +12,9 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import de.jotomo.ruffyscripter.PumpState; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpState;
import de.jotomo.ruffyscripter.PumpWarningCodes; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.PumpWarningCodes;
import de.jotomo.ruffyscripter.WarningOrErrorCode; import info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.WarningOrErrorCode;
public class SetTbrCommand extends BaseCommand { public class SetTbrCommand extends BaseCommand {
private static final Logger log = LoggerFactory.getLogger(SetTbrCommand.class); private static final Logger log = LoggerFactory.getLogger(SetTbrCommand.class);

2
app/src/main/java/de/jotomo/ruffyscripter/history/Bolus.java → app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/Bolus.java
View file

@ -1,4 +1,4 @@
package de.jotomo.ruffyscripter.history; package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history;
import java.util.Date; import java.util.Date;

2
app/src/main/java/de/jotomo/ruffyscripter/history/HistoryRecord.java → app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/HistoryRecord.java
View file

@ -1,4 +1,4 @@
package de.jotomo.ruffyscripter.history; package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history;
public abstract class HistoryRecord { public abstract class HistoryRecord {
public final long timestamp; public final long timestamp;

2
app/src/main/java/de/jotomo/ruffyscripter/history/PumpAlert.java → app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/PumpAlert.java
View file

@ -1,4 +1,4 @@
package de.jotomo.ruffyscripter.history; package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history;
import java.util.Date; import java.util.Date;

2
app/src/main/java/de/jotomo/ruffyscripter/history/PumpHistory.java → app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/PumpHistory.java
View file

@ -1,4 +1,4 @@
package de.jotomo.ruffyscripter.history; package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;

2
app/src/main/java/de/jotomo/ruffyscripter/history/PumpHistoryRequest.java → app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/PumpHistoryRequest.java
View file

@ -1,4 +1,4 @@
package de.jotomo.ruffyscripter.history; package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history;
import java.util.Date; import java.util.Date;

2
app/src/main/java/de/jotomo/ruffyscripter/history/Tbr.java → app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/Tbr.java
View file

@ -1,4 +1,4 @@
package de.jotomo.ruffyscripter.history; package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history;
import java.util.Date; import java.util.Date;

2
app/src/main/java/de/jotomo/ruffyscripter/history/Tdd.java → app/src/main/java/info/nightscout/androidaps/plugins/PumpCombo/ruffyscripter/history/Tdd.java
View file

@ -1,4 +1,4 @@
package de.jotomo.ruffyscripter.history; package info.nightscout.androidaps.plugins.PumpCombo.ruffyscripter.history;
import java.util.Date; import java.util.Date;