diff --git a/Microcontrollers/Microcontrollers.atsln b/Microcontrollers/Microcontrollers.atsln index c764a78..461028b 100644 --- a/Microcontrollers/Microcontrollers.atsln +++ b/Microcontrollers/Microcontrollers.atsln @@ -12,11 +12,10 @@ EndProject Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "opdracht 1.5", "opdracht 1.5\opdracht 1.5.cproj", "{B2CED75E-444E-40D3-8DB2-1E83EBFA08BA}" EndProject Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "opdracht 1.7a", "opdracht 1.7a\opdracht 1.7a.cproj", "{BAE7767D-1CC2-42DA-9CC0-FD878EA43AC1}" -<<<<<<< HEAD EndProject Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "opdracht 2.1", "opdracht 2.1\opdracht 2.1.cproj", "{69165C62-B4D4-4FE3-B777-080628FAC668}" -======= ->>>>>>> main +EndProject +Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "Opdracht 2.2", "Opdracht 2.2\Opdracht 2.2.cproj", "{7328E66F-4181-4553-9542-DA5CC2A74A4E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -44,13 +43,14 @@ Global {BAE7767D-1CC2-42DA-9CC0-FD878EA43AC1}.Debug|AVR.Build.0 = Debug|AVR {BAE7767D-1CC2-42DA-9CC0-FD878EA43AC1}.Release|AVR.ActiveCfg = Release|AVR {BAE7767D-1CC2-42DA-9CC0-FD878EA43AC1}.Release|AVR.Build.0 = Release|AVR -<<<<<<< HEAD {69165C62-B4D4-4FE3-B777-080628FAC668}.Debug|AVR.ActiveCfg = Debug|AVR {69165C62-B4D4-4FE3-B777-080628FAC668}.Debug|AVR.Build.0 = Debug|AVR {69165C62-B4D4-4FE3-B777-080628FAC668}.Release|AVR.ActiveCfg = Release|AVR {69165C62-B4D4-4FE3-B777-080628FAC668}.Release|AVR.Build.0 = Release|AVR -======= ->>>>>>> main + {7328E66F-4181-4553-9542-DA5CC2A74A4E}.Debug|AVR.ActiveCfg = Debug|AVR + {7328E66F-4181-4553-9542-DA5CC2A74A4E}.Debug|AVR.Build.0 = Debug|AVR + {7328E66F-4181-4553-9542-DA5CC2A74A4E}.Release|AVR.ActiveCfg = Release|AVR + {7328E66F-4181-4553-9542-DA5CC2A74A4E}.Release|AVR.Build.0 = Release|AVR EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Microcontrollers/opdracht 1.3/Debug/Makefile b/Microcontrollers/opdracht 1.3/Debug/Makefile index 7ccbf24..3fcd59f 100644 --- a/Microcontrollers/opdracht 1.3/Debug/Makefile +++ b/Microcontrollers/opdracht 1.3/Debug/Makefile @@ -36,7 +36,8 @@ SUBDIRS := # Add inputs and outputs from these tool invocations to the build variables -C_SRCS += +C_SRCS += \ +../main.c PREPROCESSING_SRCS += @@ -45,13 +46,17 @@ PREPROCESSING_SRCS += ASM_SRCS += -OBJS += +OBJS += \ +main.o -OBJS_AS_ARGS += +OBJS_AS_ARGS += \ +main.o -C_DEPS += +C_DEPS += \ +main.d -C_DEPS_AS_ARGS += +C_DEPS_AS_ARGS += \ +main.d OUTPUT_FILE_PATH +=opdracht\ 1.3.elf @@ -67,6 +72,13 @@ LINKER_SCRIPT_DEP+= # AVR32/GNU C Compiler +./main.o: .././main.c + @echo Building file: $< + @echo Invoking: AVR/GNU C Compiler : 5.4.0 + $(QUOTE)C:\Program Files (x86)\Atmel\Studio\7.0\toolchain\avr8\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -O0 -ffunction-sections -fdata-sections -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<" + @echo Finished building: $< + + diff --git a/Microcontrollers/opdracht 1.3/main.c b/Microcontrollers/opdracht 1.3/main.c index ec33dd8..1c835ff 100644 --- a/Microcontrollers/opdracht 1.3/main.c +++ b/Microcontrollers/opdracht 1.3/main.c @@ -5,7 +5,11 @@ * Author : Sem */ +#define F_CPU 10e6 + #include +#include +#include void wait( int ms ) { diff --git a/Microcontrollers/opdracht 1.3/opdracht 1.3.cproj b/Microcontrollers/opdracht 1.3/opdracht 1.3.cproj index f8f58ce..7e284a5 100644 --- a/Microcontrollers/opdracht 1.3/opdracht 1.3.cproj +++ b/Microcontrollers/opdracht 1.3/opdracht 1.3.cproj @@ -49,5 +49,10 @@ + + + compile + + \ No newline at end of file diff --git a/Microcontrollers/opdracht 2.1/Debug/opdracht 2.1.lss b/Microcontrollers/opdracht 2.1/Debug/opdracht 2.1.lss index b108395..7a89f19 100644 --- a/Microcontrollers/opdracht 2.1/Debug/opdracht 2.1.lss +++ b/Microcontrollers/opdracht 2.1/Debug/opdracht 2.1.lss @@ -11,23 +11,23 @@ Idx Name Size VMA LMA File off Algn CONTENTS, READONLY 3 .debug_aranges 00000038 00000000 00000000 000001ab 2**0 CONTENTS, READONLY, DEBUGGING - 4 .debug_info 00000b51 00000000 00000000 000001e3 2**0 + 4 .debug_info 00000b2a 00000000 00000000 000001e3 2**0 CONTENTS, READONLY, DEBUGGING - 5 .debug_abbrev 00000830 00000000 00000000 00000d34 2**0 + 5 .debug_abbrev 00000830 00000000 00000000 00000d0d 2**0 CONTENTS, READONLY, DEBUGGING - 6 .debug_line 000002cb 00000000 00000000 00001564 2**0 + 6 .debug_line 000002cb 00000000 00000000 0000153d 2**0 CONTENTS, READONLY, DEBUGGING - 7 .debug_frame 00000074 00000000 00000000 00001830 2**2 + 7 .debug_frame 00000074 00000000 00000000 00001808 2**2 CONTENTS, READONLY, DEBUGGING - 8 .debug_str 0000027d 00000000 00000000 000018a4 2**0 + 8 .debug_str 0000027d 00000000 00000000 0000187c 2**0 CONTENTS, READONLY, DEBUGGING - 9 .debug_loc 000000e2 00000000 00000000 00001b21 2**0 + 9 .debug_loc 000000e2 00000000 00000000 00001af9 2**0 CONTENTS, READONLY, DEBUGGING - 10 .debug_ranges 00000028 00000000 00000000 00001c03 2**0 + 10 .debug_ranges 00000028 00000000 00000000 00001bdb 2**0 CONTENTS, READONLY, DEBUGGING 11 .text 00000004 00000124 00000124 00000178 2**1 CONTENTS, ALLOC, LOAD, READONLY, CODE - 12 .note.gnu.avr.deviceinfo 0000003c 00000000 00000000 00001c2c 2**2 + 12 .note.gnu.avr.deviceinfo 0000003c 00000000 00000000 00001c04 2**2 CONTENTS, READONLY, DEBUGGING 13 .text.wait 0000001e 000000ca 000000ca 0000011e 2**1 CONTENTS, ALLOC, LOAD, READONLY, CODE