From e46c3838cecc3b15d2300030ccd6ff0ca554a737 Mon Sep 17 00:00:00 2001 From: Remco Date: Wed, 30 Mar 2016 21:01:28 +0200 Subject: [PATCH 1/2] replaced visual studio project to map week 1-2 --- {C-RK => week1-2/C-RK}/C-RK-Week1/C-RK-Week1.vcxproj | 0 {C-RK => week1-2/C-RK}/C-RK-Week1/C-RK-Week1.vcxproj.filters | 0 {C-RK => week1-2/C-RK}/C-RK-Week1/main.c | 0 {C-RK => week1-2/C-RK}/C-RK-Week1/main.h | 0 {C-RK => week1-2/C-RK}/C-RK-Week2/C-RK-Week2.vcxproj | 4 ++-- {C-RK => week1-2/C-RK}/C-RK-Week2/C-RK-Week2.vcxproj.filters | 4 ++-- {C-RK => week1-2/C-RK}/C-RK-Week2/Makefile | 0 {C-RK => week1-2/C-RK}/C-RK-Week2/heap.c | 0 {C-RK => week1-2/C-RK}/C-RK-Week2/heap.h | 0 {C-RK => week1-2/C-RK}/C-RK-Week2/llist.c | 0 {C-RK => week1-2/C-RK}/C-RK-Week2/llist.h | 0 {C-RK => week1-2/C-RK}/C-RK-Week2/main.c | 0 {C-RK => week1-2/C-RK}/C-RK.sln | 0 13 files changed, 4 insertions(+), 4 deletions(-) rename {C-RK => week1-2/C-RK}/C-RK-Week1/C-RK-Week1.vcxproj (100%) rename {C-RK => week1-2/C-RK}/C-RK-Week1/C-RK-Week1.vcxproj.filters (100%) rename {C-RK => week1-2/C-RK}/C-RK-Week1/main.c (100%) rename {C-RK => week1-2/C-RK}/C-RK-Week1/main.h (100%) rename {C-RK => week1-2/C-RK}/C-RK-Week2/C-RK-Week2.vcxproj (98%) rename {C-RK => week1-2/C-RK}/C-RK-Week2/C-RK-Week2.vcxproj.filters (68%) rename {C-RK => week1-2/C-RK}/C-RK-Week2/Makefile (100%) rename {C-RK => week1-2/C-RK}/C-RK-Week2/heap.c (100%) rename {C-RK => week1-2/C-RK}/C-RK-Week2/heap.h (100%) rename {C-RK => week1-2/C-RK}/C-RK-Week2/llist.c (100%) rename {C-RK => week1-2/C-RK}/C-RK-Week2/llist.h (100%) rename {C-RK => week1-2/C-RK}/C-RK-Week2/main.c (100%) rename {C-RK => week1-2/C-RK}/C-RK.sln (100%) diff --git a/C-RK/C-RK-Week1/C-RK-Week1.vcxproj b/week1-2/C-RK/C-RK-Week1/C-RK-Week1.vcxproj similarity index 100% rename from C-RK/C-RK-Week1/C-RK-Week1.vcxproj rename to week1-2/C-RK/C-RK-Week1/C-RK-Week1.vcxproj diff --git a/C-RK/C-RK-Week1/C-RK-Week1.vcxproj.filters b/week1-2/C-RK/C-RK-Week1/C-RK-Week1.vcxproj.filters similarity index 100% rename from C-RK/C-RK-Week1/C-RK-Week1.vcxproj.filters rename to week1-2/C-RK/C-RK-Week1/C-RK-Week1.vcxproj.filters diff --git a/C-RK/C-RK-Week1/main.c b/week1-2/C-RK/C-RK-Week1/main.c similarity index 100% rename from C-RK/C-RK-Week1/main.c rename to week1-2/C-RK/C-RK-Week1/main.c diff --git a/C-RK/C-RK-Week1/main.h b/week1-2/C-RK/C-RK-Week1/main.h similarity index 100% rename from C-RK/C-RK-Week1/main.h rename to week1-2/C-RK/C-RK-Week1/main.h diff --git a/C-RK/C-RK-Week2/C-RK-Week2.vcxproj b/week1-2/C-RK/C-RK-Week2/C-RK-Week2.vcxproj similarity index 98% rename from C-RK/C-RK-Week2/C-RK-Week2.vcxproj rename to week1-2/C-RK/C-RK-Week2/C-RK-Week2.vcxproj index 950e1d2..4c3492a 100644 --- a/C-RK/C-RK-Week2/C-RK-Week2.vcxproj +++ b/week1-2/C-RK/C-RK-Week2/C-RK-Week2.vcxproj @@ -142,12 +142,12 @@ - + - + diff --git a/C-RK/C-RK-Week2/C-RK-Week2.vcxproj.filters b/week1-2/C-RK/C-RK-Week2/C-RK-Week2.vcxproj.filters similarity index 68% rename from C-RK/C-RK-Week2/C-RK-Week2.vcxproj.filters rename to week1-2/C-RK/C-RK-Week2/C-RK-Week2.vcxproj.filters index 880eb05..6b7f960 100644 --- a/C-RK/C-RK-Week2/C-RK-Week2.vcxproj.filters +++ b/week1-2/C-RK/C-RK-Week2/C-RK-Week2.vcxproj.filters @@ -3,10 +3,10 @@ - + - + \ No newline at end of file diff --git a/C-RK/C-RK-Week2/Makefile b/week1-2/C-RK/C-RK-Week2/Makefile similarity index 100% rename from C-RK/C-RK-Week2/Makefile rename to week1-2/C-RK/C-RK-Week2/Makefile diff --git a/C-RK/C-RK-Week2/heap.c b/week1-2/C-RK/C-RK-Week2/heap.c similarity index 100% rename from C-RK/C-RK-Week2/heap.c rename to week1-2/C-RK/C-RK-Week2/heap.c diff --git a/C-RK/C-RK-Week2/heap.h b/week1-2/C-RK/C-RK-Week2/heap.h similarity index 100% rename from C-RK/C-RK-Week2/heap.h rename to week1-2/C-RK/C-RK-Week2/heap.h diff --git a/C-RK/C-RK-Week2/llist.c b/week1-2/C-RK/C-RK-Week2/llist.c similarity index 100% rename from C-RK/C-RK-Week2/llist.c rename to week1-2/C-RK/C-RK-Week2/llist.c diff --git a/C-RK/C-RK-Week2/llist.h b/week1-2/C-RK/C-RK-Week2/llist.h similarity index 100% rename from C-RK/C-RK-Week2/llist.h rename to week1-2/C-RK/C-RK-Week2/llist.h diff --git a/C-RK/C-RK-Week2/main.c b/week1-2/C-RK/C-RK-Week2/main.c similarity index 100% rename from C-RK/C-RK-Week2/main.c rename to week1-2/C-RK/C-RK-Week2/main.c diff --git a/C-RK/C-RK.sln b/week1-2/C-RK/C-RK.sln similarity index 100% rename from C-RK/C-RK.sln rename to week1-2/C-RK/C-RK.sln From c2b96802ce377a1a64259fbeab5217bc26c3e614 Mon Sep 17 00:00:00 2001 From: Remco Date: Wed, 30 Mar 2016 21:34:00 +0200 Subject: [PATCH 2/2] replaced solution of week 1 and 2, extern files added so there are no stream it snippets of code in it. added week 5 FileIO .c and .h file --- .../C-RK/C-RK-Week1/C-RK-Week1.vcxproj | 0 .../C-RK-Week1/C-RK-Week1.vcxproj.filters | 0 {week1-2 => week 1-2}/C-RK/C-RK-Week1/main.c | 0 {week1-2 => week 1-2}/C-RK/C-RK-Week1/main.h | 0 .../C-RK/C-RK-Week2/C-RK-Week2.vcxproj | 0 .../C-RK-Week2/C-RK-Week2.vcxproj.filters | 0 .../C-RK/C-RK-Week2/Makefile | 0 {week1-2 => week 1-2}/C-RK/C-RK-Week2/heap.c | 2 -- {week1-2 => week 1-2}/C-RK/C-RK-Week2/heap.h | 0 {week1-2 => week 1-2}/C-RK/C-RK-Week2/llist.c | 0 {week1-2 => week 1-2}/C-RK/C-RK-Week2/llist.h | 0 {week1-2 => week 1-2}/C-RK/C-RK-Week2/main.c | 0 {week1-2 => week 1-2}/C-RK/C-RK.sln | 0 week 5/FileIO.c | 24 +++++++++++++++++++ week 5/FileIO.h | 19 +++++++++++++++ 15 files changed, 43 insertions(+), 2 deletions(-) rename {week1-2 => week 1-2}/C-RK/C-RK-Week1/C-RK-Week1.vcxproj (100%) rename {week1-2 => week 1-2}/C-RK/C-RK-Week1/C-RK-Week1.vcxproj.filters (100%) rename {week1-2 => week 1-2}/C-RK/C-RK-Week1/main.c (100%) rename {week1-2 => week 1-2}/C-RK/C-RK-Week1/main.h (100%) rename {week1-2 => week 1-2}/C-RK/C-RK-Week2/C-RK-Week2.vcxproj (100%) rename {week1-2 => week 1-2}/C-RK/C-RK-Week2/C-RK-Week2.vcxproj.filters (100%) rename {week1-2 => week 1-2}/C-RK/C-RK-Week2/Makefile (100%) rename {week1-2 => week 1-2}/C-RK/C-RK-Week2/heap.c (95%) rename {week1-2 => week 1-2}/C-RK/C-RK-Week2/heap.h (100%) rename {week1-2 => week 1-2}/C-RK/C-RK-Week2/llist.c (100%) rename {week1-2 => week 1-2}/C-RK/C-RK-Week2/llist.h (100%) rename {week1-2 => week 1-2}/C-RK/C-RK-Week2/main.c (100%) rename {week1-2 => week 1-2}/C-RK/C-RK.sln (100%) create mode 100644 week 5/FileIO.c create mode 100644 week 5/FileIO.h diff --git a/week1-2/C-RK/C-RK-Week1/C-RK-Week1.vcxproj b/week 1-2/C-RK/C-RK-Week1/C-RK-Week1.vcxproj similarity index 100% rename from week1-2/C-RK/C-RK-Week1/C-RK-Week1.vcxproj rename to week 1-2/C-RK/C-RK-Week1/C-RK-Week1.vcxproj diff --git a/week1-2/C-RK/C-RK-Week1/C-RK-Week1.vcxproj.filters b/week 1-2/C-RK/C-RK-Week1/C-RK-Week1.vcxproj.filters similarity index 100% rename from week1-2/C-RK/C-RK-Week1/C-RK-Week1.vcxproj.filters rename to week 1-2/C-RK/C-RK-Week1/C-RK-Week1.vcxproj.filters diff --git a/week1-2/C-RK/C-RK-Week1/main.c b/week 1-2/C-RK/C-RK-Week1/main.c similarity index 100% rename from week1-2/C-RK/C-RK-Week1/main.c rename to week 1-2/C-RK/C-RK-Week1/main.c diff --git a/week1-2/C-RK/C-RK-Week1/main.h b/week 1-2/C-RK/C-RK-Week1/main.h similarity index 100% rename from week1-2/C-RK/C-RK-Week1/main.h rename to week 1-2/C-RK/C-RK-Week1/main.h diff --git a/week1-2/C-RK/C-RK-Week2/C-RK-Week2.vcxproj b/week 1-2/C-RK/C-RK-Week2/C-RK-Week2.vcxproj similarity index 100% rename from week1-2/C-RK/C-RK-Week2/C-RK-Week2.vcxproj rename to week 1-2/C-RK/C-RK-Week2/C-RK-Week2.vcxproj diff --git a/week1-2/C-RK/C-RK-Week2/C-RK-Week2.vcxproj.filters b/week 1-2/C-RK/C-RK-Week2/C-RK-Week2.vcxproj.filters similarity index 100% rename from week1-2/C-RK/C-RK-Week2/C-RK-Week2.vcxproj.filters rename to week 1-2/C-RK/C-RK-Week2/C-RK-Week2.vcxproj.filters diff --git a/week1-2/C-RK/C-RK-Week2/Makefile b/week 1-2/C-RK/C-RK-Week2/Makefile similarity index 100% rename from week1-2/C-RK/C-RK-Week2/Makefile rename to week 1-2/C-RK/C-RK-Week2/Makefile diff --git a/week1-2/C-RK/C-RK-Week2/heap.c b/week 1-2/C-RK/C-RK-Week2/heap.c similarity index 95% rename from week1-2/C-RK/C-RK-Week2/heap.c rename to week 1-2/C-RK/C-RK-Week2/heap.c index a2561fe..61bab95 100644 --- a/week1-2/C-RK/C-RK-Week2/heap.c +++ b/week 1-2/C-RK/C-RK-Week2/heap.c @@ -2,8 +2,6 @@ wanneer de double linked list wordt aangepast*/ #include "llist.h" -#include -#include "log.h" void check_heap(void) { diff --git a/week1-2/C-RK/C-RK-Week2/heap.h b/week 1-2/C-RK/C-RK-Week2/heap.h similarity index 100% rename from week1-2/C-RK/C-RK-Week2/heap.h rename to week 1-2/C-RK/C-RK-Week2/heap.h diff --git a/week1-2/C-RK/C-RK-Week2/llist.c b/week 1-2/C-RK/C-RK-Week2/llist.c similarity index 100% rename from week1-2/C-RK/C-RK-Week2/llist.c rename to week 1-2/C-RK/C-RK-Week2/llist.c diff --git a/week1-2/C-RK/C-RK-Week2/llist.h b/week 1-2/C-RK/C-RK-Week2/llist.h similarity index 100% rename from week1-2/C-RK/C-RK-Week2/llist.h rename to week 1-2/C-RK/C-RK-Week2/llist.h diff --git a/week1-2/C-RK/C-RK-Week2/main.c b/week 1-2/C-RK/C-RK-Week2/main.c similarity index 100% rename from week1-2/C-RK/C-RK-Week2/main.c rename to week 1-2/C-RK/C-RK-Week2/main.c diff --git a/week1-2/C-RK/C-RK.sln b/week 1-2/C-RK/C-RK.sln similarity index 100% rename from week1-2/C-RK/C-RK.sln rename to week 1-2/C-RK/C-RK.sln diff --git a/week 5/FileIO.c b/week 5/FileIO.c new file mode 100644 index 0000000..02845bf --- /dev/null +++ b/week 5/FileIO.c @@ -0,0 +1,24 @@ +/*Dit is de C File om aan te tonen, +hoe je in het niet vluchtig geheugen dingen kan schrijven, +en deze nadat je het kastje heb uitgezet weer op kan halen*/ + +#include "FileIO.h" + +void load_user_setting(void) +{ + NutNvMemLoad(256, &user_setting, sizeof(user_setting)); + if(user_setting.first_boot != 1) //check of er al een boot is geweest + { + user_setting.first_boot = 1; + save_user_setting(); + } + else + { + //doe wat met de data in de struct + } +} + +void save_user_setting(void) +{ + NutNvMemSave(256, &user_setting, sizeof(user_setting)); +} \ No newline at end of file diff --git a/week 5/FileIO.h b/week 5/FileIO.h new file mode 100644 index 0000000..531b62e --- /dev/null +++ b/week 5/FileIO.h @@ -0,0 +1,19 @@ +#ifndef FileIO_DEF +#define FileIO_DEF + +/* User settings */ + +struct User_Setting +{ + unsigned int first_boot; +}; + +/* Loads the user settings struct from the non-volatile memory */ +void load_user_setting(void); + +/* Saves the user settings struct from the non-volatile memory */ +void save_user_setting(void); + +struct User_Setting user_setting; //always loads first before using this struct + +#endif