diff --git a/Microcontrollers/.vs/Microcontrollers/v14/.atsuo b/Microcontrollers/.vs/Microcontrollers/v14/.atsuo index 836b0dc..e91e23b 100644 Binary files a/Microcontrollers/.vs/Microcontrollers/v14/.atsuo and b/Microcontrollers/.vs/Microcontrollers/v14/.atsuo differ diff --git a/Microcontrollers/Microcontrollers.atsln b/Microcontrollers/Microcontrollers.atsln index 02f542a..52693ab 100644 --- a/Microcontrollers/Microcontrollers.atsln +++ b/Microcontrollers/Microcontrollers.atsln @@ -5,6 +5,8 @@ VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "Microcontrollers", "Microcontrollers\Microcontrollers.cproj", "{2285C48D-296E-43FD-A7B6-69885F64CFFD}" EndProject +Project("{54F91283-7BC4-4236-8FF9-10F437C3AD48}") = "opdracht 2.7a", "opdracht 2.7a\opdracht 2.7a.cproj", "{B7ED8D27-9387-4A45-A238-923F89602FB5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|AVR = Debug|AVR @@ -15,6 +17,10 @@ Global {2285C48D-296E-43FD-A7B6-69885F64CFFD}.Debug|AVR.Build.0 = Debug|AVR {2285C48D-296E-43FD-A7B6-69885F64CFFD}.Release|AVR.ActiveCfg = Release|AVR {2285C48D-296E-43FD-A7B6-69885F64CFFD}.Release|AVR.Build.0 = Release|AVR + {B7ED8D27-9387-4A45-A238-923F89602FB5}.Debug|AVR.ActiveCfg = Debug|AVR + {B7ED8D27-9387-4A45-A238-923F89602FB5}.Debug|AVR.Build.0 = Debug|AVR + {B7ED8D27-9387-4A45-A238-923F89602FB5}.Release|AVR.ActiveCfg = Release|AVR + {B7ED8D27-9387-4A45-A238-923F89602FB5}.Release|AVR.Build.0 = Release|AVR EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Microcontrollers/opdracht 2.7a/main.c b/Microcontrollers/opdracht 2.7a/main.c index 8e76030..eaea0e3 100644 --- a/Microcontrollers/opdracht 2.7a/main.c +++ b/Microcontrollers/opdracht 2.7a/main.c @@ -1,16 +1,104 @@ /* * main.c * - * Created: 10-Feb-21 9:13:58 AM + * Created: 08-Feb-21 10:03:33 AM * Author: lemms */ +# define F_CPU 10000000UL +#include #include +typedef enum { + IDLE, + PERPARE_COFFEE_POWDER, + BOIL_WATER, + POUR_COFFEE + } state ; + + typedef enum { + false = 0, + true = 1 + } bool; + +state current_state; + +void wait( int ms ) +{ + for (int i=0; i 2000); + setPourPumpState(shouldPour); + + milisPouring++; + + if(!shouldPour){ + milisPouring = 0; + } + break; + } + wait(1); } } \ No newline at end of file diff --git a/Microcontrollers/opdracht 2.7a/opdracht 2.7a.cproj b/Microcontrollers/opdracht 2.7a/opdracht 2.7a.cproj index 9c0f55c..e883d7a 100644 --- a/Microcontrollers/opdracht 2.7a/opdracht 2.7a.cproj +++ b/Microcontrollers/opdracht 2.7a/opdracht 2.7a.cproj @@ -4,7 +4,7 @@ 2.0 7.0 com.microchip.xc8 - 2285C48D-296E-43FD-A7B6-69885F64CFFD + {b7ed8d27-9387-4a45-a238-923f89602fb5} ATmega128 none Executable @@ -15,12 +15,80 @@ opdracht 2.7a opdracht 2.7a opdracht 2.7a + XC8_2.31 + true + false + true + true + + + true + + 2 + 0 + 0 + + + + + + + + + + + + + - + + + True + True + True + + + (%24DeviceMacro) + NDEBUG + + + Optimize for size (-Os) + True + True + True + + + libm + + + + - + + + True + True + + + (%24DeviceMacro) + DEBUG + + + Optimize debugging experience (-Og) + True + True + Default (-g2) + True + + + libm + + + Default (-Wa,-g) + +