Started rework process

Author: iamniklas

.gitignore

@@ -6,3 +6,5 @@ build/
 *.aar
 *.war
 !gradle-wrapper.jar
+
+.codegpt

.idea/workspace.xml

@@ -0,0 +1,7 @@
+# log4j.properties
+log4j.rootLogger=INFO, stdout
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n

out/production/resources/log4j.properties

@@ -7,43 +7,40 @@
 import com.github.iamniklas.liocore.procedures.models.Direction;
 import com.google.gson.annotations.SerializedName;
 
+import java.util.ArrayList;
+
 public class LEDDataBundle {
-    @SerializedName("color_primary")
-    public ColorRGB colorPrimary;
-    @SerializedName("color_secondary")
-    public ColorRGB colorSecondary;
-    @SerializedName("color_tertiary")
-    public ColorRGB colorTertiary;
+    //used for monocolor, glitter, lighttoggle, lighttogglecineadjusted,
+    public ColorRGB color;
+
+    //used for multicolor
+    public ArrayList<ColorRGB> colors;
+
+    //used for javascript
     public String data;
-    @SerializedName("value_1")
-    public Float value1;
-    @SerializedName("value_2")
-    public Float value2;
-    @SerializedName("value_3")
-    public Float value3;
-    public Integer modulo;
+
+    //used for lightning
+    public Float attenuation;
+
+    //used for lighttoggle, lighttogglecineadjusted
     public InterpolationType interpolation;
-    public InterpolationType interpolationOverDistance;
+
+    //used for rainbow
     public Direction direction;
-    public Integer bpm;
     public Float repetitions;
+
+    //used for rainbow, rainbowmono, glitter
     public Float speed;
-    public Integer duration;
-    public Boolean pulsating;
-    public String path;
-    public AnimationData animationData;
 
-    //subBundle
-    @SerializedName("is_sub_procedure")
-    public Boolean isSubProcedure;
-    public Boolean indeterminate;
-    @SerializedName("pu_modulo")
-    public Integer puModulo;
-    @SerializedName("pu_modulo_invert")
-    public Boolean puModuloInvert;
+    //used for lightning, lighttoggle, lighttogglecineadjusted
+    public Integer duration;
 
+    //used in postupdate method
+    public Integer modulo;
+    public Boolean moduloInvert;
 
+    
     public transient LEDStripManager ledStrip;
-
     public transient ProcedureCalls procedureCalls;
+
 }

src/main/java/com/github/iamniklas/liocore/led/LEDDataBundle.java

@@ -1,10 +1,12 @@
 package com.github.iamniklas.liocore.procedures;
 
 import com.github.iamniklas.liocore.led.LEDStripManager;
+import org.apache.log4j.Logger;
 
 import java.util.ArrayList;
 
 public class ProcContainer {
+    private static final Logger log = Logger.getLogger(ProcContainer.class);
     private LEDStripManager ledStripManager;
     private ArrayList<Procedure> procedures = new ArrayList<>();
 
@@ -20,9 +22,15 @@ public Procedure getActiveProcedure() {
     }
 
     public void replaceActiveProcedure(Procedure _procedure) {
+        if(!_procedure.validateBundleData()) {
+            log.error("Procedure data validation failed. Some required fields for this procedure has not been set. Procedure will not be queued.");
+            return;
+        }
+
         removeAllCurrentProcedures();
         procedures.add(_procedure);
         _procedure.procCalls.onProcedureQueued();
+        _procedure.start();
     }
 
     public void queueProcedure(Procedure _procedure) {

src/main/java/com/github/iamniklas/liocore/procedures/ProcContainer.java

@@ -5,8 +5,10 @@
 import com.github.iamniklas.liocore.led.LEDStripManager;
 import com.github.iamniklas.liocore.led.colorspace.LIOColor;
 import com.github.iamniklas.liocore.network.LEDUpdateModel;
+import org.apache.log4j.Logger;
 
 public abstract class Procedure {
+    private static final Logger log = Logger.getLogger(Procedure.class);
     public LEDUpdateModel ledUpdateModel;
     protected LEDStripManager strip;
     public ProcedureCalls procCalls;
@@ -15,17 +17,18 @@ public abstract class Procedure {
     protected int modulo = 1;
     protected boolean moduloInvert = false;
     protected boolean isSubProcedure = false;
+    protected boolean bundleDataValid = false;
 
     public Procedure(LEDUpdateModel _updateModel) {
         ledUpdateModel = _updateModel;
 
         strip = ledUpdateModel.bundle.ledStrip;
         procCalls = ledUpdateModel.bundle.procedureCalls;
-        if(ledUpdateModel.bundle.puModulo != null) {
-            modulo = ledUpdateModel.bundle.puModulo;
+        if(ledUpdateModel.bundle.modulo != null) {
+            modulo = ledUpdateModel.bundle.modulo;
         }
-        if(ledUpdateModel.bundle.puModuloInvert != null) {
-            moduloInvert = ledUpdateModel.bundle.puModuloInvert;
+        if(ledUpdateModel.bundle.moduloInvert != null) {
+            moduloInvert = ledUpdateModel.bundle.moduloInvert;
         }
     }
 
@@ -34,14 +37,27 @@ public Procedure(LEDUpdateModel _updateModel) {
     public void updateLEDDataBundle(LEDDataBundle ledDataBundle) {
         ledUpdateModel.bundle = ledDataBundle;
 
-        if(ledUpdateModel.bundle.puModulo != null) {
-            modulo = ledUpdateModel.bundle.puModulo;
+        if(ledUpdateModel.bundle.modulo != null) {
+            modulo = ledUpdateModel.bundle.modulo;
         }
-        if(ledUpdateModel.bundle.puModuloInvert != null) {
-            moduloInvert = ledUpdateModel.bundle.puModuloInvert;
+        if(ledUpdateModel.bundle.moduloInvert != null) {
+            moduloInvert = ledUpdateModel.bundle.moduloInvert;
         }
     }
 
+    public boolean bundleIsValid() {
+        return bundleDataValid;
+    }
+
+    public abstract boolean validateBundleData();
+    protected boolean checkSingleField(Object _field, String _fieldName) {
+        if(_field == null) {
+            log.error("Field " + _fieldName + " is not set but required. Procedure will not be queued.");
+            return false;
+        }
+        return true;
+    }
+
     public void onActionReceived(ProcedureAction procedureAction) {
 
     }
@@ -60,9 +76,6 @@ public void postUpdate() {
                 }
             }
         }
-        if (step > steps) {
-            finishProcedure();
-        }
     }
 
     protected void finishProcedure(boolean _clearStrip) {
@@ -72,9 +85,4 @@ protected void finishProcedure(boolean _clearStrip) {
         }
         procCalls.onProcedureFinish();
     }
-
-    protected void finishProcedure() {
-        strip.procContainer.removeCurrentProcedure();
-        procCalls.onProcedureFinish();
-    }
 }

src/main/java/com/github/iamniklas/liocore/procedures/Procedure.java

@@ -6,24 +6,17 @@
 public class ProcedureFactory {
     public static Procedure getProcedure(LEDUpdateModel _updateModel) {
         switch (_updateModel.procedure) {
-            case BootComplete: return new BootCompleteProcedure(_updateModel);
-            case ColorInstantSet: return new ColorInstantSetProcedure(_updateModel);
-            case FadeInFadeOut: return new FadeInFadeOutProcedure(_updateModel);
-            case FadeToMultiColor: return new FadeToMultiColorProcedure(_updateModel);
-            case FadeToUniformColor: return new FadeToUniformColorProcedure(_updateModel);
-            case Blink: return new BlinkProcedure(_updateModel);
+            case Ready: return new ReadyProcedure(_updateModel);
+            case MonoColor: return new MonoColorProcedure(_updateModel);
             case Glitter: return new GlitterProcedure(_updateModel);
-            case Fill: return new FillStripProcedure(_updateModel);
-            case FillInterpolated: return new FillStripInterpolatedProcedure(_updateModel);
             case Rainbow: return new RainbowProcedure(_updateModel);
             case RainbowMono: return new RainbowMonoProcedure(_updateModel);
-            case JsonProcedure: return new JsonProcedure(_updateModel);
-            case Progress: return new ProgressProcedure(_updateModel);
+            case MultiColor: return new MultiColorProcedure(_updateModel);
             case Lightning: return new LightningProcedure(_updateModel);
             case Javascript: return new JavascriptProcedure(_updateModel);
             case LightToggle: return new LightToggleProcedure(_updateModel);
             case LightToggleCineAdjusted: return new LightToggleCineAdjustedProcedure(_updateModel);
-            case NoLongerReady: return new NoLongerReadyProcedure(_updateModel);
+            case Error: return new ErrorProcedure(_updateModel);
             default: return null;
         }
     }

src/main/java/com/github/iamniklas/liocore/procedures/ProcedureFactory.java

@@ -1,24 +1,19 @@
 package com.github.iamniklas.liocore.procedures;
 
 public enum ProcedureType {
-    BootComplete,
-    ColorInstantSet,
-    FadeInFadeOut,
-    FadeToMultiColor,
-    FadeToUniformColor,
-    Blink,
-    Glitter,
-    Fill,
-    FillInterpolated,
+    Ready,
+    Error,
+
+    MonoColor,
+    MultiColor,
+
     Rainbow,
     RainbowMono,
-    JsonProcedure,
-    Progress,
+
+    Glitter,
     Lightning,
-    MusicSync,
-    RandomColorBlocks,
     Javascript,
-    NoLongerReady,
+
     LightToggle,
     LightToggleCineAdjusted,
 }

src/main/java/com/github/iamniklas/liocore/procedures/ProcedureType.java

@@ -6,15 +6,12 @@
 import com.github.iamniklas.liocore.network.LEDUpdateModel;
 import com.github.iamniklas.liocore.procedures.Procedure;
 
-public class NoLongerReadyProcedure extends Procedure {
-
-    private LEDDataBundle bundle;
+public class ErrorProcedure extends Procedure {
 
     private boolean redLightActive = false;
 
-    public NoLongerReadyProcedure(LEDUpdateModel _ledUpdateModel) {
+    public ErrorProcedure(LEDUpdateModel _ledUpdateModel) {
         super(_ledUpdateModel);
-        bundle = _ledUpdateModel.bundle;
 
         steps = 60;
     }
@@ -38,12 +35,16 @@ public void update() {
         step++;
         if(step > steps) {
             strip.setAllPixels(LIOColor.fromRGB(ColorRGB.BLACK));
-            finishProcedure();
         }
     }
 
     @Override
     public void updateLEDDataBundle(LEDDataBundle ledDataBundle) {
 
     }
+
+    @Override
+    public boolean validateBundleData() {
+        return true;
+    }
 }