hladu357
/
Taltech_embedded
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into dev

This commit is contained in:
Hladu357 2025-03-04 17:06:18 +02:00
parent cb52da4776 57c882325e
commit 151659dfc9
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lab1/Makefile
View File

@ -21,7 +21,6 @@ CFLAGS = -I.. -I../inc \
-mfpu=fpv4-sp-d16 \ -mfpu=fpv4-sp-d16 \
-ffunction-sections \ -ffunction-sections \
-fdata-sections \ -fdata-sections \
-g \
-gstrict-dwarf \ -gstrict-dwarf \
-Wall \ -Wall \
-I$(ARMGCC_ROOT)/arm-none-eabi/include/newlib-nano \ -I$(ARMGCC_ROOT)/arm-none-eabi/include/newlib-nano \
@ -44,7 +43,7 @@ LFLAGS = -Wl,-T,../config.lds \
all: $(NAME).out all: $(NAME).out
main.o: main.c main.o: main.c
@$(CC) $(CFLAGS) $< -c -o $@ @$(CC) $(CFLAGS) -g $< -c -o $@
system.o: ../system.c system.o: ../system.c
@$(CC) $(CFLAGS) $< -c -o $@ @$(CC) $(CFLAGS) $< -c -o $@

5
lab1/main.c
View File

@ -228,11 +228,12 @@ int main(void) {
break; break;
case SW1 | SW2: case SW1 | SW2:
outP1(0); outP1(0);
outP2(BLUE | GREEN); outP2(RED);
break; break;
default: default:
outP1(0); outP1(0);
outP2(0); outP2(BLUE | GREEN);
>>>>>>> main
} }
} }
} }

7
lab2/Makefile
View File

@ -20,7 +20,6 @@ CFLAGS = -I.. -I../inc -I../common \
-mfpu=fpv4-sp-d16 \ -mfpu=fpv4-sp-d16 \
-ffunction-sections \ -ffunction-sections \
-fdata-sections \ -fdata-sections \
-g \
-gstrict-dwarf \ -gstrict-dwarf \
-Wall \ -Wall \
-I$(ARMGCC_ROOT)/arm-none-eabi/include/newlib-nano \ -I$(ARMGCC_ROOT)/arm-none-eabi/include/newlib-nano \
@ -43,13 +42,13 @@ LFLAGS = -Wl,-T,../config.lds \
all: $(NAME).out all: $(NAME).out
main.o: main.c main.o: main.c
@$(CC) $(CFLAGS) $< -c -o $@ @$(CC) $(CFLAGS) -g $< -c -o $@
bump.o: ../common/bump.c bump.o: ../common/bump.c
@$(CC) $(CFLAGS) $< -c -o $@ @$(CC) $(CFLAGS) -g $< -c -o $@
delay.o: ../common/delay.c delay.o: ../common/delay.c
@$(CC) $(CFLAGS) $< -c -o $@ @$(CC) $(CFLAGS) -g $< -c -o $@
clock.o: ../common/clock.c clock.o: ../common/clock.c
@$(CC) $(CFLAGS) $< -c -o $@ @$(CC) $(CFLAGS) $< -c -o $@

9
lab3/Makefile
View File

@ -20,7 +20,6 @@ CFLAGS = -I.. -I../inc -I../common \
-mfpu=fpv4-sp-d16 \ -mfpu=fpv4-sp-d16 \
-ffunction-sections \ -ffunction-sections \
-fdata-sections \ -fdata-sections \
-g \
-gstrict-dwarf \ -gstrict-dwarf \
-Wall \ -Wall \
-I$(ARMGCC_ROOT)/arm-none-eabi/include/newlib-nano \ -I$(ARMGCC_ROOT)/arm-none-eabi/include/newlib-nano \
@ -43,19 +42,19 @@ LFLAGS = -Wl,-T,../config.lds \
all: $(NAME).out all: $(NAME).out
main.o: main.c main.o: main.c
@$(CC) $(CFLAGS) $< -c -o $@ @$(CC) $(CFLAGS) -g $< -c -o $@
bump.o: ../common/bump.c bump.o: ../common/bump.c
@$(CC) $(CFLAGS) $< -c -o $@ @$(CC) $(CFLAGS) -g $< -c -o $@
delay.o: ../common/delay.c delay.o: ../common/delay.c
@$(CC) $(CFLAGS) $< -c -o $@ @$(CC) $(CFLAGS) -g $< -c -o $@
clock.o: ../common/clock.c clock.o: ../common/clock.c
@$(CC) $(CFLAGS) $< -c -o $@ @$(CC) $(CFLAGS) $< -c -o $@
reflectance.o: ../common/reflectance.c reflectance.o: ../common/reflectance.c
@$(CC) $(CFLAGS) $< -c -o $@ @$(CC) $(CFLAGS) -g $< -c -o $@
cpu.o: ../common/cpu.c cpu.o: ../common/cpu.c
@$(CC) $(CFLAGS) $< -c -o $@ @$(CC) $(CFLAGS) $< -c -o $@