rhssk/inspektors
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up Makefile includes

Browse Source
This commit is contained in:
Rihards Skuja 2018-01-21 13:54:20 +02:00
parent dcca42d597
commit d0e9806d2b
No known key found for this signature in database
GPG Key ID: 53FA13A3F7F8571B
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
base_station/Makefile
View File

@ -30,7 +30,8 @@ CSTANDARD = -std=gnu99
CDEFS = -DF_CPU=16000000L -D__AVR__ -D__AVR_ATmega328P__ CDEFS = -DF_CPU=16000000L -D__AVR__ -D__AVR_ATmega328P__
# Place -I options here # Place -I options here
CINCS = -I $(INC_DIR) -I$(COMMON_INC_DIR) CINCS = -I /usr/avr/include -I /usr/lib/gcc/avr/7.2.0/include \
-I $(INC_DIR) -I $(COMMON_INC_DIR)
CTUNING = -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums CTUNING = -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums
#CEXTRA = -Wa,-adhlns=$(<:.c=.lst) #CEXTRA = -Wa,-adhlns=$(<:.c=.lst)
@ -53,7 +54,7 @@ ifeq ($(BUILD),debug)
-Wmissing-include-dirs -Wno-unused-parameter -Wuninitialized \ -Wmissing-include-dirs -Wno-unused-parameter -Wuninitialized \
-Wold-style-definition -Wmissing-prototypes -Wunreachable-code \ -Wold-style-definition -Wmissing-prototypes -Wunreachable-code \
-Wno-unused-but-set-variable -Wmaybe-uninitialized -Wno-unused-but-set-variable -Wmaybe-uninitialized
CINCS += -I/usr/include/simavr CINCS += -I /usr/include/simavr
# #
else else
CFLAGS += -DNDEBUG -s -Os CFLAGS += -DNDEBUG -s -Os

2
common/Makefile
View File

@ -44,7 +44,7 @@ ifeq ($(BUILD),debug)
-Wmissing-include-dirs -Wno-unused-parameter -Wuninitialized \ -Wmissing-include-dirs -Wno-unused-parameter -Wuninitialized \
-Wold-style-definition -Wmissing-prototypes -Wunreachable-code \ -Wold-style-definition -Wmissing-prototypes -Wunreachable-code \
-Wno-unused-but-set-variable -Wmaybe-uninitialized -Wno-unused-but-set-variable -Wmaybe-uninitialized
CINCS += -I/usr/include/simavr CINCS += -I /usr/include/simavr
# #
else else
CFLAGS += -DNDEBUG -s -Os CFLAGS += -DNDEBUG -s -Os

5
robot/Makefile
View File

@ -30,7 +30,8 @@ CSTANDARD = -std=gnu99
CDEFS = -DF_CPU=16000000L -D__AVR__ -D__AVR_ATmega328P__ CDEFS = -DF_CPU=16000000L -D__AVR__ -D__AVR_ATmega328P__
# Place -I options here # Place -I options here
CINCS = -I $(INC_DIR) -I$(COMMON_INC_DIR) CINCS = -I /usr/avr/include -I /usr/lib/gcc/avr/7.2.0/include \
-I $(INC_DIR) -I $(COMMON_INC_DIR)
CTUNING = -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums CTUNING = -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums
#CEXTRA = -Wa,-adhlns=$(<:.c=.lst) #CEXTRA = -Wa,-adhlns=$(<:.c=.lst)
@ -53,7 +54,7 @@ ifeq ($(BUILD),debug)
-Wmissing-include-dirs -Wno-unused-parameter -Wuninitialized \ -Wmissing-include-dirs -Wno-unused-parameter -Wuninitialized \
-Wold-style-definition -Wmissing-prototypes -Wunreachable-code \ -Wold-style-definition -Wmissing-prototypes -Wunreachable-code \
-Wno-unused-but-set-variable -Wmaybe-uninitialized -Wno-unused-but-set-variable -Wmaybe-uninitialized
CINCS += -I/usr/include/simavr CINCS += -I /usr/include/simavr
# #
else else
CFLAGS += -DNDEBUG -s -Os CFLAGS += -DNDEBUG -s -Os

1
robot/src/sonar.c
View File

@ -1,7 +1,6 @@
#include <avr/interrupt.h> #include <avr/interrupt.h>
#include <util/delay.h> #include <util/delay.h>
#include "sonar.h" #include "sonar.h"
#include "led.h" #include "led.h"
volatile uint32_t trig_counter; volatile uint32_t trig_counter;