From e878802f7e4661ecaeb976dd6af096e8a6eeef13 Mon Sep 17 00:00:00 2001
From: Brian Zheng <zbrian2040@berkeley.edu>
Date: Wed, 8 Jun 2022 22:36:24 -0700
Subject: [PATCH 1/3] CAN_Data added

---
 .../java/com/example/bottomnav/CAN_Data.java  | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 app/src/main/java/com/example/bottomnav/CAN_Data.java

diff --git a/app/src/main/java/com/example/bottomnav/CAN_Data.java b/app/src/main/java/com/example/bottomnav/CAN_Data.java
new file mode 100644
index 0000000..c9a1969
--- /dev/null
+++ b/app/src/main/java/com/example/bottomnav/CAN_Data.java
@@ -0,0 +1,65 @@
+package com.example.bottomnav.ui.notifications;
+
+class CAN_Data {
+
+    Integer id;
+    Integer data;
+    Integer len;
+    public CAN_Data(Integer id,Integer data, Integer len ){
+        this.id = id;
+        this.data = data;
+        this.len = len;
+    }
+    public static CAN_Data decode(String raw){
+        Integer id = -1;
+        Integer len;
+        Integer data;
+        int index = -1;
+        if(raw.substring(0,1).equals('t') || raw.substring(0,1).equals('r')){
+            id = Integer.parseInt(raw.substring(1, 4), 16);
+            index = 4;
+        }
+        else if(raw.substring(0,1).equals('T') || raw.substring(0,1).equals('R')){
+            id = Integer.parseInt(raw.substring(1, 9), 16);
+            index = 9;
+        }
+        else{
+            return null;
+        }
+
+        if((index != -1 ) && (id != -1)) {
+            len = Integer.parseInt(raw.substring(index, index + 1), 16);
+            data = Integer.parseInt(raw.substring(index + 1, raw.length()), 16);
+            CAN_Data decoded = new CAN_Data(id, data, len);
+            return decoded;
+        }
+        else{
+            return null;
+        }
+
+    }
+    public Integer getId(){
+        return id;
+    }
+
+    public Integer getData() {
+        return data;
+    }
+
+    public Integer getLen() {
+        return len;
+    }
+
+    public void setData(Integer data) {
+        this.data = data;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public void setLen(Integer len) {
+        this.len = len;
+    }
+
+}

From da46f494e2d567ab6c63b617618397ecc530b454 Mon Sep 17 00:00:00 2001
From: Brian Zheng <zbrian2040@berkeley.edu>
Date: Wed, 8 Jun 2022 22:50:22 -0700
Subject: [PATCH 2/3] CAN_CHECKED

---
 .../java/com/example/bottomnav/CAN_Data.java  | 40 ++++++++-----------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/com/example/bottomnav/CAN_Data.java b/app/src/main/java/com/example/bottomnav/CAN_Data.java
index c9a1969..98a1317 100644
--- a/app/src/main/java/com/example/bottomnav/CAN_Data.java
+++ b/app/src/main/java/com/example/bottomnav/CAN_Data.java
@@ -1,43 +1,37 @@
-package com.example.bottomnav.ui.notifications;
+package com.example.bottomnav;
 
 class CAN_Data {
+    int id;
+    int data;
+    int len;
 
-    Integer id;
-    Integer data;
-    Integer len;
-    public CAN_Data(Integer id,Integer data, Integer len ){
+    public CAN_Data(int id, int data, int len) {
         this.id = id;
         this.data = data;
         this.len = len;
     }
-    public static CAN_Data decode(String raw){
-        Integer id = -1;
-        Integer len;
-        Integer data;
+
+    public static CAN_Data decode(String raw) {
+        int id = -1;
+        int len;
+        int data;
         int index = -1;
-        if(raw.substring(0,1).equals('t') || raw.substring(0,1).equals('r')){
+        if (raw.charAt(0) == 't' || raw.charAt(0) == 'r') {
             id = Integer.parseInt(raw.substring(1, 4), 16);
             index = 4;
         }
-        else if(raw.substring(0,1).equals('T') || raw.substring(0,1).equals('R')){
+        else if (raw.charAt(0) == 'T' || raw.charAt(0) == 'R') {
             id = Integer.parseInt(raw.substring(1, 9), 16);
             index = 9;
         }
-        else{
+        else {
             return null;
         }
-
-        if((index != -1 ) && (id != -1)) {
-            len = Integer.parseInt(raw.substring(index, index + 1), 16);
-            data = Integer.parseInt(raw.substring(index + 1, raw.length()), 16);
-            CAN_Data decoded = new CAN_Data(id, data, len);
-            return decoded;
-        }
-        else{
-            return null;
-        }
-
+        len = Integer.parseInt(raw.substring(index, index + 1), 16);
+        data = Integer.parseInt(raw.substring(index + 1, index + 1 + 2 * len), 16);
+        return new CAN_Data(id, data, len);
     }
+
     public Integer getId(){
         return id;
     }

From 86a9c849791e12624a3eaf5dae2a3807f421ed56 Mon Sep 17 00:00:00 2001
From: Brian Zheng <zbrian2040@berkeley.edu>
Date: Wed, 15 Jun 2022 21:42:54 -0700
Subject: [PATCH 3/3] Finish CAN_DATA

---
 .idea/gradle.xml                              |  1 +
 .idea/misc.xml                                |  2 +-
 .../java/com/example/bottomnav/CAN_Data.java  | 33 +++++++------------
 .../java/com/example/bottomnav/DataTest.java  | 24 ++++++++++++++
 4 files changed, 37 insertions(+), 23 deletions(-)
 create mode 100644 app/src/test/java/com/example/bottomnav/DataTest.java

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 526b4c2..fd51e56 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,6 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="16" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index a219808..d1bb222 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -15,7 +15,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/com/example/bottomnav/CAN_Data.java b/app/src/main/java/com/example/bottomnav/CAN_Data.java
index 98a1317..7f8924c 100644
--- a/app/src/main/java/com/example/bottomnav/CAN_Data.java
+++ b/app/src/main/java/com/example/bottomnav/CAN_Data.java
@@ -2,19 +2,17 @@
 
 class CAN_Data {
     int id;
-    int data;
-    int len;
+    int[] data;
 
-    public CAN_Data(int id, int data, int len) {
+    public CAN_Data(int id, int[] data, int len) {
         this.id = id;
         this.data = data;
-        this.len = len;
     }
 
     public static CAN_Data decode(String raw) {
         int id = -1;
         int len;
-        int data;
+
         int index = -1;
         if (raw.charAt(0) == 't' || raw.charAt(0) == 'r') {
             id = Integer.parseInt(raw.substring(1, 4), 16);
@@ -27,33 +25,24 @@ else if (raw.charAt(0) == 'T' || raw.charAt(0) == 'R') {
         else {
             return null;
         }
+
         len = Integer.parseInt(raw.substring(index, index + 1), 16);
-        data = Integer.parseInt(raw.substring(index + 1, index + 1 + 2 * len), 16);
+        int[] data = new int[len];
+
+        for(int x = 0;x<len;x+=1) {
+            data[x] = Integer.parseInt(raw.substring(2*x +index+1, 2*x+2+index+1), 16);
+        }
         return new CAN_Data(id, data, len);
     }
 
-    public Integer getId(){
+    public int getId(){
         return id;
     }
 
-    public Integer getData() {
+    public int[] getData() {
         return data;
     }
 
-    public Integer getLen() {
-        return len;
-    }
-
-    public void setData(Integer data) {
-        this.data = data;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
 
-    public void setLen(Integer len) {
-        this.len = len;
-    }
 
 }
diff --git a/app/src/test/java/com/example/bottomnav/DataTest.java b/app/src/test/java/com/example/bottomnav/DataTest.java
new file mode 100644
index 0000000..56e7f81
--- /dev/null
+++ b/app/src/test/java/com/example/bottomnav/DataTest.java
@@ -0,0 +1,24 @@
+package com.example.bottomnav;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class DataTest {
+    @Test
+    public void randomData() {
+        String data = "t056111";
+        CAN_Data newData = CAN_Data.decode(data);
+        System.out.println(newData.getData());
+        assertEquals( 0x11 , newData.getData()[0]);
+        assertEquals( 86 , newData.getId());
+    }
+    @Test
+    public void BIGData() {
+        String data = "t0568111111111111111A";
+        CAN_Data newData = CAN_Data.decode(data);
+        System.out.println(newData.getData());
+        assertEquals( 0x11, newData.getData()[0]);
+        assertEquals( 8, newData.getData().length);
+    }
+}