From 8f71ca1be5c1c813012a7e751b5cbae304e0557c Mon Sep 17 00:00:00 2001
From: stijn <lemmstijn@hotmail.com>
Date: Wed, 10 Feb 2021 09:20:19 +0100
Subject: [PATCH] Auto stash before merge of "main" and "origin/main"

---
 .../.vs/Microcontrollers/v14/.atsuo           | Bin 14336 -> 24064 bytes
 Microcontrollers/Microcontrollers.atsln       |   6 ++
 Microcontrollers/opdracht 2.7a/main.c         |  92 +++++++++++++++++-
 .../opdracht 2.7a/opdracht 2.7a.cproj         |  74 +++++++++++++-
 4 files changed, 167 insertions(+), 5 deletions(-)

diff --git a/Microcontrollers/.vs/Microcontrollers/v14/.atsuo b/Microcontrollers/.vs/Microcontrollers/v14/.atsuo
index 836b0dc5c2858582e8d01ae5488bc2811525f6a8..e91e23bec4822d6f526871d535b272a952f59a47 100644
GIT binary patch
delta 3707
zcmeH}O^n;d701QhwX)u5z1|qL<&B$eypGqgb|XrnM5?V(Q=~+S67@lflBhbVsW0mL
zTcSiK)#gw%ITS^AE<F@YP$2grZqY+?DBz;KH9hsxqUf<e(ViNhHsHE%wlJ_RdQ5H}
z;)i+f|K7}ShQq-e4URq`e%e_%=lJu_V&8f42jUe6lwD*yZDNT&TS>cK0RJW62^941
zrE5+boG%l|e!)Jo1Lj}R!_}96aF@URZ%DWT0v6pk2f*58s9y%Y0_*~>0#|`O;2Q86
za2-HDbYHojTTc=nJMZ3D$E|Q{)NtQ$;S}tg2tRV~u8}zZS8n&(iSj4+!IA@o2ckd>
z5C9Q~0}_w`l7I}PfHaT+vVa1pKn~D=JWv3NfDV*^ZvuCKH-Wc+Zvl4!11RGmDqvKB
z8c+vJpaC?27SIMdKo{r%eP93#fe|nUCcqSB-4`z7dEEo=ZQvc?+rY^RpvPwg7X+U;
zLBTctCd2|wH<rX4eYTNaTZI66i@u7;l?}o|(-+gOGazlA%0Dv$XAM2vk`T9b3mu*3
zaDBWzCuFqPme2#I&v^+_&O6Yf&G;s<4feTH?TPDXN~!B>r=(-|8v56{1bT4pP4wZ`
zjrEOZV}t`e-2QakbxKA5eChYD6%e*gi${CV&jmL+e=)F0;Q8SV`E;IWa`992V8sVh
zTSN0p?;X3iGsIa)csgJF7IRn9bpbTI=bkon(%^iwg&w&i*Nb4TpNgHd*-UIYE`oUe
zRKU3p&R<sVKf3TcVjb`7r@guG<Zu_be7y6j^YZ@p{{D;aqNwx}=J*@$-}U~S_;1YN
zMB7(luJ^&iqk_7E`ny+AZ+DN_L09OVRl;#nZ*IUs;6|AD(2sY2i=$|VzTw2mKM3@}
z?r%<{53c_5{?Xpe6`2D4o+IL*VaxLl2JnM@=m<Lk;9-k$us{$j7GhY%QEbJ)4m&~)
z61*7n5k!yoUYEc2x%T+CYqx~Y>+SlleLwdRY!m!hS70^xuafZGi_lS?;r;YsIKa?{
z6iWpUS$}{z4EqByCLALDu}JWpxBG+Y$fz_XyZ$$5<IXc4GWJ`W&nkc1_oD6nhecR+
z0xvx-&D&q}kn*a7|DwlOcXo|t?~RIujO&#zJu~Y&ry>{sU*yAew084g*~~}MibW;_
zv(G|FsahkdnP5e*%Vs%N$90|Yh8x&miz!th<LqcmRYF-TD7~!agKTczvSy5))vzd4
zqK#6;Vp)DHgG=*lr8*l5xIrSJYDy%}H!{V1YMC-3sYonC`OBr`bkOePnhU)#sjA&c
zTNw7ac)!`MPH2@h6RcSqMD$FwYz??ns9lRhXQOO2#`{8yFFuWnGb?DY!9<fOB<4yo
z*7J{4$y5!Wpm<A@dO&K0tKJ$vv1MAWdDCH<_9<C$+0++CBNE6}N*Z6(qkJS~C8deb
z_30h6n+wi5^+;K;dZI5}^^BS|GOvi4Qfrb)_n2{JD5j{~%<gHTRh*^c6wfrpR$I3U
zazL(&T1p#-y3#P1B7>Y(*L_T;z8JL23KcW@m5k8ou;HaD>r6r(`Qzd=+0eqeqIpJS
zr4&kyJwq|ym#tc+r%f%9l!a_U<Kntn@%EW+-_t52>n+Pry2fBilMyQ;dAgL%%7ZAZ
zA+7Opw9_dkDh-uPmF&J1D%yhp8%i0WsO9siX{xN5V%l1!V*)2BcBMA3W2UcOFL*sg
zjg<Awoa3`pl<G#t6JA}|y>TKr&nBlCuSXF4Rgp=z67iD7h;m({g?d}H2js9n7-%J5
z#h)vwtl-lJNrU(2DkFbHRK{Y(Y)QeixCqJ8j34_OLX_=LOMTGJ^aPVi`6AtHlPk^j
zz$n%<W3wq)E06|XPIHZ1%Cf{%K{qSmW}6fwljO>EIjMWip*P6at#Q61=F8Q&$75<a
z(ku710#_AETu{wrVXGQ#wpOL|4kIs$W;~P|C%aO!WZ3~#4=k(RW@gwP8PQ0f7D|wb
zKG$UA@ifvZ+SJ_4bS7NA;}dIbo7Z_Y8qP6=ftHnr++bQxl-PJniVeDfY$4pr3rtxl
zvFe;Qd1bO_cooaA7Ab4un<tfiysYr~iP6%fv5(CT^I9|#^33GcveQ`<X|tg%nz@lu
zNEBjrVqs<~dEQFMy`Y@r7c+l7=S>Gat!gPyl>{Z(8kTe3ZlD&JW>VqYAePm{c2M#P
za;=p$y7YuDk9(xuW<BggnfBBM!xmx!{EF~TONthZj@puGnzwG@a}ZHCUpb2}KKP2k
z<6{yzUw^#v{BU@FI6OZbo*xc3KRNdN`V79&pIkBi=VJBs12<vA)x$>I0fmkZZvO|H
CD?#4?

delta 315
zcmZqJ!`M);A%}@?LP429>;G$vJPZsB2ZSeAF?mit%xuW$H~A~uIbKG2py+=nm>ejs
z!YT<AI5hbuv$Q0L1(M+a(wsmn0p<UntjnP+Dh1{J1FB#JvOzTa=0J|wjGNdJG$toV
zoZ$2Z3i|-D?_@>E^OLxoc^P<tJZ2yU84I#)a|u@u<0i2N#z|Z<%&rU-lM}V&C+}l6
zWAg$kdd4vM7w^f*&it{H75E=a(rMs7!05_g#Sp{b$WX?R$dET#Mp1pTwNl#TyRK3O
zdJM@71q?+D`3zYMRbsp~-!(r5PtlhU-FIMbBG53nCqY(&z+^=xDS;Js(VceAb|-5y
R)^~sLiQY3=P$r*|0RUhmcJ=@O

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 <util/delay.h>
 #include <xc.h>
 
+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<ms; i++)
+	{
+		_delay_ms( 1 );		// library function (max 30 ms at 8MHz)
+	}
+}
+
+void setPulveriserState(bool state){
+	// set coffee powder mill on or off;
+}
+
+bool checkCoffeePowderLevel(){
+	// check sensor
+	return true;
+}
+
+void updateScreen(){
+	// update its display;
+	if(...){
+		current_state = PERPARE_COFFEE_POWDER;
+	}
+}
+
+void setBoilerState(bool state){
+	// set boiler on or off;
+}
+
+bool checkWaterTemp(){
+	// check sensor
+	return true;
+}
+
+ long milisPouring;
+ 
+void setPourPumpState(bool state){
+	// set pump on or off;
+}
+
 int main(void)
 {
     while(1)
     {
-        //TODO:: Please write your application code 
+        switch(state){
+			case IDLE:
+				updateScreen();
+			break;
+			
+			case PERPARE_COFFEE_POWDER:
+				bool coffeeLevel = checkCoffeePowderLevel();
+				setPulveriserState(!coffeeLevel);
+			
+				if(coffeeLevel){
+					current_state = BOIL_WATER;
+				}
+			break;
+			
+			case BOIL_WATER:
+				bool waterTemp = checkWaterTemp();
+				setBoilerState(!waterTemp);
+				if(waterTemp){
+					current_state = POUR_COFFEE;
+				}
+			break;
+			
+			case POUR_COFFEE:
+				bool shouldPour = !(milisPouring => 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 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectVersion>7.0</ProjectVersion>
     <ToolchainName>com.microchip.xc8</ToolchainName>
-    <ProjectGuid>2285C48D-296E-43FD-A7B6-69885F64CFFD</ProjectGuid>
+    <ProjectGuid>{b7ed8d27-9387-4a45-a238-923f89602fb5}</ProjectGuid>
     <avrdevice>ATmega128</avrdevice>
     <avrdeviceseries>none</avrdeviceseries>
     <OutputType>Executable</OutputType>
@@ -15,12 +15,80 @@
     <AssemblyName>opdracht 2.7a</AssemblyName>
     <Name>opdracht 2.7a</Name>
     <RootNamespace>opdracht 2.7a</RootNamespace>
+    <ToolchainFlavour>XC8_2.31</ToolchainFlavour>
+    <KeepTimersRunning>true</KeepTimersRunning>
+    <OverrideVtor>false</OverrideVtor>
+    <CacheFlash>true</CacheFlash>
+    <ProgFlashFromRam>true</ProgFlashFromRam>
+    <RamSnippetAddress />
+    <UncachedRange />
+    <preserveEEPROM>true</preserveEEPROM>
+    <OverrideVtorValue />
+    <BootSegment>2</BootSegment>
+    <ResetRule>0</ResetRule>
+    <eraseonlaunchrule>0</eraseonlaunchrule>
+    <EraseKey />
+    <AsfFrameworkConfig>
+      <framework-data xmlns="">
+  <options />
+  <configurations />
+  <files />
+  <documentation help="" />
+  <offline-documentation help="" />
+  <dependencies>
+    <content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.49.1" />
+  </dependencies>
+</framework-data>
+    </AsfFrameworkConfig>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <ToolchainSettings />
+    <ToolchainSettings>
+      <com.microchip.xc8>
+  <com.microchip.xc8.common.optimization.RelaxBranches>True</com.microchip.xc8.common.optimization.RelaxBranches>
+  <com.microchip.xc8.compiler.general.ChangeDefaultCharTypeUnsigned>True</com.microchip.xc8.compiler.general.ChangeDefaultCharTypeUnsigned>
+  <com.microchip.xc8.compiler.general.ChangeDefaultBitFieldUnsigned>True</com.microchip.xc8.compiler.general.ChangeDefaultBitFieldUnsigned>
+  <com.microchip.xc8.compiler.symbols.DefSymbols>
+    <ListValues>
+      <Value>(%24DeviceMacro)</Value>
+      <Value>NDEBUG</Value>
+    </ListValues>
+  </com.microchip.xc8.compiler.symbols.DefSymbols>
+  <com.microchip.xc8.compiler.optimization.level>Optimize for size (-Os)</com.microchip.xc8.compiler.optimization.level>
+  <com.microchip.xc8.compiler.optimization.PackStructureMembers>True</com.microchip.xc8.compiler.optimization.PackStructureMembers>
+  <com.microchip.xc8.compiler.optimization.AllocateBytesNeededForEnum>True</com.microchip.xc8.compiler.optimization.AllocateBytesNeededForEnum>
+  <com.microchip.xc8.compiler.warnings.AllWarnings>True</com.microchip.xc8.compiler.warnings.AllWarnings>
+  <com.microchip.xc8.linker.libraries.Libraries>
+    <ListValues>
+      <Value>libm</Value>
+    </ListValues>
+  </com.microchip.xc8.linker.libraries.Libraries>
+</com.microchip.xc8>
+    </ToolchainSettings>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <ToolchainSettings />
+    <ToolchainSettings>
+      <com.microchip.xc8>
+  <com.microchip.xc8.compiler.general.ChangeDefaultCharTypeUnsigned>True</com.microchip.xc8.compiler.general.ChangeDefaultCharTypeUnsigned>
+  <com.microchip.xc8.compiler.general.ChangeDefaultBitFieldUnsigned>True</com.microchip.xc8.compiler.general.ChangeDefaultBitFieldUnsigned>
+  <com.microchip.xc8.compiler.symbols.DefSymbols>
+    <ListValues>
+      <Value>(%24DeviceMacro)</Value>
+      <Value>DEBUG</Value>
+    </ListValues>
+  </com.microchip.xc8.compiler.symbols.DefSymbols>
+  <com.microchip.xc8.compiler.optimization.level>Optimize debugging experience (-Og)</com.microchip.xc8.compiler.optimization.level>
+  <com.microchip.xc8.compiler.optimization.PackStructureMembers>True</com.microchip.xc8.compiler.optimization.PackStructureMembers>
+  <com.microchip.xc8.compiler.optimization.AllocateBytesNeededForEnum>True</com.microchip.xc8.compiler.optimization.AllocateBytesNeededForEnum>
+  <com.microchip.xc8.compiler.optimization.DebugLevel>Default (-g2)</com.microchip.xc8.compiler.optimization.DebugLevel>
+  <com.microchip.xc8.compiler.warnings.AllWarnings>True</com.microchip.xc8.compiler.warnings.AllWarnings>
+  <com.microchip.xc8.linker.libraries.Libraries>
+    <ListValues>
+      <Value>libm</Value>
+    </ListValues>
+  </com.microchip.xc8.linker.libraries.Libraries>
+  <com.microchip.xc8.assembler.debugging.DebugLevel>Default (-Wa,-g)</com.microchip.xc8.assembler.debugging.DebugLevel>
+</com.microchip.xc8>
+    </ToolchainSettings>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="main.c">