From 294a5b9ac8b7ae67eb3526b51fb4349099ea4251 Mon Sep 17 00:00:00 2001
From: Soundflog <stud128097@vyatsu.ru>
Date: Thu, 11 May 2023 17:25:39 +0300
Subject: [PATCH] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=BE=20=D0=9A?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=82=D1=80=D0=BE=D0=BB=D1=8C=D0=BD=D0=B0=D1=8F=20?=
 =?UTF-8?q?=D1=81=D1=83=D0=BC=D0=BC=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SPI/SPI-Master/SPI-Master.ino | 17 ++++++------
 SPI/SPI-Master/SPIMaster.c    | 21 ++++++++++++---
 SPI/SPI-Master/SPIMaster.h    |  1 +
 SPI/slave/SPISlave.c          | 18 ++++++++++++-
 SPI/slave/SPISlave.h          |  2 ++
 SPI/slave/slave.ino           | 51 ++++++++++++++++++++---------------
 6 files changed, 75 insertions(+), 35 deletions(-)

diff --git a/SPI/SPI-Master/SPI-Master.ino b/SPI/SPI-Master/SPI-Master.ino
index f4155ab..4fb81b9 100644
--- a/SPI/SPI-Master/SPI-Master.ino
+++ b/SPI/SPI-Master/SPI-Master.ino
@@ -17,19 +17,20 @@ void setup()
 
 void loop()
 {
-  char data[] = {6, 1, 3, 5, 16, 17, 18, 0};
+  char data[] = {0x06, 0xF1, 0x04, 0x05, 0x16, 0x12, 0x18, 0x11, 0x00, 0x15, 0x49, 0x50, 0x59, 0x69, 0};
   int length = sizeof(data);
-
-  Serial.print("Start:");
-  Print(data,length);
+  Serial.println();
+  Serial.print("Start: ");
+  Print(data, length);
   Serial.println();
 
-  char checking = CRC8(data, length-1); 
+  char checking = crc8(data, length-1); 
   int size = sizeof(data) / sizeof(data[0]);
   data[size - 1] = checking;
-
-  Serial.print("End:");
-  Print(data,length);
+  Serial.println(checking, HEX);
+  
+  Serial.print("End: ");
+  Print(data, length);
   Serial.println();
 
   SPI_MasterTransmit(data, length);
diff --git a/SPI/SPI-Master/SPIMaster.c b/SPI/SPI-Master/SPIMaster.c
index c61bcd1..be5e140 100644
--- a/SPI/SPI-Master/SPIMaster.c
+++ b/SPI/SPI-Master/SPIMaster.c
@@ -7,15 +7,14 @@ void SPI_MasterInit(void)
 {
   DDR_SPI = (1 << DD_MOSI) | (1 << DD_SCK) | (1 << DD_SS);
   DDRB |= (1<<DDB2);
-  SPCR = (1 << SPE) | (1 << MSTR);
+  SPCR = (1 << SPE) | (1 << MSTR) | (1 << SPR1);
+  // SPCR = (1 << SPE) | (1 << MSTR) ; 
 }
 
 void SPI_MasterTransmit(char *data, int length)
 {
   PORTB &= ~(1<<2);
 
-  int size = sizeof(data) / sizeof(data[0]);
-
   for(int i = 0; i < length; i++) {
     SPDR = data[i]; // отправляем байт массива
     while (!(SPSR & (1 << SPIF))); // ждем, пока байт передастся
@@ -28,7 +27,7 @@ char CRC8(char *data, int length) {
   char crc = 0x00;
   char poly = 0x07; // полином для CRC8
 
-  for (int i = 0; i < length-2; i++) {
+  for (int i = 0; i < length; i++) {
       crc ^= data[i]; // XOR текущего байта с crc
 
       for (int j = 0; j < length; j++) {
@@ -43,3 +42,17 @@ char CRC8(char *data, int length) {
   return crc;
 }
 
+char crc8(char *data, int len) {
+  char crc = 0x00;
+  while (len--) {
+    crc ^= *data++;
+    for (int i = 0; i < 8; i++) {
+      if (crc & 0x80) {
+        crc = (crc << 1) ^ 0x07;
+      } else {
+        crc <<= 1;
+      }
+    }
+  }
+  return crc;
+}
diff --git a/SPI/SPI-Master/SPIMaster.h b/SPI/SPI-Master/SPIMaster.h
index 869a463..fa6e023 100644
--- a/SPI/SPI-Master/SPIMaster.h
+++ b/SPI/SPI-Master/SPIMaster.h
@@ -14,6 +14,7 @@ extern "C" {
 void SPI_MasterInit(void);
 void SPI_MasterTransmit(char *data, int length);
 char CRC8(char *data, int length);
+char crc8(char *data, int len);
 
 #ifdef __cplusplus
 }
diff --git a/SPI/slave/SPISlave.c b/SPI/slave/SPISlave.c
index da9b4b9..ac09303 100644
--- a/SPI/slave/SPISlave.c
+++ b/SPI/slave/SPISlave.c
@@ -16,7 +16,7 @@ char CRC8(char *data, int length) {
   char crc = 0x00;
   char poly = 0x07; // полином для CRC8
 
-  for (int i = 0; i < length-2; i++) {
+  for (int i = 0; i < length; i++) {
       crc ^= data[i]; // XOR текущего байта с crc
 
       for (int j = 0; j < length; j++) {
@@ -31,6 +31,22 @@ char CRC8(char *data, int length) {
   return crc;
 }
 
+char crc8(char *data, int len) {
+  char crc = 0x00;
+  while (len--) {
+    crc ^= *data++;
+    for (int i = 0; i < 8; i++) {
+      if (crc & 0x80) {
+        crc = (crc << 1) ^ 0x07;
+      } else {
+        crc <<= 1;
+      }
+    }
+  }
+  return crc;
+}
+
+
 // Проверка массива на ноль
 char checkArray(char *arr, int size) {
   for (int i = 0; i < size; i++) {
diff --git a/SPI/slave/SPISlave.h b/SPI/slave/SPISlave.h
index 1884bd3..fa185f0 100644
--- a/SPI/slave/SPISlave.h
+++ b/SPI/slave/SPISlave.h
@@ -16,6 +16,8 @@ void SPI_SlaveInit(void);
 char CRC8(char *data, int length);
 char checkArray(char *arr, int size);
 
+char crc8(char *data, int len);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/SPI/slave/slave.ino b/SPI/slave/slave.ino
index 3e79d18..ea1744d 100644
--- a/SPI/slave/slave.ino
+++ b/SPI/slave/slave.ino
@@ -12,7 +12,7 @@
 
 static int index = 0;
 static int arIndex = 0;
-static char data[255];
+static char data[64];
 
 // void SPI_SlaveInit(void)
 // {
@@ -29,39 +29,39 @@ ISR(SPI_STC_vect)
 
 void setup()
 {
-  Serial.begin(2000000);
+  Serial.begin(9600);
   SPI_SlaveInit();
   
   Serial.println();
   Serial.println("Initialization ");
 }
 
-void SetCommand(char *data2){
+void SetCommand(char *data2, int length){
   char command = data2[0];
   // Отрезать 1 элемент от оставшихся
-  char result[index];
-  char *ptr = &data2[1];
-  strcpy(result, ptr);
+
 
   Serial.print("\nReceived command: ");
   Serial.println(command, HEX);
   switch (command){
       case 6:
-          AddSymbol(result);
+          AddSymbol(&data2[1], length-1);
           break;
 
   }
 }
 
 
-void AddSymbol(char *symbols){
+void AddSymbol(uint8_t *symbols, int lenght){
   Serial.print("Received Add: ");
 
  // oled.setScale(3);   // масштаб текста (1..4)
  // oled.home();        // курсор в 0,0
  // oled.print("Привет!");
-  for(int i = 0; i < index - 1; i++) {
-      Serial.print(symbols[i], HEX);
+  for(int i = 0; i < lenght - 1; i++) {
+      char str[3];
+      sprintf(str, "%01X", symbols[i]);
+      Serial.print(str);
       Serial.print(" ");
   }
 }
@@ -88,10 +88,12 @@ void AddSymbol(char *symbols){
 // }
 
 // Вывод массива
-void arrayOut(char *arr,int size){
+void arrayOut(uint8_t *arr, int size){
   Serial.print("Array: ");
   for(int i = 0; i < size;i++){
-    Serial.print(arr[i], HEX);
+    char str[3];
+    sprintf(str, "%02X", arr[i]);
+    Serial.print(str);
     Serial.print(" ");
   }
   Serial.println(".");
@@ -111,31 +113,36 @@ void arrayOut(char *arr,int size){
 void loop() {
   if(PINB & (1 << 2)){
     if(index > 0){
+
+      arrayOut(data, index);
       
       char sum = 0;
-      sum = CRC8(data, index-1);
+      sum = crc8(data, index-1);
       
       char checkNull = 0;
       char last_1 = data[index - 1];
-      arrayOut(data, index);
+      
+      Serial.println(sum, HEX);
 
       if (last_1 == sum){
         Serial.println();
         Serial.println("Старт вывода массивов");
         Serial.println(sum, HEX);
-        checkNull = checkArray(data, index);
-
-        if(checkNull == 1){
-          SetCommand(data);
-        }
+        // checkNull = checkArray(data, index);
 
+        // if(checkNull == 1){
+          
+        // }
+        SetCommand(data, index);
         Serial.println("Стоп вывода массивов");
         index = 0;
         return;
-      }
-      Serial.println("Nothing ...");
+      }else{
+        Serial.println("Nothing ...");
+      
+        index = 0;
+      }
       
-      index = 0;
     }
   }
 }