Auto stash before merge of "main" and "origin/main"

Microcontrollers/opdracht 4.1/Debug/opdracht 4.1.srec

@@ -1,16 +1,16 @@
 S01400006F7064726163687420342E312E7372656308
 S113000045C0000058C0000056C0000054C00000A5
 S113001052C0000050C000004EC000004CC00000A0
-S11300204AC000003BC1000046C0000044C00000BC
+S11300204AC0000036C1000046C0000044C00000C1
 S113003042C0000040C000003EC000003CC00000C0
 S11300403AC0000038C0000036C0000034C00000D0
 S113005032C0000030C000002EC000002CC00000E0
 S11300602AC0000028C0000026C0000024C00000F0
 S113007022C0000020C000001EC000001CC0000000
 S11300801AC0000018C0000016C0000011241FBED2
-S1130090CFEFD0E1DEBFCDBF11E0A0E0B1E0E4EFEF
+S1130090CFEFD0E1DEBFCDBF11E0A0E0B1E0E8EEEC
 S11300A0F8E000E00BBF02C007900D92A430B10746
-S11300B0D9F711D11DC4A4CF9BB321E030E002C015
+S11300B0D9F70CD117C4A4CF9BB321E030E002C020
 S11300C0220F331F8A95E2F7292B2BBB08959BB38C
 S11300D021E030E002C0220F331F8A95E2F7209519
 S11300E029232BBB089586E090E0E6DF89EF90E0BA
@@ -30,118 +30,117 @@ S11301B0DF91CF910895AF92BF92CF92DF92EF92E9
 S11301C0FF920F931F93CF93DF93CDB7DEB76C01EC
 S11301D0ADB6BEB601969F938F930F2EF0E0EF2E2F
 S11301E0F1E0FF2EF02DFF92EF921F921F921F92CB
-S11301F01F9295D001962DB73EB7285F3F4F0FB69B
+S11301F01F928FD001962DB73EB7285F3F4F0FB6A1
 S1130200F8943EBF0FBE2DBF281B390B0FB6F894D0
 S11302103EBF0FBE2DBF0DB71EB70F5F1F4FDF923E
-S1130220CF92FF92EF929F938F931F930F9377D068
+S1130220CF92FF92EF929F938F931F930F9371D06E
 S1130230802F912FB4DF8DB79EB708960FB6F89430
 S11302409EBF0FBE8DBF0FB6F894BEBE0FBEADBE2F
 S1130250DF91CF911F910F91FF90EF90DF90CF909E
 S1130260BF90AF90089520E030E008C0EFECF7E0D5
 S11302703197F1F700C000002F5F3F4F281739076F
-S1130280ACF3089580EE87B986E886B9089587B7F8
-S1130290806887BF789483E085BD08951F920F928C
-S11302A00FB60F9211248F9386B1806486B98F9113
-S11302B00F900FBE0F901F90189585B190E0880F96
-S11302C0991F880F991F24B122952695269523708E
-S11302D0820F911D0895109261008FEF82B9D2DFD1
-S11302E040DF8FE19EE40197F1F700C000002EDFAC
-S11302F0CEDF80E090E025B122BB24B123B9C5B1A3
-S1130300D0E08C179D0731F021DF8AE090E0ABDF6D
-S1130310D4DF51DF84E690E0A6DFCE01ECCF0F936B
-S11303201F93CF93DF93CDB7DEB72E970FB6F89414
-S1130330DEBF0FBECDBF0D891E898F89988D26E043
-S11303402C831A83098397FF02C080E090E8019709
-S11303509E838D83AE01455E5F4F698D7A8DCE019C
-S1130360019619D04D815E8157FD0AC02F813885D1
-S1130370421753070CF49A01F801E20FF31F10829D
-S11303802E960FB6F894DEBF0FBECDBFDF91CF918E
-S11303901F910F9108952F923F924F925F926F9207
-S11303A07F928F929F92AF92BF92CF92DF92EF9201
-S11303B0FF920F931F93CF93DF93CDB7DEB72B97A5
-S11303C00FB6F894DEBF0FBECDBF6C017B018A016E
-S11303D0FC0117821682838181FFBFC1CE01019681
-S11303E03C01F6019381F70193FD859193FF81917F
-S11303F07F01882309F4ADC1853239F493FD8591D9
-S113040093FF81917F01853221F4B60190E0D6D12A
-S1130410E8CF912C212C312CFFE1F315D8F08B324D
-S113042079F038F4803279F08332A1F4232D2061FD
-S11304301DC08D3261F0803369F4232D216016C014
-S1130440832D8260382EE32DE4603E2E2AC0F32DE6
-S1130450F8601DC037FC2DC020ED280F2A3040F075
-S11304608E32B9F436FC75C1232D2064322E19C0A6
-S113047036FE06C08AE0989E200D1124922E11C0EB
-S1130480EAE02E9E200D1124222EF32DF0623F2E41
-S113049008C08C3621F4832D8068382E02C088363B
-S11304A041F4F70193FD859193FF81917F018111BF
-S11304B0B3CF982F9F7D9554933028F40C5F1F4F32
-S11304C09FE399830DC0833631F0833771F0833510
-S11304D009F055C020C0F801808189830E5F1F4F49
-S11304E088248394912C530112C02801F2E04F0E0A
-S11304F0511CF801A080B18036FE03C0692D70E064
-S113050002C06FEF7FEFC5014ED14C018201F32D84
-S1130510FF773F2E15C0280122E0420E511CF8013E
-S1130520A080B18036FE03C0692D70E002C06FEF79
-S11305307FEFC5012DD14C01F32DF0683F2E8201D0
-S113054033FC19C0822D90E088169906A0F4B601F8
-S113055080E290E033D12A94F5CFF50137FC859100
-S113056037FE81915F01B60190E028D121102A94D1
-S113057021E0821A91088114910479F7E1C084364C
-S113058011F0893639F5F80137FE07C060817181B1
-S1130590828193810C5F1F4F08C060817181072E97
-S11305A0000C880B990B0E5F1F4FF32DFF763F2E27
-S11305B097FF09C090958095709561957F4F8F4FF7
-S11305C09F4FF0683F2E2AE030E0A30133D1882EFC
-S11305D0861844C0853731F4232D2F7EB22E2AE0AD
-S11305E030E025C0932D997FB92E8F36C1F018F4D1
-S11305F0883579F0AEC0803719F0883721F0A9C06A
-S1130600E92FE061BE2EB4FE0DC0FB2DF460BF2EB9
-S113061009C034FE0AC0292F2660B22E06C028E085
-S113062030E005C020E130E002C020E132E0F80112
-S1130630B7FE07C060817181828193810C5F1F4F77
-S113064006C06081718180E090E00E5F1F4FA301BE
-S1130650F1D0882E8618FB2DFF773F2E36FE0DC075
-S1130660232D2E7FA22E891458F434FE0BC032FCA5
-S113067009C0832D8E7EA82E05C0B82CA32C03C0E0
-S1130680B82C01C0B92CA4FE0FC0FE01E80DF11D69
-S11306908081803321F49A2D997EA92E09C0A2FE6F
-S11306A006C0B394B39404C08A2D867809F0B39439
-S11306B0A3FC10C0A0FE06C0B21480F4280C922C37
-S11306C09B180DC0B21458F4B60180E290E076D0C5
-S11306D0B394F8CFB21418F42B1802C0982C212C20
-S11306E0A4FE0FC0B60180E390E068D0A2FE16C05D
-S11306F0A1FC03C088E790E002C088E590E0B60161
-S11307000CC08A2D867851F0A1FE02C08BE201C094
-S113071080E2A7FC8DE2B60190E050D0891430F459
-S1130720B60180E390E04AD09A94F8CF8A94F3011A
-S1130730E80DF11D8081B60190E040D08110F6CF24
-S1130740222009F44ECEB60180E290E037D02A94FC
-S1130750F7CFF6018681978102C08FEF9FEF2B962A
-S11307600FB6F894DEBF0FBECDBFDF91CF911F91BE
-S11307700F91FF90EF90DF90CF90BF90AF909F903C
-S11307808F907F906F905F904F903F902F9008953F
-S1130790FC010590615070400110D8F78095909548
-S11307A08E0F9F1F0895FC0161507040019001104D
-S11307B0D8F7809590958E0F9F1F08950F931F93E0
-S11307C0CF93DF93FB01238121FD03C08FEF9FEFC4
-S11307D02CC022FF16C046815781248135814217DF
-S11307E0530744F4A081B1819D012F5F3F4F3183B2
-S11307F020838C93268137812F5F3F4F3783268355
-S113080014C08B01EC01FB010084F185E02D0995F6
-S1130810892BE1F6D80116968D919C911797019634
-S113082017969C938E931697CE01DF91CF911F91CB
-S11308300F910895FA01AA27283051F1203181F14E
-S1130840E8946F936E7F6E5F7F4F8F4F9F4FAF4FD4
-S1130850B1E03ED0B4E03CD0670F781F891F9A1FE7
-S1130860A11D680F791F8A1F911DA11D6A0F711D9B
-S1130870811D911DA11D20D009F468943F912AE0A7
-S1130880269F11243019305D3193DEF6CF0108958F
-S1130890462F4770405D4193B3E00FD0C9F7F6CFC0
-S11308A0462F4F70405D4A3318F0495D31FD405288
-S11308B0419302D0A9F7EACFB4E0A695979587951E
-S11308C077956795BA95C9F70097610571050895FD
-S11308D09B01AC010A2E06945795479537952795A9
-S11308E0BA95C9F7620F731F841F951FA01D089541
-S10708F0F894FFCFA6
-S10708F42564000073
+S1130280ACF3089587B7806887BF789483E085BD11
+S113029008951F920F920FB60F9211248F9386B177
+S11302A0806486B98F910F900FBE0F901F901895A0
+S11302B085B190E0880F991F880F991F24B122956A
+S11302C0269526952370820F911D08951092610042
+S11302D08FEF82B946DF8FE19EE40197F1F700C00A
+S11302E0000034DFCFDF80E090E025B122BB24B1F1
+S11302F023B9C5B1D0E08C179D0731F027DF8AE020
+S113030090E0B1DFD5DF57DF84E690E0ACDFCE01CB
+S1130310ECCF0F931F93CF93DF93CDB7DEB72E9718
+S11303200FB6F894DEBF0FBECDBF0D891E898F892D
+S1130330988D26E02C831A83098397FF02C080E0FE
+S113034090E801979E838D83AE01455E5F4F698D72
+S11303507A8DCE01019619D04D815E8157FD0AC078
+S11303602F813885421753070CF49A01F801E20FE4
+S1130370F31F10822E960FB6F894DEBF0FBECDBFCA
+S1130380DF91CF911F910F9108952F923F924F9239
+S11303905F926F927F928F929F92AF92BF92CF9211
+S11303A0DF92EF92FF920F931F93CF93DF93CDB71A
+S11303B0DEB72B970FB6F894DEBF0FBECDBF6C012E
+S11303C07B018A01FC0117821682838181FFBFC1F0
+S11303D0CE0101963C01F6019381F70193FD8591CD
+S11303E093FF81917F01882309F4ADC1853239F4EB
+S11303F093FD859193FF81917F01853221F4B601AC
+S113040090E0D6D1E8CF912C212C312CFFE1F315CB
+S1130410D8F08B3279F038F4803279F08332A1F459
+S1130420232D20611DC08D3261F0803369F4232DAA
+S1130430216016C0832D8260382EE32DE4603E2EA9
+S11304402AC0F32DF8601DC037FC2DC020ED280F05
+S11304502A3040F08E32B9F436FC75C1232D206465
+S1130460322E19C036FE06C08AE0989E200D112453
+S1130470922E11C0EAE02E9E200D1124222EF32D7F
+S1130480F0623F2E08C08C3621F4832D8068382E0C
+S113049002C0883641F4F70193FD859193FF819161
+S11304A07F018111B3CF982F9F7D9554933028F409
+S11304B00C5F1F4F9FE399830DC0833631F0833760
+S11304C071F0833509F055C020C0F801808189831B
+S11304D00E5F1F4F88248394912C530112C028016E
+S11304E0F2E04F0E511CF801A080B18036FE03C02B
+S11304F0692D70E002C06FEF7FEFC5014ED14C0152
+S11305008201F32DFF773F2E15C0280122E0420E11
+S1130510511CF801A080B18036FE03C0692D70E043
+S113052002C06FEF7FEFC5012DD14C01F32DF068B0
+S11305303F2E820133FC19C0822D90E08816990663
+S1130540A0F4B60180E290E033D12A94F5CFF5010E
+S113055037FC859137FE81915F01B60190E028D187
+S113056021102A9421E0821A91088114910479F7C8
+S1130570E1C0843611F0893639F5F80137FE07C039
+S113058060817181828193810C5F1F4F08C06081FB
+S11305907181072E000C880B990B0E5F1F4FF32DF2
+S11305A0FF763F2E97FF09C09095809570956195D1
+S11305B07F4F8F4F9F4FF0683F2E2AE030E0A3011A
+S11305C033D1882E861844C0853731F4232D2F7EED
+S11305D0B22E2AE030E025C0932D997FB92E8F36B4
+S11305E0C1F018F4883579F0AEC0803719F0883737
+S11305F021F0A9C0E92FE061BE2EB4FE0DC0FB2D91
+S1130600F460BF2E09C034FE0AC0292F2660B22E22
+S113061006C028E030E005C020E130E002C020E15F
+S113062032E0F801B7FE07C0608171818281938155
+S11306300C5F1F4F06C06081718180E090E00E5F07
+S11306401F4FA301F1D0882E8618FB2DFF773F2E74
+S113065036FE0DC0232D2E7FA22E891458F434FEAD
+S11306600BC032FC09C0832D8E7EA82E05C0B82C89
+S1130670A32C03C0B82C01C0B92CA4FE0FC0FE01EA
+S1130680E80DF11D8081803321F49A2D997EA92EE5
+S113069009C0A2FE06C0B394B39404C08A2D867820
+S11306A009F0B394A3FC10C0A0FE06C0B21480F4F9
+S11306B0280C922C9B180DC0B21458F4B60180E299
+S11306C090E076D0B394F8CFB21418F42B1802C08B
+S11306D0982C212CA4FE0FC0B60180E390E068D0D2
+S11306E0A2FE16C0A1FC03C088E790E002C088E522
+S11306F090E0B6010CC08A2D867851F0A1FE02C0AC
+S11307008BE201C080E2A7FC8DE2B60190E050D0FC
+S1130710891430F4B60180E390E04AD09A94F8CF7B
+S11307208A94F301E80DF11D8081B60190E040D078
+S11307308110F6CF222009F44ECEB60180E290E07B
+S113074037D02A94F7CFF6018681978102C08FEFC4
+S11307509FEF2B960FB6F894DEBF0FBECDBFDF918F
+S1130760CF911F910F91FF90EF90DF90CF90BF90AA
+S1130770AF909F908F907F906F905F904F903F903D
+S11307802F900895FC010590615070400110D8F736
+S1130790809590958E0F9F1F0895FC0161507040C5
+S11307A001900110D8F7809590958E0F9F1F0895A2
+S11307B00F931F93CF93DF93FB01238121FD03C08C
+S11307C08FEF9FEF2CC022FF16C0468157812481F2
+S11307D035814217530744F4A081B1819D012F5FF5
+S11307E03F4F318320838C93268137812F5F3F4F86
+S11307F03783268314C08B01EC01FB010084F1854F
+S1130800E02D0995892BE1F6D80116968D919C91DE
+S11308101797019617969C938E931697CE01DF91A6
+S1130820CF911F910F910895FA01AA27283051F111
+S1130830203181F1E8946F936E7F6E5F7F4F8F4F0D
+S11308409F4FAF4FB1E03ED0B4E03CD0670F781F6C
+S1130850891F9A1FA11D680F791F8A1F911DA11D51
+S11308606A0F711D811D911DA11D20D009F468948A
+S11308703F912AE0269F11243019305D3193DEF632
+S1130880CF010895462F4770405D4193B3E00FD0E8
+S1130890C9F7F6CF462F4F70405D4A3318F0495DD3
+S11308A031FD4052419302D0A9F7EACFB4E0A695B6
+S11308B09795879577956795BA95C9F700976105D8
+S11308C0710508959B01AC010A2E0694579547952E
+S11308D037952795BA95C9F7620F731F841F951F23
+S10B08E0A01D0895F894FFCF58
+S10708E8256400007F
 S9030000FC

Microcontrollers/opdracht 4.1/main.c

@@ -52,7 +52,7 @@ int main(void)
     /* Replace with your application code */
 	DDRF = 0x00; // set port F input.
 	DDRE = 0xFF; // all port A output.
-	adcInit();
+	
 	
 	init_4bits_mode();
 	_delay_ms(10);
@@ -72,7 +72,7 @@ int main(void)
 			
 			wait(10);
 			
-			lcd_write_integer(getADCValue());
+			lcd_write_integer((getADCValue()));
 		}
 		
 		previousValue = number;