Deleted classes, added auxstate action

client/src/main/java/me/retrodaredevil/solarthing/actions/ActionNode.java

@@ -5,6 +5,7 @@
 import me.retrodaredevil.action.Action;
 import me.retrodaredevil.solarthing.actions.environment.ActionEnvironment;
 import me.retrodaredevil.solarthing.actions.mate.ACModeActionNode;
+import me.retrodaredevil.solarthing.actions.mate.AuxStateActionNode;
 import me.retrodaredevil.solarthing.actions.mate.MateCommandActionNode;
 import me.retrodaredevil.solarthing.actions.mate.MateCommandWaitActionNode;
 
@@ -20,6 +21,7 @@
 		@JsonSubTypes.Type(RaceActionNode.class),
 
 		@JsonSubTypes.Type(ACModeActionNode.class),
+		@JsonSubTypes.Type(AuxStateActionNode.class),
 		@JsonSubTypes.Type(MateCommandActionNode.class),
 		@JsonSubTypes.Type(MateCommandWaitActionNode.class),
 })

client/src/main/java/me/retrodaredevil/solarthing/actions/mate/ACModeActionNode.java

@@ -19,14 +19,16 @@
 public class ACModeActionNode implements ActionNode {
 	private static final Logger LOGGER = LoggerFactory.getLogger(ACModeActionNode.class);
 	private final ACMode acMode;
+	private final boolean not;
 
 	@JsonCreator
-	public ACModeActionNode(@JsonProperty("mode") String mode) {
-		this(parseMode(mode));
+	public ACModeActionNode(@JsonProperty(value = "mode", required = true) String mode, @JsonProperty("not") Boolean not) {
+		this(parseMode(mode), Boolean.TRUE.equals(not));
 	}
 
-	public ACModeActionNode(ACMode acMode) {
+	public ACModeActionNode(ACMode acMode, boolean not) {
 		this.acMode = acMode;
+		this.not = not;
 	}
 	private static ACMode parseMode(String modeName) {
 		modeName = modeName.replaceAll(" ", "").toLowerCase();
@@ -53,7 +55,7 @@ protected void onUpdate() {
 				if (fxStatusPacket == null) {
 					LOGGER.warn("No master FX Status Packet!");
 				} else {
-					setDone(fxStatusPacket.getACMode() == acMode);
+					setDone((fxStatusPacket.getACMode() == acMode) == !not);
 				}
 			}
 		};

client/src/main/java/me/retrodaredevil/solarthing/actions/mate/AuxStateActionNode.java

@@ -0,0 +1,46 @@
+package me.retrodaredevil.solarthing.actions.mate;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import me.retrodaredevil.action.Action;
+import me.retrodaredevil.action.SimpleAction;
+import me.retrodaredevil.solarthing.actions.ActionNode;
+import me.retrodaredevil.solarthing.actions.PacketGroupProvider;
+import me.retrodaredevil.solarthing.actions.environment.ActionEnvironment;
+import me.retrodaredevil.solarthing.actions.environment.LatestPacketGroupEnvironment;
+import me.retrodaredevil.solarthing.solar.outback.OutbackUtil;
+import me.retrodaredevil.solarthing.solar.outback.fx.FXStatusPacket;
+import me.retrodaredevil.solarthing.solar.outback.fx.MiscMode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@JsonTypeName("auxstate")
+public class AuxStateActionNode implements ActionNode {
+	private static final Logger LOGGER = LoggerFactory.getLogger(AuxStateActionNode.class);
+	private final boolean on;
+
+	@JsonCreator
+	public AuxStateActionNode(@JsonProperty(value = "on", required = true) boolean on) {
+		this.on = on;
+	}
+
+	@Override
+	public Action createAction(ActionEnvironment actionEnvironment) {
+		LatestPacketGroupEnvironment latestPacketGroupEnvironment = actionEnvironment.getInjectEnvironment().get(LatestPacketGroupEnvironment.class);
+		PacketGroupProvider packetGroupProvider = latestPacketGroupEnvironment.getPacketGroupProvider();
+		return new SimpleAction(false) {
+			@Override
+			protected void onUpdate() {
+				super.onUpdate();
+				FXStatusPacket fxStatusPacket = OutbackUtil.getMasterFX(packetGroupProvider.getPacketGroup());
+				if (fxStatusPacket == null) {
+					LOGGER.warn("No master FX Status Packet!");
+				} else {
+					setDone(fxStatusPacket.getMiscModes().contains(MiscMode.AUX_OUTPUT_ON) == on);
+				}
+			}
+		};
+
+	}
+}

client/src/main/java/me/retrodaredevil/solarthing/program/ActionNodeDataReceiver.java

@@ -3,7 +3,6 @@
 import me.retrodaredevil.action.Action;
 import me.retrodaredevil.action.ActionMultiplexer;
 import me.retrodaredevil.action.Actions;
-import me.retrodaredevil.solarthing.DataReceiver;
 import me.retrodaredevil.solarthing.DataSource;
 import me.retrodaredevil.solarthing.PacketGroupReceiver;
 import me.retrodaredevil.solarthing.SolarThingConstants;

config_templates/commands/generator_shut_off.json

@@ -13,20 +13,82 @@
       { "type": "unlock", "name": "send_commands" }
     ]
   },
-  "run_commands": {
+  "force_drop": {
     "type": "queue",
     "actions": [
       { "type": "matecommand", "command": "DROP" },
+      { "type": "matecommandwait" },
+      {
+        "type": "race",
+        "racers": [
+          [{ "type": "acmode", "mode": "AC USE", "not": true }, { "type": "pass"}],
+          [{ "type": "waitms", "wait": 2300}, { "type": "call", "name": "force_drop"}]
+        ]
+      }
+    ]
+  },
+  "force_aux_on": {
+    "type": "queue",
+    "actions": [
       { "type": "matecommand", "command": "AUX ON" },
       { "type": "matecommandwait" },
+      {
+        "type": "race",
+        "racers": [
+          [{ "type": "auxstate", "on": true}, { "type": "pass"}],
+          [{ "type": "waitms", "wait": 2300}, { "type": "call", "name": "force_aux_on"}]
+        ]
+      }
+    ]
+  },
+  "force_aux_off": {
+    "type": "queue",
+    "actions": [
+      { "type": "matecommand", "command": "AUX OFF" },
+      { "type": "matecommandwait" },
+      {
+        "type": "race",
+        "racers": [
+          [{ "type": "auxstate", "on": false}, { "type": "pass"}],
+          [{ "type": "waitms", "wait": 2300}, { "type": "call", "name": "force_aux_off"}]
+        ]
+      }
+    ]
+  },
+  "run_commands": {
+    "type": "queue",
+    "actions": [
+      {
+        "type": "race",
+        "racers": [
+          [{ "type": "call", "name": "force_drop" }, { "type": "pass" }],
+          [{ "type": "waitms", "wait": 5300}, { "type": "pass" }]
+        ]
+      },
+      { "type": "waitms", "wait": 1000},
+      {
+        "type": "race",
+        "racers": [
+          [{ "type": "call", "name": "force_aux_on" }, { "type": "pass" }],
+          [{ "type": "waitms", "wait": 5300}, { "type": "pass" }]
+        ]
+      },
       {
         "type": "race",
         "racers": [
           [{ "type": "acmode", "mode": "NO AC" }, { "type": "pass" }],
           [{ "type": "waitms", "wait": 10000 }, { "type": "log", "message": "AC is still present!"}]
         ]
       },
-      { "type": "matecommand", "command": "AUX OFF"},
+      { "type": "waitms", "wait": 500},
+      {
+        "type": "race",
+        "racers": [
+          [{ "type": "call", "name": "force_aux_off" }, { "type": "pass" }],
+          [{ "type": "waitms", "wait": 5300}, { "type": "pass" }]
+        ]
+      },
+      { "type": "waitms", "wait": 2000},
       { "type": "matecommand", "command": "USE"},
       { "type": "matecommandwait" },
       { "type": "log", "message": "Sent all commands!"}

core/src/main/java/me/retrodaredevil/solarthing/solar/event/SolarEventPacket.java

@@ -10,8 +10,6 @@
  */
 @JsonSubTypes({
 		@JsonSubTypes.Type(FXACModeChangePacket.class),
-		@JsonSubTypes.Type(FXDayEndPacket.class),
-		@JsonSubTypes.Type(MXDayEndPacket.class),
 		@JsonSubTypes.Type(MXRawDayEndPacket.class),
 		@JsonSubTypes.Type(FXAuxStateChangePacket.class),
 		@JsonSubTypes.Type(FXOperationalModeChangePacket.class),

core/src/main/java/me/retrodaredevil/solarthing/solar/extra/SolarExtraPacket.java

@@ -2,14 +2,10 @@
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import me.retrodaredevil.solarthing.solar.SolarPacket;
-import me.retrodaredevil.solarthing.solar.outback.fx.charge.FXChargingPacket;
 import me.retrodaredevil.solarthing.solar.outback.fx.extra.DailyFXPacket;
-import me.retrodaredevil.solarthing.solar.outback.mx.extra.DailyMXPacket;
 
 @JsonSubTypes({
 		@JsonSubTypes.Type(DailyFXPacket.class),
-		@JsonSubTypes.Type(DailyMXPacket.class),
-		@JsonSubTypes.Type(FXChargingPacket.class),
 })
 public interface SolarExtraPacket extends SolarPacket<SolarExtraPacketType> {
 }