Merge branch 'master' into 20240223_fix_compile_warnings_strncpy

emuflight · Feb 27, 2024 · ad85a97 · ad85a97
2 parents 60e043e + c655ade
commit ad85a97
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 440 deletions.
diff --git a/lib/main/STM32F7/Drivers/STM32F7xx_HAL_Driver/Src/stm32f7xx_ll_usb.c b/lib/main/STM32F7/Drivers/STM32F7xx_HAL_Driver/Src/stm32f7xx_ll_usb.c
@@ -817,7 +817,7 @@ HAL_StatusTypeDef USB_WritePacket(USB_OTG_GlobalTypeDef *USBx, uint8_t *src, uin
     count32b =  (len + 3) / 4;
     for (i = 0; i < count32b; i++, src += 4)
     {
-      USBx_DFIFO(ch_ep_num) = *((__packed uint32_t *)src);
+      USBx_DFIFO((uint32_t)ch_ep_num) = *((uint32_t *)src);
     }
   }
   return HAL_OK;
@@ -843,7 +843,7 @@ void *USB_ReadPacket(USB_OTG_GlobalTypeDef *USBx, uint8_t *dest, uint16_t len)
 
   for ( i = 0; i < count32b; i++, dest += 4 )
   {
-    *(__packed uint32_t *)dest = USBx_DFIFO(0);
+    *(uint32_t *)dest = USBx_DFIFO(0);
 
   }
   return ((void *)dest);

diff --git a/src/main/drivers/beesign.c b/src/main/drivers/beesign.c
@@ -101,10 +101,13 @@ static uint8_t beesignCRC(const beesign_frame_t *pPackage) {
     return crc;
 }
 
+// compiler reports unused
+/*
 static uint8_t beesignChkID(uint8_t id) {
     UNUSED(id);
     return BEESIGN_OK;
 }
+*/
 
 uint8_t beesignReceive(uint8_t **pRcvFrame) {
     if (!receiveFrameValid) {
@@ -608,7 +611,7 @@ bool checkBeesignSerialPort(void) {
 
 void beesignUpdate(timeUs_t currentTimeUs) {
     UNUSED(currentTimeUs);
-    if (checkBeesignSerialPort) {
+    if (checkBeesignSerialPort()) {
 #ifdef USE_OSD_BEESIGN
         static uint32_t beesignTaskCounter = 0;
         static uint32_t beesignSendNextCounterPoint = 0;

diff --git a/src/main/msc/usbd_msc_desc.c b/src/main/msc/usbd_msc_desc.c
@@ -67,8 +67,10 @@
 #define USBD_MANUFACTURER_STRING   "STMicroelectronics"
 #define USBD_PRODUCT_HS_STRING        "Mass Storage in HS Mode"
 #define USBD_PRODUCT_FS_STRING        "Mass Storage in FS Mode"
-#define USBD_CONFIGURATION_HS_STRING  "MSC Config"
-#define USBD_INTERFACE_HS_STRING      "MSC Interface"
+#define USBD_CONFIGURATION_HS_STRING  "MSC Config in HS Mode"
+#define USBD_INTERFACE_HS_STRING      "MSC Interface in HS Mode"
+#define USBD_CONFIGURATION_FS_STRING  "MSC Config in FS Mode"
+#define USBD_INTERFACE_FS_STRING      "MSC Interface in FS Mode"
 /**
   * @}
   */

diff --git a/src/main/rx/crsf.c b/src/main/rx/crsf.c
@@ -130,6 +130,7 @@ typedef struct crsfPayloadLinkstatistics_s {
 } crsfLinkStatistics_t;
 
 static void handleCrsfLinkStatisticsFrame(const crsfLinkStatistics_t* statsPtr, timeUs_t currentTimeUs) {
+    UNUSED(currentTimeUs);
     const crsfLinkStatistics_t stats = *statsPtr;
     CRSFsetLQ(stats.uplink_Link_quality);
     CRSFsetRFMode(stats.rf_Mode);

diff --git a/src/main/target/CRASHTESTF7/TALONF7V2.md b/src/main/target/CRASHTESTF7/TALONF7V2.md
diff --git a/src/main/target/CRASHTESTF7/config.c b/src/main/target/CRASHTESTF7/config.c
diff --git a/src/main/target/CRASHTESTF7/target.c b/src/main/target/CRASHTESTF7/target.c
diff --git a/src/main/target/CRASHTESTF7/target.h b/src/main/target/CRASHTESTF7/target.h
diff --git a/src/main/target/CRASHTESTF7/target.mk b/src/main/target/CRASHTESTF7/target.mk
diff --git a/src/main/target/FLWO_FLYWOOF411FR/target.h b/src/main/target/FLWO_FLYWOOF411FR/target.h
@@ -169,5 +169,5 @@
 #define TARGET_IO_PORTC         0xffff
 #define TARGET_IO_PORTD         (BIT(2))
 
-#define USABLE_TIMER_CHANNEL_COUNT 7
+#define USABLE_TIMER_CHANNEL_COUNT 10
 #define USED_TIMERS             ( TIM_N(1)|TIM_N(2)|TIM_N(3)|TIM_N(4) )