cleanup on .c dependencies. used direct dependencies in .c files inst…

…ead of indirect dependencies in .h
digant73 · Jul 29, 2021 · 6e7fd9e · 6e7fd9e
1 parent b5fe44f
commit 6e7fd9e
Show file tree

Hide file tree

Showing 65 changed files with 137 additions and 129 deletions.
diff --git a/TFT/src/User/API/LCD_Dimming.c b/TFT/src/User/API/LCD_Dimming.c
@@ -1,6 +1,6 @@
 #include "LCD_Dimming.h"
-#include "GPIO_Init.h"
 #include "includes.h"
+#include "GPIO_Init.h"
 
 #ifdef LCD_LED_PWM_CHANNEL
 

diff --git a/TFT/src/User/API/UI/CharIcon.c b/TFT/src/User/API/UI/CharIcon.c
@@ -1,6 +1,6 @@
 #include "CharIcon.h"
-#include <stdint.h>
 #include "LCD_Colors.h"
+#include <stdint.h>
 
 const uint16_t charIconColor[CHARICON_NUM] =
 {

diff --git a/TFT/src/User/API/UI/GUI.c b/TFT/src/User/API/UI/GUI.c
@@ -1,6 +1,6 @@
 #include "GUI.h"
 #include "includes.h"
-#include "math.h"
+#include <math.h>
 
 uint16_t foreGroundColor = WHITE;
 uint16_t backGroundColor = BLACK;

diff --git a/TFT/src/User/API/UI/Numpad.c b/TFT/src/User/API/UI/Numpad.c
@@ -1,6 +1,6 @@
 #include "Numpad.h"
-#include "CharIcon.h"
 #include "includes.h"
+#include "CharIcon.h"
 
 #define SKEYHEIGHT (LCD_HEIGHT - ICON_START_Y) / 4
 #define SKEYWIDTH  LCD_WIDTH / 4

diff --git a/TFT/src/User/API/UI/TouchProcess.c b/TFT/src/User/API/UI/TouchProcess.c
@@ -1,6 +1,6 @@
 #include "TouchProcess.h"
-#include "GPIO_Init.h"
 #include "includes.h"
+#include "GPIO_Init.h"
 
 #define XL1 LCD_X[0]
 #define XL2 LCD_X[1]

diff --git a/TFT/src/User/API/UI/ui_draw.c b/TFT/src/User/API/UI/ui_draw.c
@@ -1,9 +1,9 @@
 #define _GNU_SOURCE
-#include <stdio.h>
-#include <malloc.h>
 
 #include "ui_draw.h"
 #include "includes.h"
+#include <stdio.h>
+#include <malloc.h>
 
 #if (THUMBNAIL_PARSER == PARSER_BASE64PNG)
   #include "pngle.h"

diff --git a/TFT/src/User/API/printf/printf.c b/TFT/src/User/API/printf/printf.c
@@ -30,11 +30,10 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include <stdbool.h>
-#include <stdint.h>
-
 #include "printf.h"
 #include "includes.h"
+#include <stdbool.h>
+#include <stdint.h>
 
 // define this globally (e.g. gcc -DPRINTF_INCLUDE_CONFIG_H ...) to include the
 // printf_config.h header file

diff --git a/TFT/src/User/Fatfs/diskio.c b/TFT/src/User/Fatfs/diskio.c
@@ -7,12 +7,12 @@
 /* storage control modules to the FatFs module with a defined API.       */
 /*-----------------------------------------------------------------------*/
 
-#include "ff.h"      // Obtains integer types
-#include "diskio.h"  // Declarations of disk functions
+#include "ff.h"        // Obtains integer types
+#include "variants.h"  // for SD_SPI_SUPPORT etc...
+#include "diskio.h"    // Declarations of disk functions
 #include "usb_conf.h"
 #include "usbh_msc_core.h"
 #include "usbh_usr.h"
-#include "variants.h"
 
 #ifdef SD_SPI_SUPPORT
   #include "sd.h"

diff --git a/TFT/src/User/Fatfs/ffsystem.c b/TFT/src/User/Fatfs/ffsystem.c
@@ -5,7 +5,7 @@
 
 
 #include "ff.h"
-#include "stdlib.h"
+#include <stdlib.h>
 
 
 #if FF_USE_LFN == 3 /* Dynamic memory allocation */

diff --git a/TFT/src/User/Fatfs/ffunicode.c b/TFT/src/User/Fatfs/ffunicode.c
@@ -22,7 +22,6 @@
 / by use of this software.
 */
 
-
 #include "ff.h"
 
 #if FF_USE_LFN  /* This module will be blanked if non-LFN configuration */

diff --git a/TFT/src/User/Fatfs/myfatfs.c b/TFT/src/User/Fatfs/myfatfs.c
@@ -1,6 +1,6 @@
 #include "myfatfs.h"
+#include "includes.h"  // for infoSettings etc...
 #include "diskio.h"
-#include "includes.h"
 
 FATFS fatfs[FF_VOLUMES];  // FATFS work area
 

diff --git a/TFT/src/User/Hal/HD44780.c b/TFT/src/User/Hal/HD44780.c
@@ -1,8 +1,7 @@
 #include "HD44780.h"
+#include "variants.h"  // for LCD2004_EMULATOR etc...
 #include "GPIO_Init.h"
-#include "stdlib.h"
-#include "variants.h"
-#include "Settings.h"
+#include <stdlib.h>
 
 #ifdef LCD2004_EMULATOR
 

diff --git a/TFT/src/User/Hal/Knob_LED.c b/TFT/src/User/Hal/Knob_LED.c
@@ -1,6 +1,6 @@
 #include "Knob_LED.h"
+#include "includes.h"  // for mcuClocks, LED_COLOR_PIN etc...
 #include "GPIO_Init.h"
-#include "includes.h"
 
 #ifdef LED_COLOR_PIN
 

diff --git a/TFT/src/User/Hal/LCD_Init.c b/TFT/src/User/Hal/LCD_Init.c
@@ -1,6 +1,6 @@
 #include "LCD_Init.h"
+#include "includes.h"  // for RM68042..., lcd.h, lcd_dma.h, timer_pwm.h etc...
 #include "GPIO_Init.h"
-#include "includes.h"
 
 // LCD driver sequential
 #if LCD_DRIVER_HAS(RM68042)

diff --git a/TFT/src/User/Hal/LCD_Init.h b/TFT/src/User/Hal/LCD_Init.h
@@ -5,7 +5,7 @@
 extern "C" {
 #endif
 
-#include "variants.h"  // for LCD_DATA_16BIT, LCD_LED_PWM_CHANNEL
+#include "variants.h"  // for LCD_DATA_16BIT, LCD_LED_PWM_CHANNEL etc...
 
 #if LCD_DATA_16BIT == 1
   #define LCD_WR_16BITS_DATA(c) do{ LCD_WR_DATA(c); }while(0)

diff --git a/TFT/src/User/Hal/buzzer.c b/TFT/src/User/Hal/buzzer.c
@@ -1,6 +1,6 @@
 #include "buzzer.h"
+#include "includes.h"  // for mcuClocks, infoSettings etc...
 #include "GPIO_Init.h"
-#include "includes.h"
 
 #ifdef BUZZER_PIN
 

diff --git a/TFT/src/User/Hal/buzzer.h b/TFT/src/User/Hal/buzzer.h
@@ -8,6 +8,7 @@ extern "C" {
 #include <stdint.h>
 
 #define BUZZER_CACHE_SIZE 5
+
 typedef struct
 {
   uint32_t frequency[BUZZER_CACHE_SIZE];

diff --git a/TFT/src/User/Hal/sd.c b/TFT/src/User/Hal/sd.c
@@ -1,8 +1,9 @@
-#include "variants.h"
+#include "variants.h"  // for SD_SPI_SUPPORT etc...
 
 #ifdef SD_SPI_SUPPORT
 #include "sd.h"
 #include "GPIO_Init.h"
+#include "spi.h"
 
 u8 SD_Type = 0;  //SDCard type
 

diff --git a/TFT/src/User/Hal/sd.h b/TFT/src/User/Hal/sd.h
@@ -5,7 +5,7 @@
 extern "C" {
 #endif
 
-#include "spi.h"
+#include "variants.h"  // for u8 etc...
 
 // SDCard type definition
 #define SD_TYPE_ERR  0X00
@@ -50,16 +50,16 @@ extern "C" {
 #define SD_RESPONSE_FAILURE     0xFF
 
 u8 SD_CD_Inserted(void);
-u8 SD_Init(void);                           //initialization
+u8 SD_Init(void);                               //initialization
 void SD_DeInit(void);
-u8 SD_ReadDisk(u8*buf,u32 sector,u8 cnt);   //Read SD card, fatfs / usb call
-u8 SD_WriteDisk(u8*buf,u32 sector,u8 cnt);  //Write SD card, fatfs / usb call
+u8 SD_ReadDisk(u8 * buf, u32 sector, u8 cnt);   //Read SD card, fatfs / usb call
+u8 SD_WriteDisk(u8 * buf, u32 sector, u8 cnt);  //Write SD card, fatfs / usb call
 
-u8 SD_Wait_Ready(void);                     //Waiting for SD card preparation
-u8 SD_Get_Ack(u8 Response);                 //Get the answer
-u32 SD_Get_Sector_Count(void);              //Number of sectors read
-u8 SD_GetCID(u8 *cid_data);                 //Read SD card CID
-u8 SD_GetCSD(u8 *csd_data);                 //Read SD card CSD
+u8 SD_Wait_Ready(void);                         //Waiting for SD card preparation
+u8 SD_Get_Ack(u8 Response);                     //Get the answer
+u32 SD_Get_Sector_Count(void);                  //Number of sectors read
+u8 SD_GetCID(u8 * cid_data);                    //Read SD card CID
+u8 SD_GetCSD(u8 * csd_data);                    //Read SD card CSD
 
 #ifdef __cplusplus
 }

diff --git a/TFT/src/User/Hal/stm32f10x/GPIO_Init.c b/TFT/src/User/Hal/stm32f10x/GPIO_Init.c
@@ -19,7 +19,7 @@ void GPIO_InitSet(uint16_t io, GPIO_MODE mode, uint8_t AF)
     GPIO_Port[port]->BSRR = 1 << pin;       // set high
   }
 
-  if(pin <= 7)
+  if (pin <= 7)
   {
     GPIO_Port[port]->CRL &= ~(0xF << 4*(pin & 0x7));  // clear control reg bits
     GPIO_Port[port]->CRL |= mode << 4*(pin & 0x7);    // clear control reg bits

diff --git a/TFT/src/User/Hal/stm32f10x/GPIO_Init.h b/TFT/src/User/Hal/stm32f10x/GPIO_Init.h
@@ -1,7 +1,7 @@
 #ifndef _GPIO_INIT_H_
 #define _GPIO_INIT_H_
 
-#include "stm32f10x.h"
+#include "variants.h"
 #include "STM32Fxx_Pins.h"
 
 /*

diff --git a/TFT/src/User/Hal/stm32f10x/STM32_Flash.c b/TFT/src/User/Hal/stm32f10x/STM32_Flash.c
@@ -1,13 +1,12 @@
 #include "STM32_Flash.h"
 #include "my_misc.h"
-#include "stm32f10x.h"
 
 #define SIGN_ADDRESS (0x08040000 - 0x800)  // reserve the last page (2KB) to save user parameters
 
 void STM32_FlashRead(u8 *data, u32 len)
 {
   u32 i = 0;
-  for(i = 0; i < len; i++)
+  for (i = 0; i < len; i++)
   {
     data[i] = *(vu8*)(SIGN_ADDRESS + i);
   }
@@ -18,7 +17,7 @@ void STM32_FlashWrite(u8 *data, u32 len)
   u32 i = 0;
   FLASH_Unlock();
   FLASH_ErasePage(SIGN_ADDRESS);
-  for(i = 0; i < len; i += 2)
+  for (i = 0; i < len; i += 2)
   {
     u16 data16 = data[i] | (data[MIN(i+1, len-1)] << 8);  // stm32f10x needs to write at least 16 bits at a time
     FLASH_ProgramHalfWord(SIGN_ADDRESS + i, data16);

diff --git a/TFT/src/User/Hal/stm32f10x/STM32_Flash.h b/TFT/src/User/Hal/stm32f10x/STM32_Flash.h
@@ -1,7 +1,7 @@
 #ifndef _STM32_FLASH_H_
 #define _STM32_FLASH_H_
 
-#include "stm32f10x.h"
+#include "variants.h"  // for u8 etc...
 
 void STM32_FlashRead(u8 *data, u32 len);
 void STM32_FlashWrite(u8 *data, u32 len);

diff --git a/TFT/src/User/Hal/stm32f10x/Serial.c b/TFT/src/User/Hal/stm32f10x/Serial.c
@@ -1,5 +1,5 @@
 #include "Serial.h"
-#include "includes.h"
+#include "includes.h"  // for infoSettings, SERIAL_PORT etc...
 
 #define SERIAL_PORT_QUEUE_SIZE NOBEYOND(512, RAM_SIZE * 64, 4096)
 #define SERIAL_PORT_2_QUEUE_SIZE 512
@@ -15,7 +15,7 @@ typedef struct
   USART_TypeDef *uart;
   uint32_t dma_rcc;
   DMA_Channel_TypeDef *dma_chanel;
-}SERIAL_CFG;
+} SERIAL_CFG;
 
 static const SERIAL_CFG Serial[_UART_CNT] = {
   {USART1, RCC_AHBPeriph_DMA1, DMA1_Channel5},
@@ -121,14 +121,14 @@ void Serial_DeInit(void)
 
 void USART_IRQHandler(uint8_t port)
 {
-  if((Serial[port].uart->SR & (1<<4))!=0)
+  if ((Serial[port].uart->SR & (1<<4))!=0)
   {
     Serial[port].uart->SR;
     Serial[port].uart->DR;
 
     dmaL1Data[port].wIndex = dmaL1Data[port].cacheSize - Serial[port].dma_chanel->CNDTR;
     uint16_t wIndex = (dmaL1Data[port].wIndex == 0) ? dmaL1Data[port].cacheSize : dmaL1Data[port].wIndex;
-    if(dmaL1Data[port].cache[wIndex-1] == '\n')  // Receive completed
+    if (dmaL1Data[port].cache[wIndex-1] == '\n')  // Receive completed
     {
       infoHost.rx_ok[port] = true;
     }

diff --git a/TFT/src/User/Hal/stm32f10x/Serial.h b/TFT/src/User/Hal/stm32f10x/Serial.h
@@ -1,6 +1,8 @@
 #ifndef _SERIAL_H_
 #define _SERIAL_H_
 
+#include <stdint.h>
+#include "variants.h"  // for u32 etc...
 #include "uart.h"
 
 typedef struct