Skip to content

Commit

Permalink
Merge pull request #347 from aabadie/format_fix
Browse files Browse the repository at this point in the history
Makefile: fix clang format file selection and fix formatting in upgate main application
  • Loading branch information
aabadie authored Nov 15, 2024
2 parents 1695c5d + 9136256 commit 029839e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,8 @@ endif
OTAP_APPS ?= $(shell find otap/ -maxdepth 1 -mindepth 1 -type d | tr -d "/" | sed -e s/otap// | sort)
OTAP_APPS := $(filter-out bootloader,$(OTAP_APPS))

SRCS ?= $(shell find bsp/ -name "*.[c|h]") $(shell find crypto/ -name "*.[c|h]") $(shell find drv/ -name "*.[c|h]") $(shell find projects/ -name "*.[c|h]") $(shell find otap/ -name "*.[c|h]")
DIRS ?= bsp crypto drv projects otap swarmit upgate
SRCS ?= $(foreach dir,$(DIRS),$(shell find $(dir) -name "*.[c|h]"))
CLANG_FORMAT ?= clang-format
CLANG_FORMAT_TYPE ?= file

Expand Down
16 changes: 8 additions & 8 deletions upgate/application/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@

//=========================== defines ==========================================

#define DB_UART_BAUDRATE (1000000U)
#define DB_UART_BAUDRATE (1000000U)

typedef struct {
bool packet_received;
uint8_t message_buffer[UINT8_MAX];
uint8_t uart_byte;
bool uart_byte_received;
uint8_t hdlc_buffer[UINT8_MAX];
bool packet_received;
uint8_t message_buffer[UINT8_MAX];
uint8_t uart_byte;
bool uart_byte_received;
uint8_t hdlc_buffer[UINT8_MAX];
} application_vars_t;

//=========================== variables ========================================
Expand Down Expand Up @@ -82,9 +82,9 @@ static void _upgate_reply(const uint8_t *message, size_t len) {
}

static const db_upgate_conf_t _upgate_config = {
.reply = _upgate_reply,
.reply = _upgate_reply,
.n25q128_conf = &_n25q128_conf,
.prog = &_prog_pin,
.prog = &_prog_pin,
};

//================================ main ========================================
Expand Down

0 comments on commit 029839e

Please sign in to comment.