Merge branch 'main' into dev

lab1/Makefile

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

lab1/main.c

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

lab2/Makefile

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

lab3/Makefile

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