From da72ab72562b64ea8bc93d6093e43ada514802fc Mon Sep 17 00:00:00 2001
From: Tristan Krause <tristan.krause@stud.htwk-leipzig.de>
Date: Wed, 27 Mar 2019 10:49:26 +0100
Subject: [PATCH] stroke verbessert

---
 B15F.elf     | Bin 12996 -> 13024 bytes
 B15F.hex     |  64 ++++++++++++++++++++++++++-------------------------
 requests.cpp |   7 ++++--
 3 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/B15F.elf b/B15F.elf
index 2b81c449edd106cd2f3f3a7f4d64ec8e7cc82a20..37e4da2f01ab879a04c16f5bb58d88c41cf66ce8 100644
GIT binary patch
delta 363
zcmX?-`XF_J0^^N|ipsKOoD2*g%*w#Pzy!pMK+MGjVl*(6O-vML;^CTDwNJ8{rGcfE
zC6c9zrJSXNrI00$C7UIKrH!R?av-BH)3fK3(-;l-H?W*Dy~uv@JKvOW7M>|PCog4O
z&A4H6Ad@<qPXDC&lh#k#Kk59W`;*>J`ag+(vi#)plkZP%dNA<;-xPo54m}uahTh~J
z4mZ9G-Da?qDN_w&rtahi98S#hC-hHN<WvP3>CR~>#w5f!xk>&XW69=51%5`xvdI$_
z>lrI13o5N=EZclgshN@S)MQr`Z^nel6IJRN*KHP5UC+o^H2I)fJ!8>kNA=B|tRQbP
zO%^l~p3Gw?0yIF;P??nnC?*6Ji!l@c`h9Yqp&Fyj<f(@0j5U+@8mhDM2{ABePCjTT
nJo%5I0HgV2UL$qJz{#dSGHh}zkbE(@)kvK+LxX|g9Y_@bp?`9F

delta 312
zcmaEmdL(s%0^^>EipsK4oD2*g%*w#Pzy!pMK>QBKXJBk#h?<xv&h&wEV%0v$QkEi?
zd=_t(9F|O$G?rwR1eREqD3%JA>dAqO!c4E8PEKPq;9taY&h#St$?tqqJXv_Ate(7-
zaW&(j&4EnnY?Es^q$aQ8aNtXL(EMQH1HLJyOf`&&4<`TMaGGq#sRC4$%xNjc^o?Wk
zJo$f&5u4{K@G~+-O<t>5&lodVS7|+C)aJWN&5VreCMT+RGrCM(t5VN6X|t~CdPc^u
z$#>Q28N)Wms&D3GddE3g$WRNY)7DTK=<>-)hH4<H%TSF`Ve&>pb;g9rHx1R9J_$}{
rGE!rdo~&u4&S*M05J*~0t^|^2CNDHnm+;X5h5<V;44?oMCLjO+-_2T*

diff --git a/B15F.hex b/B15F.hex
index 1bff614..c69f038 100644
--- a/B15F.hex
+++ b/B15F.hex
@@ -8,14 +8,14 @@
 :100070000C9489000C9489000C9489000C948900DC
 :100080000C9489000C9489000C948900DF00E10035
 :10009000E300DA00E500E700E900EB00ED00EF0027
-:1000A000F100F300750472046F044B046C046904DE
-:1000B0006604630460045D045A0478047B0411241C
+:1000A000F100F300830480047D0459047A0477048A
+:1000B000740471046E046B046804860489041124BA
 :1000C0001FBECFEFD0E4DEBFCDBF11E0A0E0B1E0B6
-:1000D000EAE5F9E000E00BBF02C007900D92A23004
+:1000D000E6E7F9E000E00BBF02C007900D92A23006
 :1000E000B107D9F721E0A2E0B1E001C01D92A4312F
 :1000F000B207E1F710E0CFE5D0E004C02197FE01A0
-:100100000E94A204CE35D107C9F70E9449040C947D
-:10011000AB040C9400001F920F920FB60F921124A3
+:100100000E94B004CE35D107C9F70E9457040C9461
+:10011000B9040C9400001F920F920FB60F92112495
 :100120008F9388E4809360008F910F900FBE0F90A3
 :100130001F90189583E191E00E94F60060E080E155
 :1001400091E00E9439016FEF80E191E00E945A0135
@@ -25,7 +25,7 @@
 :1001800098E088E10FB6F894A895809360000FBEC0
 :100190009093600088E480936000A895089582E0C1
 :1001A00091E00E944F03A89590E0FC013197EC305C
-:1001B000F10508F00895EA5BFF4F0C94A2040C943B
+:1001B000F10508F00895EA5BFF4F0C94B0040C942D
 :1001C00067030C9478030C9479030C9486030C94C5
 :1001D00099030C94AC030C94B5030C94BE030C94DB
 :1001E000D1030C94E4030C94F203089584B1806B62
@@ -124,29 +124,31 @@
 :1007B0000E94060280910001811101C008956FEF2F
 :1007C00082E091E00C94330382E091E00E944F03B9
 :1007D000682F83E091E00E943502BC0182E091E045
-:1007E0000C944003AF92BF92CF92DF92EF92FF92B0
-:1007F0000F931F93CF93DF9382E091E00E94560303
-:10080000EC0182E091E00E9456035C0182E091E0FD
-:100810000E9456038C016FEF82E091E00E94330347
-:10082000A09E6001A19ED00CB09ED00C1124CC15CE
-:10083000DD0501F1BE0187E091E00E94060260E063
-:1008400083E091E00E9435027C0161E083E091E069
-:100850000E9435028C01B70182E091E00E944003C2
-:10086000B80182E091E00E944003CA0DDB1DCC1666
-:10087000DD0601F76FEF82E091E0DF91CF911F91EC
-:100880000F91FF90EF90DF90CF90BF90AF900C94BE
-:1008900033030E949A0082E091E00E944F03A895E2
-:1008A00090E0FC013197EC30F105A8F7EE5AFF4FCC
-:1008B0000C94A2040E94E403EECF0E94D103EBCF7C
-:1008C0000E94BE03E8CF0E94B503E5CF0E94AC03AF
-:1008D000E2CF0E949903DFCF0E948603DCCF0E9403
-:1008E0007903D9CF0E947803D6CF0E946703D3CF74
-:1008F0000E94F203D0CF83E191E00E94F50042E034
-:1009000063E171E080E191E00E94340143E063E142
-:1009100071E08DE091E00E94340145E063E171E017
-:100920008AE091E00E94340140E063E171E087E0F9
-:1009300091E00E94030241E063E171E084E091E014
-:100940000C940302EE0FFF1F0024001C0BBE079047
-:0A095000F691E02D0994F894FFCF12
-:02095A0001009A
+:1007E0000C9440038F929F92AF92BF92CF92DF9270
+:1007F000EF92FF920F931F93CF93DF9382E091E0EC
+:100800000E944F03882E82E091E00E944F03982EB1
+:1008100082E091E00E945603EC0182E091E00E94A8
+:1008200056035C0182E091E00E9456038C016FEF59
+:1008300082E091E00E943303A09E6001A19ED00C53
+:10084000B09ED00C1124CC15DD0501F1BE0187E06E
+:1008500091E00E940602682D83E091E00E9435023B
+:100860007C01692D83E091E00E9435028C01B70183
+:1008700082E091E00E944003B80182E091E00E9492
+:100880004003CA0DDB1DCC16DD0601F76FEF82E0D9
+:1008900091E0DF91CF911F910F91FF90EF90DF904A
+:1008A000CF90BF90AF909F908F900C9433030E9495
+:1008B0009A0082E091E00E944F03A89590E0FC012D
+:1008C0003197EC30F105A8F7EE5AFF4F0C94B004C5
+:1008D0000E94E403EECF0E94D103EBCF0E94BE033F
+:1008E000E8CF0E94B503E5CF0E94AC03E2CF0E949F
+:1008F0009903DFCF0E948603DCCF0E947903D9CF12
+:100900000E947803D6CF0E946703D3CF0E94F203E0
+:10091000D0CF83E191E00E94F50042E063E171E015
+:1009200080E191E00E94340143E063E171E08DE0F9
+:1009300091E00E94340145E063E171E08AE091E0DA
+:100940000E94340140E063E171E087E091E00E94A1
+:10095000030241E063E171E084E091E00C94030262
+:10096000EE0FFF1F0024001C0BBE0790F691E02D38
+:060970000994F894FFCF8A
+:0209760001007E
 :00000001FF
diff --git a/requests.cpp b/requests.cpp
index dbd2a2a..eea1e34 100644
--- a/requests.cpp
+++ b/requests.cpp
@@ -74,6 +74,9 @@ void rqAnalogRead()
 
 void rqAdcDacStroke()
 {	
+	uint8_t channel_a = usart.readByte();
+	uint8_t channel_b = usart.readByte();
+	
 	int16_t start = static_cast<int16_t>(usart.readInt());
 	int16_t delta = static_cast<int16_t>(usart.readInt());
 	int16_t count = static_cast<int16_t>(usart.readInt());
@@ -85,8 +88,8 @@ void rqAdcDacStroke()
 	for(int16_t i = start; i != count; i += delta)
 	{
 		dac0.setValue(i);
-		uint16_t a = adu.getValue(0);
-		uint16_t b = adu.getValue(1);
+		uint16_t a = adu.getValue(channel_a);
+		uint16_t b = adu.getValue(channel_b);
 		usart.writeInt(a);
 		usart.writeInt(b);
 	}