Takushima Yukimasa / CtrlStationRX

2021A Conste RX/TX lib

Dependents:   R21_ConsteSlave2

Diff: conste.h

Revision:
3:1a22afd67175
Parent:
2:4571cb39d887
Parent:
1:b67e696c0ec3
Child:
4:2e24564f6427
--- a/conste.h	Sun Nov 07 16:05:45 2021 +0000
+++ b/conste.h	Mon Nov 08 04:21:42 2021 +0000
@@ -52,13 +52,21 @@
     /* 受信生データ */
     uint8_t readData[255];
     uint8_t readLoc;
+<<<<<<< working copy
     
     Ticker ticker;
+=======
+>>>>>>> merge rev
     
     
 public:
+<<<<<<< working copy
         /* 処理済みデータ */
     uint8_t arrayRestore[4];
+=======
+    /* 各種処理済みデータ */
+    uint8_t arrayRestore[255];
+>>>>>>> merge rev
     Serial uart;
     Timer lostRX;
     Timer timeUpdate;