SKY-20210407USB\Administrator 1 tahun lalu
induk
melakukan
f4c4fb2c93
11 mengubah file dengan 29 tambahan dan 11 penghapusan
  1. 1 1
      AD7124_ATY.h
  2. 1 1
      HWB_STC8G.h
  3. 2 0
      HWB_STC8_BASE.h
  4. 1 1
      HW_I2C_ATY.h
  5. 1 1
      HW_SPI_ATY.h
  6. 1 1
      HW_TIMER_ATY.h
  7. 15 2
      HW_UART_ATY.c
  8. 4 1
      HW_UART_ATY.h
  9. 1 1
      LED_ATY.h
  10. 1 1
      MOTOR_DC_ATY.h
  11. 1 1
      TMC2209_ATY.h

+ 1 - 1
AD7124_ATY.h

@@ -119,7 +119,7 @@ struct AD7124_ATY_Dev
 
     uint8_t lock;
     uint8_t debugEnable;
-    void (*LOG)();
+    void (*LOG)(const char*, ...);
 };
 
 uint8_t AD7124_WriteRead(uint8_t* data, uint8_t len, struct AD7124_ATY_Dev* dev);

+ 1 - 1
HWB_STC8G.h

@@ -27,7 +27,7 @@
 #ifndef __HWB_STC8G_H
 #define __HWB_STC8G_H
 
-#include "HWB_STC8G.h"
+#include "INCLUDE_ATY.h"
 
 /******************************* For user *************************************/
 

+ 2 - 0
HWB_STC8_BASE.h

@@ -275,6 +275,8 @@ do{ \
     P4M1 = 0x00; \
     P5M0 = 0x00; \
     P5M1 = 0x00; \
+	  P6M0 = 0x00; \
+    P6M1 = 0x00; \
 } while (0)
 
 #ifdef SYSLED_PIN

+ 1 - 1
HW_I2C_ATY.h

@@ -87,7 +87,7 @@ struct HW_I2C_ATY_Dev
 
     uint8_t lock;
     uint8_t debugEnable;
-    void (*LOG)();
+    void (*LOG)(const char*, ...);
 };
 
 uint8_t I2C_Start(struct HW_I2C_ATY_Dev* dev);

+ 1 - 1
HW_SPI_ATY.h

@@ -47,7 +47,7 @@ struct HW_SPI_ATY_Dev
 
     uint8_t lock;
     uint8_t debugEnable;
-    void (*LOG)();
+    void (*LOG)(const char*, ...);
 };
 
 uint8_t SPI_Write(uint8_t* data_t, uint16_t len, struct HW_SPI_ATY_Dev* dev);

+ 1 - 1
HW_TIMER_ATY.h

@@ -64,7 +64,7 @@ struct HW_TIMER_ATY_Dev
 
     uint8_t lock;
     uint8_t debugEnable;
-    void (*LOG)();
+    void (*LOG)(const char*, ...);
 };
 
 void UserTimerLoop_Cycle1ms(struct HW_TIMER_ATY_Dev* dev);

+ 15 - 2
HW_UART_ATY.c

@@ -53,8 +53,8 @@ uint8_t UartSendByte(uint8_t byte, struct HW_UART_ATY_Dev* dev)
         dev->uartInit(dev->rx);
     }
 
-    while(dev->rxCount--)
-        dev->rx[dev->rxCount] = 0;
+    while(dev->rxCount)
+        dev->rx[dev->rxCount--] = 0;
 
     dev->uartSendByte(byte);
 
@@ -62,6 +62,19 @@ uint8_t UartSendByte(uint8_t byte, struct HW_UART_ATY_Dev* dev)
     return 0;
 }
 
+/**
+ * @brief
+ *
+ * @param dev
+ */
+void UartRxClear(struct HW_UART_ATY_Dev* dev)
+{
+    if(!dev->rxCount) return;
+
+    while(dev->rxCount)
+        dev->rx[dev->rxCount--] = 0;
+}
+
 /**
  * @brief   uart send bytes
  * @param   bytes bytes to send

+ 4 - 1
HW_UART_ATY.h

@@ -35,6 +35,8 @@
 
 /******************************* For user *************************************/
 // #define UART_RX_MAX_LEN (9 + (15 * 4))
+// #define UART_RX_MAX_LEN (16)
+
 #ifndef UART_RX_MAX_LEN
 #define UART_RX_MAX_LEN (254)
 #endif
@@ -63,10 +65,11 @@ struct HW_UART_ATY_Dev
 
     uint8_t lock;
     uint8_t debugEnable;
-    void (*LOG)();
+    void (*LOG)(const char*, ...);
 };
 
 uint8_t UartSendByte(uint8_t byte, struct HW_UART_ATY_Dev* dev);
+void UartRxClear(struct HW_UART_ATY_Dev* dev);
 void UartSendBytes(uint8_t* bytes, uint16_t len, struct HW_UART_ATY_Dev* dev);
 void UartSendStr(uint8_t* buf, struct HW_UART_ATY_Dev* dev);
 void UartSendFloat(float dataFloat, uint8_t endian, struct HW_UART_ATY_Dev* dev);

+ 1 - 1
LED_ATY.h

@@ -55,7 +55,7 @@ struct LED_ATY_Dev
 
     uint8_t lock;
     uint8_t debugEnable;
-    void (*LOG)();
+    void (*LOG)(const char*, ...);
 };
 
 uint8_t SysLedBlink(struct LED_ATY_Dev *dev);

+ 1 - 1
MOTOR_DC_ATY.h

@@ -60,7 +60,7 @@ struct MOTOR_DC_ATY_Dev
 
     uint8_t lock;
     uint8_t debugEnable;
-    void (*LOG)();
+    void (*LOG)(const char*, ...);
 };
 
 

+ 1 - 1
TMC2209_ATY.h

@@ -73,7 +73,7 @@ struct TMC2209_ATY_Dev
 
     uint8_t lock;
     uint8_t debugEnable;
-    void (*LOG)();
+    void (*LOG)(const char*, ...);
 };