diff --git a/lab1/Makefile b/lab1/Makefile index f44fc63..72bc400 100644 --- a/lab1/Makefile +++ b/lab1/Makefile @@ -3,7 +3,8 @@ CC = arm-none-eabi-gcc # The location of the C compiler # ARMGCC_ROOT is used by some makefiles that need to know where the compiler # is installed. -ARMGCC_ROOT := ${shell dirname ${shell readlink ${shell which ${CC}}}}/.. +ARMGCC_ROOT := /usr/arm-none-eabi +# ${shell dirname ${shell readlink ${shell which ${CC}}}}/.. ROOT ?= $(abspath ..) diff --git a/lab1/main.c b/lab1/main.c index e462159..c4a8100 100644 --- a/lab1/main.c +++ b/lab1/main.c @@ -228,11 +228,11 @@ int main(void) { break; case SW1 | SW2: outP1(0); - outP2(RED); + outP2(BLUE | GREEN); break; default: outP1(0); - outP2(BLUE | GREEN); + outP2(0); } } } \ No newline at end of file