code sync

EatShitWürgaround/QuickHaxx/Program.cs

@@ -14,170 +14,314 @@ namespace QuickHaxx
         static void Main(string[] args)
         {
             int[] repull_lines = {
-                0,
-                48,
-                64,
-                80,
-                96,
-                112,
-                128,
-                144,
-                160,
-                176,
-                192,
-                224,
-                240,
-                256,
-                272,
-                288,
-                304,
-                320,
-                336,
-                352,
-                368,
-                384,
-                400,
-                416,
-                432,
-                448,
-                464,
-                480,
-                496,
-                800,
-                1216,
-                1232,
-                1584,
-                2208,
-                2960,
-                3408,
-                3600,
-                4144,
-                4480,
-                4704,
-                5296,
-                5328,
-                5440,
-                5472,
-                5840,
-                6512,
-                6560,
-                6592,
-                6736,
-                6752,
-                7120,
-                7968,
-                8096,
-                8160,
-                9968,
-                10464,
-                10672,
-                10912,
-                11712,
-                12128,
-                12576,
-                14064,
-                14176,
-                14464,
-                14960,
-                16048,
-                16912,
-                17968,
-                18160,
-                18816,
-                18928,
-                19488,
-                19536,
-                20528,
-                20704,
-                20880,
-                21216,
-                21280,
-                21376,
-                21728,
-                21808,
-                21856,
-                21888,
-                21936,
-                22032,
-                23472,
-                23728,
-                24240,
-                24400,
-                24976,
-                26656,
-                26672,
-                26816,
-                27120,
-                27280,
-                27488,
-                28352,
-                28816,
-                28960,
-                29264,
-                30400,
-                30864,
-                31056,
-                31216,
-                31280,
-                34288,
-                35744,
-                36160,
-                37520,
-                39072,
-                39552,
-                39664,
-                39920,
-                39984,
-                40000,
-                40512,
-                40960,
-                41184,
-                41536,
-                41632,
-                41920,
-                42320,
-                43584,
-                44192,
-                44944,
-                44960,
-                44992,
-                45424,
-                45584,
-                46064,
-                46224,
-                46544,
-                46976,
-                48016,
-                48176,
-                48432,
-                48736,
-                50864,
-                51216,
-                52096,
-                52896,
-                53376,
-                54352,
-                54672,
-                55376,
-                55536,
-                55568,
-                57968,
-                58672,
-                59504,
-                59552,
-                59568,
-                59664,
-                59840,
-                60464,
-                60912,
-                62704,
-                62992,
-                64192,
+0,
+48,
+64,
+80,
+96,
+112,
+128,
+144,
+160,
+176,
+192,
+208,
+224,
+240,
+256,
+272,
+288,
+304,
+320,
+336,
+352,
+368,
+384,
+400,
+416,
+432,
+448,
+464,
+480,
+496,
+3664,
+3792,
+4592,
+9504,
+15520,
+15760,
+16960,
+17072,
+17152,
+17200,
+17232,
+17280,
+17600,
+17680,
+17712,
+17952,
+18000,
+18032,
+24592,
+31408,
+31728,
+40560,
+42016,
+57664,
+58224,
+66592,
+69632,
+77440,
+77840,
+78800,
+91808,
+93440,
+95200,
+95568,
+96240,
+96400,
+101280,
+130096,
+135504,
+135520,
+135536,
+135552,
+135568,
+135584,
+135600,
+135616,
+135632,
+135648,
+135664,
+135680,
+135696,
+135712,
+135728,
+135744,
+135760,
+135776,
+135792,
+135808,
+135824,
+135840,
+135856,
+135872,
+135888,
+135904,
+135920,
+135936,
+135952,
+135968,
+135984,
+136000,
+136016,
+136032,
+136048,
+136064,
+136080,
+136096,
+136112,
+136128,
+136144,
+136160,
+136176,
+136192,
+136208,
+136224,
+136240,
+136256,
+136272,
+136288,
+136304,
+136320,
+136336,
+136352,
+136368,
+136384,
+136400,
+136416,
+136432,
+136448,
+136464,
+136480,
+136496,
+136512,
+136528,
+136544,
+136560,
+136576,
+136592,
+136608,
+136624,
+136640,
+136656,
+136672,
+136688,
+136704,
+136720,
+136736,
+136752,
+136768,
+136784,
+136800,
+136816,
+136832,
+136848,
+136864,
+136880,
+136896,
+136912,
+136928,
+136944,
+136960,
+136976,
+136992,
+137008,
+137024,
+137040,
+137056,
+137072,
+137088,
+137104,
+137120,
+137136,
+137152,
+137168,
+137184,
+137200,
+137216,
+137232,
+137248,
+137264,
+137280,
+137296,
+137312,
+137328,
+137344,
+137360,
+137376,
+137392,
+137408,
+137424,
+137440,
+137456,
+137472,
+137488,
+137504,
+137520,
+137536,
+137552,
+137568,
+137584,
+137600,
+137616,
+137632,
+137648,
+137664,
+137680,
+137696,
+137712,
+137728,
+137744,
+137760,
+137776,
+137792,
+137808,
+137824,
+137840,
+137856,
+137872,
+137888,
+137904,
+137920,
+137936,
+137952,
+137968,
+137984,
+138000,
+138016,
+138032,
+138048,
+138064,
+138080,
+138096,
+138112,
+138128,
+138144,
+138160,
+138176,
+138192,
+138208,
+138224,
+138240,
+138256,
+138272,
+138288,
+138304,
+138320,
+138336,
+138352,
+138368,
+138384,
+138400,
+138416,
+138432,
+138448,
+138464,
+138480,
+138496,
+138512,
+138528,
+138544,
+138560,
+138576,
+138592,
+138608,
+138624,
+138640,
+138656,
+138672,
+138688,
+138704,
+138720,
+138736,
+138752,
+138768,
+138784,
+138800,
+138816,
+138832,
+138848,
+138864,
+138880,
+138896,
+138912,
+138928,
+138944,
+138960,
+138976,
+138992,
+139008,
+139024,
+139040,
+139056,
+139072,
+139088,
+139104,
+139120,
+139136,
+139152,
+139168,
+139184,
+139200,
+139216,
+139232,
+139248,
             };
 
 
-            SerialPort _serialPort = new SerialPort("COM8", 115200, Parity.None, 8, StopBits.One);
-            StreamWriter w = new StreamWriter("C:\\LMAA\\085-flash\\flashhaxx-rehaxx"+(DateTime.Now.ToBinary())+".txt");
+            SerialPort _serialPort = new SerialPort("/dev/ttyUSB0", 115200, Parity.None, 8, StopBits.One);
+            StreamWriter w = new StreamWriter("/mnt/F40AD6B30AD671DA/src/iZinked/EatShitWürgaround/QuickHaxx/Dump-"+(DateTime.Now.ToBinary())+".txt");
             _serialPort.Handshake = Handshake.None;
             _serialPort.DataReceived += new SerialDataReceivedEventHandler((sender,e)=> 
             {
@@ -207,9 +351,9 @@ namespace QuickHaxx
             _serialPort.WriteLine("W"); //normal
             Thread.Sleep(100);
             //*/
-            for(int i=0;i<0x010000;i+=16)
+            for(int i=0;i<0x022000;i+=16)
             {
-                if (repull_lines.Contains(i))
+                if (repull_lines.Contains(i))//true == haxx
                 {
                     String hexed = i.ToString("x6");
                     Console.WriteLine(hexed);
@@ -218,6 +362,9 @@ namespace QuickHaxx
                     String a3 = hexed.Substring(4, 2);
                     _serialPort.WriteLine("[0x03 0x" + a1 + " 0x" + a2 + " 0x" + a3 + " r:16]"); //normal
                     Thread.Sleep(100);
+                    string data = _serialPort.ReadExisting();
+                    w.WriteLine(data);
+                    Console.WriteLine("R:"+data);
                 }
 
             }

PlaceDECSVWiggler/src/main/java/de/nplusc/izc/placeDE/Cookies/CSVWiggler.java

@@ -50,7 +50,7 @@ public class CSVWiggler {
                 String message = msg.getString("content", "");
 
                 int len = message.length();
-                String timestamp = msg.getString("timestamp", "");//.substring(0, 19);
+                String timestamp = msg.getString("timestamp", "").substring(0, 19);
                 int cookiecount = 0;
                 String type = "default";
                 if (isEventSys) {
@@ -68,7 +68,14 @@ public class CSVWiggler {
                         }
                         else
                         {
-                            //TODO edgecase-kekse
+                            if (title.equals("Ein Cookie!"))
+                            {
+                                type = "cookie";
+                                JsonArray fields = embed.get("fields").asArray();
+                                JsonObject countField = fields.get(0).asObject();
+                                String cntS = countField.getString("value","0");
+                                cookiecount = Integer.valueOf(cntS);
+                            }
                         }
                     }
                 }
@@ -113,7 +120,7 @@ public class CSVWiggler {
                 String tsMinutely = splitted[4].substring(0, 16);
                 if(!previousLineTS.equals(tsMinutely))
                 {
-                    SimpleDateFormat parser = new SimpleDateFormat("yyyy-MM-dd_hh:mm");
+                    SimpleDateFormat parser = new SimpleDateFormat("yyyy-MM-dd_HH:mm");
                     if(previousLineTS.length()>0)//suppress calc on head of file
                     {
                         int minutesToSynthesize = 0;
@@ -122,11 +129,15 @@ public class CSVWiggler {
                             Instant calc= old.toInstant();
                             Date current = parser.parse(tsMinutely.replace("T","_"));
                             Long gap = ChronoUnit.MINUTES.between(old.toInstant(),current.toInstant());
-                            System.out.println("Gap:"+gap);
-                            for(int g=1;g<gap;g++)
+                            if(gap>1)
                             {
-                                String ts = parser.format(Date.from(calc.plus(g, ChronoUnit.MINUTES)));
-                                w2.println("0;0;"+ts);
+                                System.out.println("Gap:"+gap+"||"+previousLineTS+"|"+tsMinutely);
+                                System.out.println(">>"+old+"|"+current);
+                                for(int g=1;g<gap;g++)
+                                {
+                                    String ts = parser.format(Date.from(calc.plus(g, ChronoUnit.MINUTES)));
+                                    w2.println("0;0;"+(ts.replace("_","T")));
+                                }
                             }
                         } catch (ParseException e) {
                             throw new RuntimeException(e);

QuickStuff/src/main/java/QuickVerifyCrap/MajorityOfThreeReader.java

@@ -9,12 +9,12 @@ import java.io.PrintStream;
 
 public class MajorityOfThreeReader {
     public static void main(String[] args) throws FileNotFoundException {
-        String[] file1 = FileTK.fileload("C:\\LMAA\\085-flash\\filtered1.txt");
-        String[] file2 = FileTK.fileload("C:\\LMAA\\085-flash\\filtered2.txt");
-        String[] file3 = FileTK.fileload("C:\\LMAA\\085-flash\\filtered3.txt");
-        String[] patchfile = FileTK.fileload("C:\\LMAA\\085-flash\\filtered-rehaxx1.txt");
-        PrintStream s = new PrintStream(new FileOutputStream("C:\\LMAA\\085-flash\\filteredMerged.txt"));
-        PrintStream s_desussed = new PrintStream(new FileOutputStream("C:\\LMAA\\085-flash\\filteredMerged-patched.txt"));
+        String[] file1 = FileTK.fileload("/mnt/F40AD6B30AD671DA/src/iZinked/EatShitWürgaround/QuickHaxx/clean1.txt");
+        String[] file2 = FileTK.fileload("/mnt/F40AD6B30AD671DA/src/iZinked/EatShitWürgaround/QuickHaxx/clean2.txt");
+        String[] file3 = FileTK.fileload("/mnt/F40AD6B30AD671DA/src/iZinked/EatShitWürgaround/QuickHaxx/clean3.txt");
+        String[] patchfile = FileTK.fileload("/mnt/F40AD6B30AD671DA/src/iZinked/EatShitWürgaround/QuickHaxx/patchfix1.txt");
+        PrintStream s = new PrintStream(new FileOutputStream("/mnt/F40AD6B30AD671DA/src/iZinked/EatShitWürgaround/QuickHaxx/filteredMerged.txt"));
+        PrintStream s_desussed = new PrintStream(new FileOutputStream("/mnt/F40AD6B30AD671DA/src/iZinked/EatShitWürgaround/QuickHaxx/filteredMerged-patched.txt"));
         String susline = "00000000000000000000000000000000 ";
         String sus1 = "00000";
         String sus2 = "FFFFF";