Merge pull request #61 from isuretpolos/develop

Dynamic adjustment of queue rates

.github/workflows/maven.yml

@@ -31,14 +31,14 @@ jobs:
           pwd;
           ls -l;
           ls -l target;
-          cp target/AetherOnePi-1.2.5.jar aetherOnePi/beta/release/;
-          cp target/AetherOnePi-1.2.5-jar-with-dependencies.jar aetherOnePi/beta/release/;
+          cp target/AetherOnePi-1.2.6.jar aetherOnePi/beta/release/;
+          cp target/AetherOnePi-1.2.6-jar-with-dependencies.jar aetherOnePi/beta/release/;
           cp backgrounds/*.jpg aetherOnePi/beta/release/backgrounds/;
           cp data_images/IMAGE_CHAKRAS/*.* aetherOnePi/beta/release/data_images/IMAGE_CHAKRAS/;
           cp data_images/IMAGE_AURAS/*.* aetherOnePi/beta/release/data_images/IMAGE_AURAS/;
           cp processing/HotbitsFromWebCam/HotbitsFromWebCam.pde aetherOnePi/beta/release/processing/HotbitsFromWebCam/;
           cp start*.bat aetherOnePi/beta/release/;
       - uses: actions/upload-artifact@master
         with:
-          name: AetherOnePi-1.2.5
+          name: AetherOnePi-1.2.6
           path: aetherOnePi/beta/release

README.md

@@ -1,16 +1,15 @@
 ![Logo](https://github.com/isuretpolos/AetherOnePi/raw/master/gui/src/assets/AetherOneLogo.png)
 
 # AetherOnePi
-
-Open Source Radionics for the Raspberry Pi
+## Open Source Radionics for the Raspberry Pi
 
 ![Dashboard](https://raw.githubusercontent.com/isuretpolos/AetherOnePi/master/documentation/screenshots/analysis.jpg)
 
 ## Java 1.8 runtime
 You need Java 1.8 as a runtime. Download it from [java.com](https://www.java.com/en/download/) and install it before you run the AetherOnePi application on your PC or Raspberry Pi.
 
 ## Download
-Download [Version 1.0](https://github.com/isuretpolos/AetherOnePi/releases/tag/1.0) (Standalone Client)
+Download [Version 1.2.6](https://github.com/isuretpolos/AetherOnePi/releases/tag/1.2.6) (Standalone Client)
 
 or download the Beta which is build after each change on the [Action tab](https://github.com/isuretpolos/AetherOnePi/actions). Just click on the Build Element and in the upper right corner you will see a Artifact Download Button if the build was a success.
 
@@ -28,6 +27,7 @@ Subscribe to my blog(s) and join the [community](https://vk.com/aetherone).
 - 2021-07-12 Binaural sounds when rate resonates during broadcast, some minor adjustments and improvements
 - 2021-07-14 Clinical symptoms comparing with the entire result (only for Clarke Materia Medica)
 - 2021-12-04 **Webcam** for hotbits integrated in AetherOnePi application
+- 2022-02-14 Dynamic adjustments feature (checks for GV after broadcast of a rate and reinserts it into the queue if necessary)
 
 # Resources
 ## Documentation
@@ -37,8 +37,6 @@ Subscribe to my blog(s) and join the [community](https://vk.com/aetherone).
 - [Radionics](https://radionics.home.blog)
 - [Isuret Polos](https://isuretpolos.wordpress.com)
 - [Open Source Radionics on Tumblr](https://aetheronepi.tumblr.com)
-## Literature
-- [My books](https://isuretpolos.wordpress.com/literature/)
 ## Communities
 - [Open Source Radionics](https://vk.com/aetherone)
 - [Youtube](https://www.youtube.com/channel/UCFVTNpzycFUoF4h0CbRS92Q)
@@ -50,6 +48,6 @@ As for the participation there are several possibilities.
 
 If you are a developer with skills in Java 1.8, Maven 3, JSON and Javascript and you know modern collaboration techniques like git / branching / forking, then you are welcome to create a fork and make a pull request. After review your code contribution the core team decide if it will be integrated into the master branch.
 
-Another possibility is to open issues for bugs, new features, improvemenents and so on. Note that we don't tolerate features for magical and manipulative purposes, this includes all "whishing machines" features. The AetherOne project is a holistic approach as the original radionic from Dr. Abrams was, not a coward technology for manipulation. Such attempts leads to blocking. For new rate lists contribution a [separate repository](https://github.com/isuretpolos/radionics-rates) exists.
+Another possibility is to open issues for bugs, new features, improvements and so on. Note that we don't tolerate features for magical and manipulative purposes, this includes all "whishing machines" features. The AetherOne project is a holistic approach as the original radionic from Dr. Abrams was, not a coward technology for manipulation. Such attempts leads to blocking. For new rate lists contribution a [separate repository](https://github.com/isuretpolos/radionics-rates) exists.
 
 Also feel free to promote the project with your own documentation or blog posts. You can send me per [email]([email protected]) a link and after review the link will be inserted here on Github.

documentation/dashboardNews.txt

@@ -1,6 +1,6 @@
 Welcome to AetherOnePi, an open source radionics project!
 
-The most current version is the 1.2.5 with a lots of new features!
+The most current version is the 1.2.6 with a lots of new features!
 
 Read the documentation by clicking on the button "DOCUMENTATION".
 Else join the VK community if you have questions and if

pom.xml

@@ -15,7 +15,7 @@
     <description>Open Source Radionics for the Rasperry Pi</description>
 
     <properties>
-        <aether.version>1.2.5</aether.version>
+        <aether.version>1.2.6</aether.version>
         <java.version>1.8</java.version>
         <commons-io.version>2.7</commons-io.version>
         <pi4j-core.version>1.2</pi4j-core.version>

src/main/java/de/isuret/polos/AetherOnePi/hotbits/HotbitsClient.java

@@ -4,7 +4,6 @@
 import de.isuret.polos.AetherOnePi.service.PiService;
 import de.isuret.polos.AetherOnePi.utils.HttpUtils;
 import lombok.Data;
-import lombok.Setter;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

src/main/java/de/isuret/polos/AetherOnePi/processing2/AetherOneUI.java

@@ -36,8 +36,8 @@
 import java.awt.image.DataBufferByte;
 import java.io.File;
 import java.io.IOException;
-import java.util.*;
 import java.util.List;
+import java.util.*;
 
 @Getter
 public class AetherOneUI extends PApplet implements IStatusReceiver {

src/main/java/de/isuret/polos/AetherOnePi/processing2/dialogs/ImprobabilityMeterVerticalDialog.java

@@ -0,0 +1,92 @@
+package de.isuret.polos.AetherOnePi.processing2.dialogs;
+
+import de.isuret.polos.AetherOnePi.processing2.hotbits.HotbitsHandler;
+import processing.core.PApplet;
+import processing.core.PFont;
+
+/**
+ * Measurement of improbable events in realtime
+ */
+public class ImprobabilityMeterVerticalDialog extends PApplet {
+
+    public static int WIDTH = 400;
+    public static int HEIGHT = 700;
+    private HotbitsHandler hotbitsHandler;
+
+    private int cumulativeValue = 0;
+    private Integer lastRandomValue = null;
+
+    public static void main(String[] args) {
+        init(new HotbitsHandler(null));
+    }
+
+    public static void init(HotbitsHandler hotbitsHandler) {
+
+        ImprobabilityMeterVerticalDialog improbabilityMeterDialog = new ImprobabilityMeterVerticalDialog(hotbitsHandler);
+        String[] args2 = {""};
+        PApplet.runSketch(args2, improbabilityMeterDialog);
+    }
+
+    public void exit() {
+        surface.setVisible(false);
+        dispose();
+        System.out.println("CLOSED");
+        System.exit(0);
+    }
+
+    public ImprobabilityMeterVerticalDialog(HotbitsHandler hotbitsHandler) {
+        this.hotbitsHandler = hotbitsHandler;
+    }
+
+    public void settings() {
+        size(WIDTH, HEIGHT);
+    }
+
+    public void setTitle(String title) {
+        frame.setTitle(title);
+    }
+
+    public void setup() {
+        background(0);
+        surface.setTitle("Improbability Meter");
+        PFont font = createFont("Verdana", 20);
+        textFont(font);
+    }
+
+    public void draw() {
+
+        background(0);
+
+        stroke(255);
+
+        if (lastRandomValue != null && lastRandomValue == 10) {
+            stroke(255,0,0);
+        }
+
+        text("points: " + cumulativeValue, 20, 30);
+
+        for (int i = 0; i < 24; i++) {
+
+            if (cumulativeValue > i * 10 ) {
+                fill(255,i*10,0);
+                rect(20, HEIGHT - (14 * i) - 60, WIDTH - 40, 10);
+            }
+        }
+
+        throwDice();
+
+        if (cumulativeValue > 0) {
+            cumulativeValue -= 1;
+        }
+    }
+
+    public void throwDice() {
+
+        if (lastRandomValue != null && lastRandomValue == 10) {
+
+            cumulativeValue += lastRandomValue;
+        }
+
+        lastRandomValue = hotbitsHandler.getInteger(10);
+    }
+}

src/main/java/de/isuret/polos/AetherOnePi/processing2/elements/AnalyseScreen.java

@@ -17,7 +17,6 @@
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.HashMap;
-import java.util.Locale;
 import java.util.Map;
 
 public class AnalyseScreen implements IDrawableElement, MouseClickObserver {

src/main/java/de/isuret/polos/AetherOnePi/processing2/elements/BroadcastElement.java

@@ -5,7 +5,6 @@
 import de.isuret.polos.AetherOnePi.sound.Binaural;
 import lombok.Getter;
 import lombok.Setter;
-import processing.sound.SoundFile;
 
 import java.io.File;
 import java.security.NoSuchAlgorithmException;
@@ -25,11 +24,12 @@ public class BroadcastElement implements IDrawableElement {
     public static final int WIDTH = 320;
     public static final int HEIGHT = 180;
     private static final String ADDITIONAL_RATES[] = {
-            "ENERGY", "FIRE", "POWER", "WOOD", "GROUNDING", "EARTH", "RYTHM",
-            "METAL", "WATER", "DEEPNESS", "DO NO HARM!", "UNITY", "LOVE"
+            "ENERGY", "FIRE", "POWER", "WOOD", "GROUNDING", "EARTH", "RHYTHM",
+            "METAL", "WATER", "DEEPNESS", "DO NO HARM!", "UNITY", "LOVE", "BALANCE"
     };
     private AetherOneUI p;
     private String tabName;
+    @Getter
     @Setter
     private Integer seconds;
     @Getter
@@ -62,6 +62,7 @@ public class BroadcastElement implements IDrawableElement {
 
     private Binaural binaural = null;
     private boolean playingSound = false;
+    private boolean dynamicAdjustments = false;
 
     public BroadcastElement(AetherOneUI p, String tabName, int seconds, String signature) {
         this.p = p;
@@ -96,6 +97,8 @@ public BroadcastElement(AetherOneUI p, String tabName, int seconds, String signa
         if (!p.getSettings().getBoolean(SettingsScreen.PLAY_SOUND, false)) {
             playingSound = true;
         }
+
+        dynamicAdjustments = p.getSettings().getBoolean(SettingsScreen.DYNAMIC_ADJUSTMENTS, false);
     }
 
     public void start() {

src/main/java/de/isuret/polos/AetherOnePi/processing2/elements/GuiElements.java

@@ -13,7 +13,6 @@
 import processing.core.PFont;
 import processing.core.PImage;
 
-import javax.smartcardio.Card;
 import java.awt.*;
 import java.io.File;
 import java.io.IOException;
@@ -300,12 +299,16 @@ public void draw() {
             drawableElementList.add(broadcastElement);
         }
 
+        if (p.getSettings().getBoolean(SettingsScreen.DYNAMIC_ADJUSTMENTS, false)) {
+            p.fill(0,255,0);
+            p.text("DYNAMIC ADJUSTMENTS", 22,700);
+        }
+
         p.fill(255);
         p.line(200,550,200,700);
         p.line(670,550,670,700);
         p.line(200,560,670,560);
         p.text("BROADCAST QUEUE", 205,555);
-
         p.line(670,560,1070,560);
         p.text("RESONATED RATES", 675,555);
         //p.text("X: " + p.getMousePoint().x + " Y: " + p.getMousePoint().y, 20,20);
@@ -325,6 +328,9 @@ public void draw() {
             if (currentTab.equals(drawableElement.getAssignedTabName())
                     || "global".equals(drawableElement.getAssignedTabName())) {
 
+                /*
+                BROADCAST of the circle elements happens here
+                 */
                 if (drawableElement instanceof BroadcastElement) {
                     BroadcastElement broadcastElement = (BroadcastElement) drawableElement;
                     if (broadcastElement.isStop()) {
@@ -402,6 +408,30 @@ public void draw() {
             if (broadcastElement.isStop() == true) {
                 p.getTrayIcon().displayMessage("AetherOnePi", "Broadcast of \n" + broadcastElement.getSignature().trim() + "\nfinished!", TrayIcon.MessageType.INFO);
             }
+
+            // Dynamic adjustments happens here
+            if (p.getSettings().getBoolean(SettingsScreen.DYNAMIC_ADJUSTMENTS, false)) {
+
+                int gvTarget = p.getGeneralVitality();
+                int gvRate = p.checkGeneralVitalityValue();
+
+                // Check if the broadcast result has a lower general vitality then the target GV
+                if (gvRate < gvTarget) {
+
+                    int seconds = broadcastElement.getSeconds();
+
+                    // reduce the broadcast time for each cycle
+                    if (seconds > 100) {
+                        seconds = seconds - 50;
+                    }
+
+                    System.out.println(gvRate + " < " + gvTarget + " --- " + broadcastElement.getSignature());
+                    BroadcastElement reBroadcastElement = new BroadcastElement(p, "BROADCAST", seconds, broadcastElement.getSignature());
+                    broadcastQueueList.add(reBroadcastElement);
+                } else {
+                    System.out.println(gvRate + " > " + gvTarget + " === " + broadcastElement.getSignature());
+                }
+            }
         }
         drawableElementList.removeAll(removeElements);
 

src/main/java/de/isuret/polos/AetherOnePi/processing2/elements/SettingsScreen.java

@@ -16,6 +16,7 @@ public class SettingsScreen implements IDrawableElement, MouseClickObserver {
     public static final String BROADCAST_SINGLE_RATES_ONLY = "broadcast.single.rates.only";
     public static final String ANALYSIS_VERY_HIGH_MAX_HIT = "analysis.very.high.max.hit";
     public static final String PLAY_SOUND = "play.binaural.sound";
+    public static final String DYNAMIC_ADJUSTMENTS = "dynamic.adjustments";
     private AetherOneUI p;
     private boolean mouseClicked = false;
 
@@ -28,6 +29,7 @@ public SettingsScreen(AetherOneUI p) {
         settings.getBoolean(BROADCAST_SINGLE_RATES_ONLY, false);
         settings.getBoolean(ANALYSIS_VERY_HIGH_MAX_HIT, false);
         settings.getBoolean(PLAY_SOUND, false);
+        settings.getBoolean(DYNAMIC_ADJUSTMENTS, false);
         AetherOnePiProcessingConfiguration.saveAllSettings();
     }
 

src/main/java/de/isuret/polos/AetherOnePi/service/AnalysisService.java

@@ -1,7 +1,5 @@
 package de.isuret.polos.AetherOnePi.service;
 
-import static j2html.TagCreator.*;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import de.isuret.polos.AetherOnePi.domain.*;
 import de.isuret.polos.AetherOnePi.enums.AetherOnePins;
@@ -21,6 +19,8 @@
 import java.io.IOException;
 import java.util.*;
 
+import static j2html.TagCreator.*;
+
 @Service
 public class AnalysisService {
 

src/main/java/de/isuret/polos/AetherOnePi/sound/Binaural.java

@@ -1,11 +1,11 @@
 package de.isuret.polos.AetherOnePi.sound;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import javax.sound.sampled.AudioFormat;
 import javax.sound.sampled.AudioSystem;
 import javax.sound.sampled.LineUnavailableException;
 import javax.sound.sampled.SourceDataLine;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public class Binaural {
     private static final int SAMPLE_RATE = 16 * 1024; // 16KHz

startGui.bat

@@ -1,2 +1,2 @@
-java -jar AetherOnePi-1.2.5-jar-with-dependencies.jar
+java -jar AetherOnePi-1.2.6-jar-with-dependencies.jar
 rem pause

startServer.bat

@@ -1,2 +1,2 @@
-java -jar AetherOnePi-1.2.5.jar
+java -jar AetherOnePi-1.2.6.jar
 pause