Diff of /trunk/Monarco/Monarco_FB/connector/AfterReadInputs/svnobj [r77] .. [r78]  Maximize  Restore

Switch to side-by-side view

--- a/trunk/Monarco/Monarco_FB/connector/AfterReadInputs/svnobj
+++ b/trunk/Monarco/Monarco_FB/connector/AfterReadInputs/svnobj
@@ -1,9 +1,9 @@
-Gx_l»!0…jüo:ÇNw’Yû$ÙÞSystem.StringL{f8a58466-d7f6-439f-bbb8-d4600e41d099}ImplementationL{3b83b776-fb25-43b8-99f2-3c507c9143fc}TextDocumentL{f3878285-8e4f-490b-bb1b-9acbb7eb04db}TextLinesL{a5de0b0b-1cb5-4913-ac21-9d70293ec00d}	Id
-longTagText
2SUPER^.AfterReadInputs();CASE _iState OF	(	10:	//debug counterV		_AfterReadInputs := _AfterReadInputs + 1;:		// determine size of bufferZ		udiBufSize := SIZEOF( THIS^._abyIntTxBuf );		v		(* Sets CRC16 checksum, for Tx byte array [24] and [25]*)X		CRC := THIS^.getCRC( THIS^._abyIntTxBuf );\		THIS^._abyIntTxBuf[24] := WORD_TO_BYTE(CRC);j		THIS^._abyIntTxBuf[25] := WORD_TO_BYTE(SHR(CRC,8));ˆ		IF NOT transfer(pabyTxBuffer:=ADR( THIS^._abyIntTxBuf ), pabyRxBuffer := ADR( tmpRxBuf ),udiLen := udiBufSize, uiDelayus:=0) THEN 			// fail&			_iState := 1000;		END_IF		// OK?D		IF THIS^.checkCRC(tmpRxBuf) THEN J			//CRC okay, return the recv buffer!F			THIS^._abyIntRxBuf 	:= tmpRxBuf;"			#\			// Everything OK, read Digital In Channels;$X			axDInValue[0] := THIS^._abyIntRxBuf[7].0;%X			axDInValue[1] := THIS^._abyIntRxBuf[7].1;&X			axDInValue[2] := THIS^._abyIntRxBuf[7].2;'X			axDInValue[3] := THIS^._abyIntRxBuf[7].3;(		ELSE)R			//CRC not okay, return an empty buffer*&			flush(tmpRxBuf);+END_CASE,Interface-L{a9ed5b7e-75c5-4651-af16-d2c27e98cb94}.8METHOD AfterReadInputs : INT/VAR0†	tmpRxBuf : ARRAY [0..(ParamList.MONARCO_STRUCT_SIZE-1)] OF BYTE;  1<	udiBufSize : UDINT;          2	CRC : WORD;3	iDiCh : INT;4END_VARÐÐÐE&ÐÐ	
+Gx_l£!0…jüošBæã®á½$¨9System.StringL{f8a58466-d7f6-439f-bbb8-d4600e41d099}ImplementationL{3b83b776-fb25-43b8-99f2-3c507c9143fc}TextDocumentL{f3878285-8e4f-490b-bb1b-9acbb7eb04db}TextLinesL{a5de0b0b-1cb5-4913-ac21-9d70293ec00d}	Id
+longTagText
2SUPER^.AfterReadInputs();CASE _iState OF	(	10:	//debug counterV		_AfterReadInputs := _AfterReadInputs + 1;:		// determine size of bufferZ		udiBufSize := SIZEOF( THIS^._abyIntTxBuf );		v		(* Sets CRC16 checksum, for Tx byte array [24] and [25]*)X		CRC := THIS^.getCRC( THIS^._abyIntTxBuf );\		THIS^._abyIntTxBuf[24] := WORD_TO_BYTE(CRC);j		THIS^._abyIntTxBuf[25] := WORD_TO_BYTE(SHR(CRC,8));ˆ		IF NOT transfer(pabyTxBuffer:=ADR( THIS^._abyIntTxBuf ), pabyRxBuffer := ADR( tmpRxBuf ),udiLen := udiBufSize, uiDelayus:=0) THEN 			// fail&			_iState := 1000;		END_IF		// OK?D		IF THIS^.checkCRC(tmpRxBuf) THEN &			// Everything OK!			"J			//CRC okay, return the recv buffer#F			THIS^._abyIntRxBuf 	:= tmpRxBuf;$8			// set the hardwareconfig%6			HWConfig1 := byHWConfig;&2			// set the controlbyte'L			THIS^.ControlByte := byControlByte;(,			// set the ledmask )h			THIS^.SetUserLEDMask(byLedMask := byUserLedMask);*$			//set the leds +V			THIS^.SetUserLED(byLeds := byUserLeds) ;,>			// Read Digital In Channels;-P			THIS^.getDInByte( byDIN => bDInByte);.>			byDigitalIn.0 := bDInByte.0;/>			byDigitalIn.1 := bDInByte.1;0>			byDigitalIn.2 := bDInByte.2;1>			byDigitalIn.3 := bDInByte.3;2<			// Read Analog In Channels;3ˆ			THIS^.getAInWord(wAIn1 => awAnalogIn[0], wAIn2 => awAnalogIn[1]);4@			// Write Digital Out Channels5Z			THIS^.setDOutByte(byDOut := byDigitalOut);6>			// Write Analog Out Channels7”			THIS^.setAOutWord(wAOut1 :=  awAnalogOut[0], wAOut2 := awAnalogOut[1]);8		ELSE9R			//CRC not okay, return an empty buffer:&			flush(tmpRxBuf);;END_CASE<Interface=L{a9ed5b7e-75c5-4651-af16-d2c27e98cb94}>8METHOD AfterReadInputs : INT?VAR@†	tmpRxBuf : ARRAY [0..(ParamList.MONARCO_STRUCT_SIZE-1)] OF BYTE;  A<	udiBufSize : UDINT;          B	CRC : WORD;C	iDiCh : INT;D"	bDInByte : BYTE;EEND_VARÐÐÐE?ÐÐ	
 ­=ÚÐ-
ÐÐ	
 ­·ÚÐ-ÐÐ	
 ­ŽÚÐ-ÐÐ	
-­¸ÚÐ-ÐÐ	
+­úÚÐ-ÐÐ	
 ­¨ÚÐ-ÐÐ	
 ­©ÚÐ-ÐÐ	
 ­äÚÐ-ÐÐ	
@@ -22,26 +22,54 @@
 ­÷ÚÐ-ÐÐ	
 ­ÖÚÐ-ÐÐ	
 ­×ÚÐ-ÐÐ	
-­ØÚÐ- ÐÐ	
-­ÙÚÐ-!ÐÐ	
-­æÚÐ-"ÐÐ	
-­çÚÐ-#ÐÐ	
-­ìÚÐ-$ÐÐ	
-­ôÚÐ-%ÐÐ	
-­õÚÐ-&ÐÐ	
-­öÚÐ-'ÐÐ	
-­øÚÐ-"ÐÐ	
-­ÛÚÐ-(ÐÐ	
-­ÜÚÐ-)ÐÐ	
-­ÝÚÐ-*ÐÐ	
-­ÞÚÐ-!ÐÐ	
-­àÚÐ-ÐÐ	
-­«ÚÐ-ÐÐ	
-­¢ÚÐ-+Ð,-ÐEÐÐ	
-­ÚÐ-.ÐÐ	
-­:ÚÐ-/ÐÐ	
-­áÚÐ-0ÐÐ	
-­âÚÐ-1ÐÐ	
-­›ÚÐ-2ÐÐ	
-­óÚÐ-3ÐÐ	
-­ÚÐ-4
\ No newline at end of file
+­ÚÐ- ÐÐ	
+­ÚÐ-!ÐÐ	
+­ØÚÐ-"ÐÐ	
+­ÙÚÐ-#ÐÐ	
+­ÚÐ-!ÐÐ	
+­ ÚÐ-$ÐÐ	
+­ÚÐ-%ÐÐ	
+­æÚÐ-!ÐÐ	
+­ÚÐ-&ÐÐ	
+­ÚÐ-'ÐÐ	
+­ÚÐ-ÐÐ	
+­ÚÐ-(ÐÐ	
+­ÚÐ-)ÐÐ	
+­ÚÐ-!ÐÐ	
+­ÚÐ-*ÐÐ	
+­ÚÐ-+ÐÐ	
+­ÚÐ-!ÐÐ	
+­ÚÐ-,ÐÐ	
+­ÚÐ--ÐÐ	
+­ìÚÐ-.ÐÐ	
+­ôÚÐ-/ÐÐ	
+­õÚÐ-0ÐÐ	
+­öÚÐ-1ÐÐ	
+­ýÚÐ-!ÐÐ	
+­ÚÐ-2ÐÐ	
+­ÚÐ-3ÐÐ	
+­ÚÐ-ÐÐ	
+­þÚÐ-4ÐÐ	
+­ÚÐ-5ÐÐ	

ÚÐ-!ÐÐ	
+­ÚÐ-6ÐÐ	
+­ÚÐ-7ÐÐ	
+­	ÚÐ-ÐÐ	

+ÚÐ-!ÐÐ	
+­ÛÚÐ-8ÐÐ	
+­ÜÚÐ-9ÐÐ	
+­ÝÚÐ-:ÐÐ	
+­ÞÚÐ-#ÐÐ	
+­ûÚÐ-ÐÐ	
+­üÚÐ-ÐÐ	
+­àÚÐ-;Ð<=ÐE	ÐÐ	
+­ÚÐ->ÐÐ	
+­:ÚÐ-?ÐÐ	
+­áÚÐ-@ÐÐ	
+­âÚÐ-AÐÐ	
+­›ÚÐ-BÐÐ	
+­óÚÐ-CÐÐ	
+­ÚÐ-DÐÐ	
+­ÚÐ-ÐÐ	
+­ÚÐ-E
\ No newline at end of file