Skip to content

Commit

Permalink
change local #includes to use quotes
Browse files Browse the repository at this point in the history
  • Loading branch information
avtoku committed Nov 21, 2024
1 parent 59f5e64 commit 649343e
Show file tree
Hide file tree
Showing 64 changed files with 232 additions and 263 deletions.
2 changes: 1 addition & 1 deletion common/Callbacks.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#ifndef USERCALLBACKS_H_
#define USERCALLBACKS_H_

#include <main.h>
#include "main.h"

#ifdef __cplusplus
extern "C" {
Expand Down
2 changes: 1 addition & 1 deletion common/CommonConfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

#include "stm32h7xx_hal.h"

#include <main.h>
#include "main.h"

// Buffers types

Expand Down
2 changes: 1 addition & 1 deletion common/USB_AL94/usbd_cdc.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ extern "C" {
#endif

#include "usbd_ioreq.h"
#include <BoardConfig.h>
#include "BoardConfig.h"

#define CDC_ACM_STR_DESC "STM32 CDC ACM%d"

Expand Down
2 changes: 1 addition & 1 deletion common/USB_AL94/usbd_cdc_if.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
/* Includes ------------------------------------------------------------------*/
#include "usbd_cdc_if.h"

#include <Callbacks.h>
#include "Callbacks.h"

#define APP_RX_DATA_SIZE 128
//#define APP_TX_DATA_SIZE 128
Expand Down
2 changes: 1 addition & 1 deletion common/USB_AL94/usbd_composite.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ extern "C" {

#include "stdbool.h"
#include "usbd_ioreq.h"
#include <BoardConfig.h> // NOTE! replaced "AL94.I-CUBE-USBD-COMPOSITE_conf.h"
#include "BoardConfig.h" // NOTE! replaced "AL94.I-CUBE-USBD-COMPOSITE_conf.h"

#define USBD_USE_HS _USBD_USE_HS
#define USBD_USE_CDC_ACM _USBD_USE_CDC_ACM
Expand Down
2 changes: 1 addition & 1 deletion common/USB_AL94/usbd_conf.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "usb.h"
#else
// #include "usb_otg.h"
#include <BoardConfig.h>
#include "BoardConfig.h"
#endif
/* USER CODE END Includes */

Expand Down
4 changes: 2 additions & 2 deletions common/Varmint.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
*
******************************************************************************
**/
#include <Varmint.h>
#include "Varmint.h"

#include <Time64.h>
#include "Time64.h"

#include <ctime>

Expand Down
35 changes: 18 additions & 17 deletions common/Varmint.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,25 +38,26 @@
#ifndef VARMINT_H_
#define VARMINT_H_

#include <Adc.h>
#include <Adis165xx.h>
#include <Auav.h>
#include <Bmi088.h>
#include <DlhrL20G.h>
#include <Dps310.h>
#include <Iis2mdc.h>
#include <Ist8308.h>
#include <Mcp4017.h>
#include <Ms4525.h>
#include <Pwm.h>
#include <Sbus.h>
#include <Sd.h>
#include <Telem.h>
#include <Ubx.h>
#include <Vcp.h>
#include "Adc.h"
#include "Adis165xx.h"
#include "Auav.h"
#include "Bmi088.h"
#include "DlhrL20G.h"
#include "Dps310.h"
#include "Iis2mdc.h"
#include "Ist8308.h"
#include "Mcp4017.h"
#include "Ms4525.h"
#include "Pwm.h"
#include "Sbus.h"
#include "Sd.h"
#include "Telem.h"
#include "Ubx.h"
#include "Vcp.h"
#include "interface/board.h"

#include <BoardConfig.h>
#include "BoardConfig.h"


/*
*
Expand Down
10 changes: 5 additions & 5 deletions common/drivers/Adc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@
******************************************************************************
**/

#include <BoardConfig.h>
#include "BoardConfig.h"

#include <Adc.h>
#include "Adc.h"

#include <Packets.h>
#include <Time64.h>
#include <misc.h>
#include "Packets.h"
#include "Time64.h"
#include "misc.h"

extern Time64 time64;

Expand Down
4 changes: 2 additions & 2 deletions common/drivers/Adc.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
#ifndef ADC_H_
#define ADC_H_

#include <BoardConfig.h>
#include <Driver.h>
#include "BoardConfig.h"
#include "Driver.h"

typedef struct __attribute__((__packed__))
{
Expand Down
8 changes: 4 additions & 4 deletions common/drivers/Adis165xx.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
******************************************************************************
**/

#include <Adis165xx.h>
#include <Packets.h>
#include <Time64.h>
#include <misc.h>
#include "Adis165xx.h"
#include "Packets.h"
#include "Time64.h"
#include "misc.h"

#define ADIS_OK (0x0000)

Expand Down
6 changes: 3 additions & 3 deletions common/drivers/Adis165xx.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
#ifndef ADIS165XX_H_
#define ADIS165XX_H_

#include <BoardConfig.h>
#include <Driver.h>
#include <Spi.h>
#include "BoardConfig.h"
#include "Driver.h"
#include "Spi.h"

class Adis165xx : public Driver
{
Expand Down
10 changes: 5 additions & 5 deletions common/drivers/Auav.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@
*
******************************************************************************
**/
#include <Auav.h>
#include <Packets.h>
#include <Polling.h>
#include <Time64.h>
#include <misc.h>
#include "Auav.h"
#include "Packets.h"
#include "Polling.h"
#include "Time64.h"
#include "misc.h"

extern Time64 time64;

Expand Down
6 changes: 3 additions & 3 deletions common/drivers/Auav.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
#ifndef AUAV_H_
#define AUAV_H_

#include <BoardConfig.h>
#include <Driver.h>
#include <Spi.h>
#include "BoardConfig.h"
#include "Driver.h"
#include "Spi.h"

#define AUAV_CMD_BYTES 3

Expand Down
12 changes: 6 additions & 6 deletions common/drivers/Bmi088.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
******************************************************************************
**/

#include <Bmi088.h>
#include <Bmi088_config.h>
#include <Packets.h>
#include <Time64.h>
#include <bmi08_defs.h>
#include <misc.h>
#include "Bmi088.h"
#include "Bmi088_config.h"
#include "Packets.h"
#include "Time64.h"
#include "bmi08_defs.h"
#include "misc.h"

#define SPI_READ (uint8_t) 0x80
#define SPI_WRITE (uint8_t) 0x00
Expand Down
4 changes: 2 additions & 2 deletions common/drivers/Bmi088.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
#ifndef BMI088_H_
#define BMI088_H_

#include <Driver.h>
#include <Spi.h>
#include "Driver.h"
#include "Spi.h"

/*
*
Expand Down
2 changes: 1 addition & 1 deletion common/drivers/ByteFifo.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

#include <stdio.h>

#include <Status.h>
#include "Status.h"

class ByteFifo : public Status
{
Expand Down
8 changes: 4 additions & 4 deletions common/drivers/DlhrL20G.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,10 @@
*
******************************************************************************
**/
#include <DlhrL20G.h>
#include <Time64.h>
#include <misc.h>
#include "DlhrL20G.h"
#include "Time64.h"
#include "misc.h"

extern Time64 time64;

#define DLHRL20G_OK (0x40)
Expand Down Expand Up @@ -137,7 +138,6 @@ bool DlhrL20G::poll(uint64_t poll_counter)
bool status = false;
static bool previous_drdy = 0;
bool current_drdy = HAL_GPIO_ReadPin(drdyPort_, drdyPin_);

if (poll_offset == 0) // polled sensor measurement start
{
dlhr_i2c_dma_buf[0] = cmdByte_;
Expand Down
8 changes: 4 additions & 4 deletions common/drivers/DlhrL20G.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
#ifndef DLHRL20G_H_
#define DLHRL20G_H_

#include <BoardConfig.h>
#include <Driver.h>
#include <Packets.h>
#include <Time64.h>
#include "BoardConfig.h"
#include "Driver.h"
#include "Packets.h"
#include "Time64.h"

#define DLHRL20G_I2C_ADDRESS (0x29)
/*
Expand Down
8 changes: 4 additions & 4 deletions common/drivers/Dps310.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
******************************************************************************
**/

#include <Dps310.h>
#include <Packets.h>
#include <Time64.h>
#include <misc.h>
#include "Dps310.h"
#include "Packets.h"
#include "Time64.h"
#include "misc.h"

#define DPS310_OK (0xE0D0)

Expand Down
8 changes: 4 additions & 4 deletions common/drivers/Dps310.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
#ifndef DPS310_H_
#define DPS310_H_

#include <BoardConfig.h>
#include <Driver.h>
#include <Spi.h>
#include <Time64.h>
#include "BoardConfig.h"
#include "Driver.h"
#include "Spi.h"
#include "Time64.h"

/*
*
Expand Down
10 changes: 5 additions & 5 deletions common/drivers/Driver.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@

#include "stm32h7xx_hal.h"

#include <BoardConfig.h>
#include <PacketFifo.h>
#include <Polling.h>
#include <stdint.h>
#include "BoardConfig.h"
#include "PacketFifo.h"
#include "Polling.h"
#include "Status.h"

#include <Status.h>
#include <stdint.h>

class Driver : public Status
{
Expand Down
9 changes: 5 additions & 4 deletions common/drivers/Iis2mdc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,11 @@
******************************************************************************
**/

#include <Iis2mdc.h>
#include <Packets.h>
#include <Time64.h>
#include <misc.h>
#include "Iis2mdc.h"
#include "Packets.h"
#include "Time64.h"
#include "misc.h"

extern Time64 time64;

#define IIS2MDC_OK (0x0F)
Expand Down
6 changes: 3 additions & 3 deletions common/drivers/Iis2mdc.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
#ifndef IIS2MDC_H_
#define IIS2MDC_H_

#include <BoardConfig.h>
#include <Driver.h>
#include <Spi.h>
#include "BoardConfig.h"
#include "Driver.h"
#include "Spi.h"

/*
*
Expand Down
6 changes: 3 additions & 3 deletions common/drivers/Ist8308.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
******************************************************************************
**/

#include <Ist8308.h>
#include <misc.h>
#include "Ist8308.h"
#include "misc.h"
#include "Time64.h"

#include <Time64.h>
extern Time64 time64;

DMA_RAM uint8_t ist8308_i2c_dma_buf[I2C_DMA_MAX_BUFFER_SIZE];
Expand Down
8 changes: 4 additions & 4 deletions common/drivers/Ist8308.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
#ifndef DRIVERS_IST8308_H_
#define DRIVERS_IST8308_H_

#include <BoardConfig.h>
#include <Driver.h>
#include <Packets.h>
#include <Time64.h>
#include "BoardConfig.h"
#include "Driver.h"
#include "Packets.h"
#include "Time64.h"

class Ist8308 : public Driver
{
Expand Down
4 changes: 2 additions & 2 deletions common/drivers/Mcp4017.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@

#define MCP4017_I2C_ADDRESS (0x2F)

#include <misc.h>
#include "misc.h"
#include "Status.h"

#include <Status.h>
/*
*
*/
Expand Down
Loading

0 comments on commit 649343e

Please sign in to comment.