Dshot Programming Mode

am32-firmware · Jan 30, 2025 · 97c5066 · 97c5066
1 parent ea6b507
commit 97c5066
Show file tree

Hide file tree

Showing 19 changed files with 147 additions and 49 deletions.
diff --git a/Mcu/e230/Inc/serial_telemetry.h b/Mcu/e230/Inc/serial_telemetry.h
@@ -14,9 +14,9 @@ void makeTelemPackage(uint8_t temp, uint16_t voltage, uint16_t current,
     uint16_t consumption, uint16_t e_rpm);
 
 void telem_UART_Init(void);
-void send_telem_DMA();
+void send_telem_DMA(uint8_t bytes);
 
 void telem_UART_Init_CH4(void);
-void send_telem_DMA_CH4();
+void makeInfoPacket(void);
 
 #endif /* SERIAL_TELEMETRY_H_ */
diff --git a/Mcu/e230/Src/serial_telemetry.c b/Mcu/e230/Src/serial_telemetry.c
@@ -8,8 +8,9 @@
 #include "serial_telemetry.h"
 
 #include "main.h"
+#include "common.h"
 
-uint8_t aTxBuffer[10];
+uint8_t aTxBuffer[49];
 uint8_t nbDataToTransmit = sizeof(aTxBuffer);
 
 void telem_UART_Init(void)
@@ -56,13 +57,13 @@ void telem_UART_Init(void)
     usart_enable(USART0);
 }
 
-void send_telem_DMA()
+void send_telem_DMA(uint8_t bytes)
 { // set data length and enable channel to start transfer
 
     usart_receive_config(USART0, USART_TRANSMIT_DISABLE);
     usart_transmit_config(USART0, USART_TRANSMIT_ENABLE);
     dma_channel_disable(DMA_CH1);
-    DMA_CHCNT(DMA_CH1) = nbDataToTransmit;
+    DMA_CHCNT(DMA_CH1) = bytes;
     usart_dma_transmit_config(USART0, USART_DENT_ENABLE);
     dma_channel_enable(DMA_CH1);
     usart_receive_config(USART0, USART_RECEIVE_ENABLE);
@@ -87,6 +88,13 @@ uint8_t get_crc8(uint8_t* Buf, uint8_t BufLen)
     return (crc);
 }
 
+void makeInfoPacket(){
+   for(int i = 0;i < 48; i++){
+     aTxBuffer[i] = eepromBuffer.buffer[i];
+    }
+    aTxBuffer[48] = get_crc8(aTxBuffer, 48);
+}
+
 void makeTelemPackage(uint8_t temp, uint16_t voltage, uint16_t current,
     uint16_t consumption, uint16_t e_rpm)
 {

diff --git a/Mcu/f031/Inc/serial_telemetry.h b/Mcu/f031/Inc/serial_telemetry.h
@@ -14,9 +14,9 @@ void makeTelemPackage(uint8_t temp, uint16_t voltage, uint16_t current,
     uint16_t consumption, uint16_t e_rpm);
 
 void telem_UART_Init(void);
-void send_telem_DMA();
+void send_telem_DMA(uint8_t bytes);
 
 void telem_UART_Init_CH4(void);
-void send_telem_DMA_CH4();
+void makeInfoPacket(void);
 
 #endif /* SERIAL_TELEMETRY_H_ */
diff --git a/Mcu/f031/Src/serial_telemetry.c b/Mcu/f031/Src/serial_telemetry.c
@@ -6,8 +6,9 @@
  */
 
 #include "serial_telemetry.h"
+#include "common.h"
 
-uint8_t aTxBuffer[10];
+uint8_t aTxBuffer[49];
 uint8_t nbDataToTransmit = sizeof(aTxBuffer);
 
 void telem_UART_Init(void)
@@ -77,11 +78,11 @@ void telem_UART_Init(void)
     // NVIC_EnableIRQ(DMA1_Channel4_5_IRQn);
 }
 
-void send_telem_DMA()
+void send_telem_DMA(uint8_t bytes)
 {
     LL_DMA_DisableChannel(DMA1, LL_DMA_CHANNEL_4);
     LL_USART_SetTransferDirection(USART1, LL_USART_DIRECTION_TX);
-    LL_DMA_SetDataLength(DMA1, LL_DMA_CHANNEL_4, nbDataToTransmit);
+    LL_DMA_SetDataLength(DMA1, LL_DMA_CHANNEL_4, bytes);
     LL_USART_EnableDMAReq_TX(USART1);
 
     LL_DMA_EnableChannel(DMA1, LL_DMA_CHANNEL_4);
@@ -106,6 +107,13 @@ uint8_t get_crc8(uint8_t* Buf, uint8_t BufLen)
     return (crc);
 }
 
+void makeInfoPacket(){
+   for(int i = 0;i < 48; i++){
+     aTxBuffer[i] = eepromBuffer.buffer[i];
+    }
+    aTxBuffer[48] = get_crc8(aTxBuffer, 48);
+}
+
 void makeTelemPackage(uint8_t temp, uint16_t voltage, uint16_t current,
     uint16_t consumption, uint16_t e_rpm)
 {

diff --git a/Mcu/f051/Inc/serial_telemetry.h b/Mcu/f051/Inc/serial_telemetry.h
@@ -14,9 +14,9 @@ void makeTelemPackage(uint8_t temp, uint16_t voltage, uint16_t current,
     uint16_t consumption, uint16_t e_rpm);
 
 void telem_UART_Init(void);
-void send_telem_DMA();
+void send_telem_DMA(uint8_t bytes);
 
 void telem_UART_Init_CH4(void);
-void send_telem_DMA_CH4();
+void makeInfoPacket(void);
 
 #endif /* SERIAL_TELEMETRY_H_ */
diff --git a/Mcu/f051/Src/serial_telemetry.c b/Mcu/f051/Src/serial_telemetry.c
@@ -6,10 +6,10 @@
  */
 
 #include "serial_telemetry.h"
-
+#include "common.h"
 #include "targets.h"
 
-uint8_t aTxBuffer[10];
+uint8_t aTxBuffer[49];
 uint8_t nbDataToTransmit = sizeof(aTxBuffer);
 
 #ifdef USE_PA14_TELEMETRY
@@ -76,11 +76,11 @@ void telem_UART_Init(void)
     LL_DMA_EnableIT_TE(DMA1, LL_DMA_CHANNEL_4);
 }
 
-void send_telem_DMA()
+void send_telem_DMA(uint8_t bytes)
 { // set data length and enable channel to start transfer
     LL_USART_SetTransferDirection(USART2, LL_USART_DIRECTION_TX);
     //  GPIOB->OTYPER &= 0 << 6;
-    LL_DMA_SetDataLength(DMA1, LL_DMA_CHANNEL_4, nbDataToTransmit);
+    LL_DMA_SetDataLength(DMA1, LL_DMA_CHANNEL_4, bytes);
     LL_USART_EnableDMAReq_TX(USART2);
 
     LL_DMA_EnableChannel(DMA1, LL_DMA_CHANNEL_4);
@@ -151,11 +151,10 @@ void telem_UART_Init(void)
     LL_DMA_EnableIT_TE(DMA1, LL_DMA_CHANNEL_2);
 }
 
-void send_telem_DMA()
+void send_telem_DMA(uint8_t bytes)
 { // set data length and enable channel to start transfer
     LL_USART_SetTransferDirection(USART1, LL_USART_DIRECTION_TX);
-    //  GPIOB->OTYPER &= 0 << 6;
-    LL_DMA_SetDataLength(DMA1, LL_DMA_CHANNEL_2, nbDataToTransmit);
+    LL_DMA_SetDataLength(DMA1, LL_DMA_CHANNEL_2, bytes);
     LL_USART_EnableDMAReq_TX(USART1);
 
     LL_DMA_EnableChannel(DMA1, LL_DMA_CHANNEL_2);
@@ -182,6 +181,13 @@ uint8_t get_crc8(uint8_t* Buf, uint8_t BufLen)
     return (crc);
 }
 
+void makeInfoPacket(){
+   for(int i = 0;i < 48; i++){
+     aTxBuffer[i] = eepromBuffer.buffer[i];
+    }
+    aTxBuffer[48] = get_crc8(aTxBuffer, 48);
+}
+
 void makeTelemPackage(uint8_t temp, uint16_t voltage, uint16_t current,
     uint16_t consumption, uint16_t e_rpm)
 {

diff --git a/Mcu/f415/Inc/serial_telemetry.h b/Mcu/f415/Inc/serial_telemetry.h
@@ -14,9 +14,9 @@ void makeTelemPackage(uint8_t temp, uint16_t voltage, uint16_t current,
     uint16_t consumption, uint16_t e_rpm);
 
 void telem_UART_Init(void);
-void send_telem_DMA();
+void send_telem_DMA(uint8_t bytes);
 
 void telem_UART_Init_CH4(void);
-void send_telem_DMA_CH4();
+void makeInfoPacket(void);
 
 #endif /* SERIAL_TELEMETRY_H_ */
diff --git a/Mcu/f415/Src/serial_telemetry.c b/Mcu/f415/Src/serial_telemetry.c
@@ -6,13 +6,14 @@
  */
 
 #include "serial_telemetry.h"
+#include "common.h"
 
-uint8_t aTxBuffer[10];
+uint8_t aTxBuffer[49];
 uint8_t nbDataToTransmit = sizeof(aTxBuffer);
 
-void send_telem_DMA()
+void send_telem_DMA(uint8_t bytes)
 { // set data length and enable channel to start transfer
-    DMA1_CHANNEL4->dtcnt = nbDataToTransmit;
+    DMA1_CHANNEL4->dtcnt = bytes;
     DMA1_CHANNEL4->ctrl_bit.chen = TRUE;
 }
 
@@ -34,6 +35,13 @@ uint8_t get_crc8(uint8_t* Buf, uint8_t BufLen)
     return (crc);
 }
 
+void makeInfoPacket(){
+   for(int i = 0;i < 48; i++){
+     aTxBuffer[i] = eepromBuffer.buffer[i];
+    }
+    aTxBuffer[48] = get_crc8(aTxBuffer, 48);
+}
+
 void makeTelemPackage(uint8_t temp, uint16_t voltage, uint16_t current,
     uint16_t consumption, uint16_t e_rpm)
 {

diff --git a/Mcu/f421/Inc/serial_telemetry.h b/Mcu/f421/Inc/serial_telemetry.h
@@ -14,9 +14,7 @@ void makeTelemPackage(uint8_t temp, uint16_t voltage, uint16_t current,
     uint16_t consumption, uint16_t e_rpm);
 
 void telem_UART_Init(void);
-void send_telem_DMA();
-
-void telem_UART_Init_CH4(void);
-void send_telem_DMA_CH4();
+void makeInfoPacket(void);
+void send_telem_DMA(uint8_t bytes);
 
 #endif /* SERIAL_TELEMETRY_H_ */
diff --git a/Mcu/f421/Src/serial_telemetry.c b/Mcu/f421/Src/serial_telemetry.c
@@ -6,13 +6,14 @@
 // */
 
 #include "serial_telemetry.h"
+#include "common.h"
 
-uint8_t aTxBuffer[10];
+uint8_t aTxBuffer[49];
 uint8_t nbDataToTransmit = sizeof(aTxBuffer);
 
-void send_telem_DMA()
+void send_telem_DMA(uint8_t bytes)
 { // set data length and enable channel to start transfer
-    DMA1_CHANNEL2->dtcnt = nbDataToTransmit;
+    DMA1_CHANNEL2->dtcnt = bytes;
     DMA1_CHANNEL2->ctrl_bit.chen = TRUE;
 }
 
@@ -34,6 +35,13 @@ uint8_t get_crc8(uint8_t* Buf, uint8_t BufLen)
     return (crc);
 }
 
+void makeInfoPacket(){
+   for(int i = 0;i < 48; i++){
+     aTxBuffer[i] = eepromBuffer.buffer[i];
+    }
+    aTxBuffer[48] = get_crc8(aTxBuffer, 48);
+}
+
 void makeTelemPackage(uint8_t temp, uint16_t voltage, uint16_t current,
     uint16_t consumption, uint16_t e_rpm)
 {

diff --git a/Mcu/g071/Inc/serial_telemetry.h b/Mcu/g071/Inc/serial_telemetry.h
@@ -14,6 +14,7 @@ void makeTelemPackage(uint8_t temp, uint16_t voltage, uint16_t current,
     uint16_t consumption, uint16_t e_rpm);
 
 void telem_UART_Init(void);
-void send_telem_DMA();
+void send_telem_DMA(uint8_t bytes);
+void makeInfoPacket(void);
 
 #endif /* SERIAL_TELEMETRY_H_ */
diff --git a/Mcu/g071/Src/serial_telemetry.c b/Mcu/g071/Src/serial_telemetry.c
@@ -7,8 +7,9 @@
 
 #include "serial_telemetry.h"
 #include "targets.h"
+#include "common.h"
 
-uint8_t aTxBuffer[10];
+uint8_t aTxBuffer[49];
 uint8_t nbDataToTransmit = sizeof(aTxBuffer);
 
 void telem_UART_Init()
@@ -78,11 +79,11 @@ void telem_UART_Init()
     LL_DMA_EnableIT_TE(DMA1, LL_DMA_CHANNEL_3);
 }
 
-void send_telem_DMA()
+void send_telem_DMA(uint8_t bytes)
 { // set data length and enable channel to start transfer
     LL_USART_SetTransferDirection(USART1, LL_USART_DIRECTION_TX);
     //  GPIOB->OTYPER &= 0 << 6;
-    LL_DMA_SetDataLength(DMA1, LL_DMA_CHANNEL_3, nbDataToTransmit);
+    LL_DMA_SetDataLength(DMA1, LL_DMA_CHANNEL_3, bytes);
     LL_USART_EnableDMAReq_TX(USART1);
 
     LL_DMA_EnableChannel(DMA1, LL_DMA_CHANNEL_3);
@@ -107,6 +108,13 @@ uint8_t get_crc8(uint8_t* Buf, uint8_t BufLen)
     return (crc);
 }
 
+void makeInfoPacket(){
+   for(int i = 0;i < 48; i++){
+     aTxBuffer[i] = eepromBuffer.buffer[i];
+    }
+    aTxBuffer[48] = get_crc8(aTxBuffer, 48);
+}
+
 void makeTelemPackage(uint8_t temp, uint16_t voltage, uint16_t current,
     uint16_t consumption, uint16_t e_rpm)
 {

diff --git a/Mcu/g431/Inc/serial_telemetry.h b/Mcu/g431/Inc/serial_telemetry.h
@@ -14,6 +14,7 @@ void makeTelemPackage(uint8_t temp, uint16_t voltage, uint16_t current,
     uint16_t consumption, uint16_t e_rpm);
 
 void telem_UART_Init(void);
-void send_telem_DMA();
+void send_telem_DMA(uint8_t bytes);
+void makeInfoPacket(void);
 
 #endif /* SERIAL_TELEMETRY_H_ */
diff --git a/Mcu/g431/Src/serial_telemetry.c b/Mcu/g431/Src/serial_telemetry.c
@@ -6,8 +6,9 @@
  */
 
  #include "serial_telemetry.h"
+#include "common.h"
 
- uint8_t aTxBuffer[10];
+ uint8_t aTxBuffer[49];
  uint8_t nbDataToTransmit = sizeof(aTxBuffer);
 
  void telem_UART_Init()
@@ -78,11 +79,11 @@
     LL_DMA_EnableIT_TE(DMA1, LL_DMA_CHANNEL_3);
 }
 
- void send_telem_DMA()
+ void send_telem_DMA(uint8_t bytes)
 { // set data length and enable channel to start transfer
      LL_USART_SetTransferDirection(USART1, LL_USART_DIRECTION_TX);
      //  GPIOB->OTYPER &= 0 << 6;
-     LL_DMA_SetDataLength(DMA1, LL_DMA_CHANNEL_3, nbDataToTransmit);
+     LL_DMA_SetDataLength(DMA1, LL_DMA_CHANNEL_3, bytes);
      LL_USART_EnableDMAReq_TX(USART1);
 
     LL_DMA_EnableChannel(DMA1, LL_DMA_CHANNEL_3);
@@ -109,6 +110,13 @@
      return (crc);
  }
 
+void makeInfoPacket(){
+   for(int i = 0;i < 48; i++){
+     aTxBuffer[i] = eepromBuffer.buffer[i];
+    }
+    aTxBuffer[48] = get_crc8(aTxBuffer, 48);
+}
+
  void makeTelemPackage(uint8_t temp, uint16_t voltage, uint16_t current,
      uint16_t consumption, uint16_t e_rpm)
 {

diff --git a/Mcu/l431/Inc/serial_telemetry.h b/Mcu/l431/Inc/serial_telemetry.h
@@ -14,9 +14,9 @@ void makeTelemPackage(uint8_t temp, uint16_t voltage, uint16_t current,
     uint16_t consumption, uint16_t e_rpm);
 
 void telem_UART_Init(void);
-void send_telem_DMA();
+void send_telem_DMA(uint8_t bytes);
 
 void telem_UART_Init_CH4(void);
-void send_telem_DMA_CH4();
+void makeInfoPacket(void);
 
 #endif /* SERIAL_TELEMETRY_H_ */