Diff: ikarashiCAN.cpp

Revision:

6:503b975c3c8e

Parent:

5:664bd71935c3

Child:

7:b94c7d2eaed5

--- a/ikarashiCAN.cpp	Sat Oct 01 16:20:05 2022 +0000
+++ b/ikarashiCAN.cpp	Wed Oct 05 09:48:37 2022 +0000
@@ -24,7 +24,7 @@
 //----------------------bit controll------------------------
 int ikarashiCAN::getData()
 {
-   return dataCombine(msg.data, msg.len);
+    return dataCombine(msg.data, msg.len);
 }
 //--------------------------------------------------------//
 
@@ -63,8 +63,9 @@
 //--------------------------------------------------------//
 
 
-int ikarashiCAN::simpleGetData(int _id){
-    if(_id == msg.id && can_r){
+int ikarashiCAN::simpleGetData(int _id)
+{
+    if(_id == msg.id && can_r) {
         _can_data = getData();
     }
     return _can_data;
@@ -81,28 +82,47 @@
     return can_r;
 }
 
-int ikarashiCAN::recievedCanID(){
-    if(can_r){
+int ikarashiCAN::recievedCanID()
+{
+    if(can_r) {
         return msg.id;
-    }else{
+    } else {
         return -1;
     }
 }
 
-int ikarashiCAN::myCanID(){
+int ikarashiCAN::myCanID()
+{
     return _msgID;
 }
 
-int ikarashiCAN::CanLen(){
+int ikarashiCAN::CanLen()
+{
     return msg.len;
 }
 
-void ikarashiCAN::originalSet(unsigned short free_num){
+void ikarashiCAN::originalSet(unsigned short free_num)
+{
     sender[separated_data_size] = free_num;
 }
 
-int ikarashiCAN::originalGet(){
-    return msg.data[msg.len-1];   
+int ikarashiCAN::originalGet()
+{
+    return msg.data[msg.len-1];
+}
+
+void ikarashiCAN::ifOriginalGet(int buff, int id, int original_num)
+{
+    if(id == msg.id && can_r && originalGet() == original_num) {
+        buff = originalGet();
+    }
+}
+
+void ikarashiCAN::ifOriginalGet(int buff, int original_num)
+{
+    if(can_r && originalGet() == original_num) {
+        buff = originalGet();
+    }
 }
 
 void ikarashiCAN::sender_reset()