Diff of /ecu_at135_v1B_aladdin/StandardPLC/Plc Logic/Application/008.Gestion_Traction_1238E/Gestion_Traction/svnobj [r17] .. [r18]  Maximize  Restore

Switch to side-by-side view

--- a/ecu_at135_v1B_aladdin/StandardPLC/Plc Logic/Application/008.Gestion_Traction_1238E/Gestion_Traction/svnobj
+++ b/ecu_at135_v1B_aladdin/StandardPLC/Plc Logic/Application/008.Gestion_Traction_1238E/Gestion_Traction/svnobj
@@ -1,6 +1,6 @@
-Gx_lÆ&!0…jüo9ˆb7
-7YŽSystem.StringL{6f9dac99-8de1-4efc-8465-68ac443b7d08}SpecialFuncL{0db3d7bb-cde0-4416-9a7b-ce49a0124323}NoneImplementationL{3b83b776-fb25-43b8-99f2-3c507c9143fc}TextDocument	L{f3878285-8e4f-490b-bb1b-9acbb7eb04db}
-TextLinesL{a5de0b0b-1cb5-4913-ac21-9d70293ec00d}Id
longTagText¶(******************* AFFEECTATION DU SENS DE MARCHE***************************************).IF (Estop = FALSE) THEN¨		IF (Mode_Conduite = Global_tags.Struct_Vehicle_mode.Manuel AND Estop = FALSE) THENj				IF (Marche_avant = 1 AND Marche_arriere = 0) THEN,					Sens_marche := 2;L					Start_interlock_traction := TRUE;r				ELSIF (Marche_avant = 0 AND Marche_arriere = 1) THEN ,					Sens_marche := 1;				ELSE 	,					Sens_marche := 0;N					Start_interlock_traction := FALSE;				END_IF		END_IFEND_IF¶(*****************************************************************************************) ¶(********************** RETOUR INFORMATION DU MODE DE CONDUITE ***************************)!‚IF (Mode_conduite = Global_tags.Struct_Vehicle_mode.Manuel) THEN "8	Conduite_autonome := FALSE;#2	Conduite_Manuel := TRUE;$ŠELSIF (Mode_Conduite = Global_tags.Struct_Vehicle_mode.Autonom) THEN %6	Conduite_autonome := TRUE;&4	Conduite_Manuel := FALSE;'ELSE 	(Ò(******************* ECRITURE CONSIGNE DE VITESSE EN MODE MANUEL ***************************************))€IF (Mode_conduite = Global_tags.Struct_Vehicle_mode.Manuel) THEN*2	IF (Estop = FALSE) THEN	+V			IF (rConsigne_vitesse_Pedalier > 0)THEN ,>					IF (Sens_marche = 2) THEN -j						Consigne_vitesse := rConsigne_vitesse_Pedalier;.D					ELSIF (Sens_marche = 1) THEN /Ž						Consigne_vitesse := OSCAT_BASIC.NEGX(rConsigne_vitesse_Pedalier);0N						Start_interlock_traction := TRUE;1					ELSE 28						Consigne_vitesse := 0;3P						Start_interlock_traction := FALSE;4					END_IF5			ELSE64				Consigne_vitesse := 0;7			END_IF8	ELSE 9H		Start_interlock_traction := FALSE;:	END_IF;¸(************** APPUIS SUR PEDALIER DE FREIN OU ABSENCE DE PRESSION PEDALIER HOMME MORT****)<šIF ((Pedalier_frein = TRUE) OR (NOT Safety_Function) OR (Estop = TRUE)) THEN =.	Consigne_vitesse := 0;>Ì(******************* ECRITURE CONSIGNE DE VITESSE EN AUTONOME ***************************************)?‚IF (Mode_conduite = Global_tags.Struct_Vehicle_mode.Autonom) THEN@d		IF (rConsigne_vitesse_Virtual_Driver <> 0) THEN Ap			Consigne_vitesse := rConsigne_vitesse_Virtual_Driver;BH			Start_interlock_traction := TRUE;C		ELSE D2			Consigne_vitesse := 0;EJ			Start_interlock_traction := FALSE;FJ		Start_interlock_traction := FALSE;	GInterfaceHL{a9ed5b7e-75c5-4651-af16-d2c27e98cb94}I>FUNCTION_BLOCK Gestion_TractionJVAR_INPUTK°	Estop:								BOOL; // Monitoring Arrêt urgence - 0= AU Non-enclenché; 1= AU enclenchésL–	Mode_conduite:						INT; //0= Aucun Mode; 1= Mode Manuel; 2= Mode AutonomeM¶	rConsigne_vitesse_Pedalier:			REAL; // Consigne de vitesse convertie - Pédalier accel 0-5VNÄ	rConsigne_vitesse_Virtual_Driver:	REAL; // Consigne de vitesse convertie - Vitesse Virtual DriverO	PŠ	Marche_avant:						BOOL; // Entrée Digitale - Selecteur Marche AvantQ’	Marche_arriere:						BOOL; // Entrée Digitale - Selecteur Marche ArrièreR 	Safety_Function:					BOOL; // Entrée Digitale - Pédalier de sécurité Homme-MortSŒ	Pedalier_frein:						BOOL; // Entréee Digitale - Pédalier de freinageTEND_VARUVAR_OUTPUTV8	Consigne_vitesse:					REAL;W:	Conduite_autonome:					BOOL;X6	Conduite_manuel:					BOOL;YF	Start_interlock_traction:			BOOL; ZVAR[H	Offset_pression_pedal_secu:			TOF; \z	Sens_marche:						INT; // 0= Point Mort; 1= Recul; 2= Avance]"UniqueIdGenerator^790_POULevel`L{8e575c5b-1d37-49c6-941b-5c0ec7874787}aStandardb ChildObjectGuidsc8System.Collections.ArrayListd,AddAttributeSubsequenteboolÐÐ-ÐÐ	E
-NÐÐ
­¯ÚÐ-ÐÐ
­°ÚÐ-ÐÐ
­±ÚÐ-ÐÐ
­³ÚÐ-ÐÐ
­µÚÐ-ÐÐ
­ÚÐ-ÐÐ
­·ÚÐ-ÐÐ
­¸ÚÐ-ÐÐ
­ÚÐ-ÐÐ
­ºÚÐ-ÐÐ
­»ÚÐ-ÐÐ
­ÚÐ-ÐÐ
­¼ÚÐ-ÐÐ
­½ÚÐ-ÐÐ
­¾ÚÐ-ÐÐ
­¿ÚÐ-ÐÐ
­ÀÚÐ-ÐÐ
­ÁÚÐ-ÐÐ
­ÂÚÐ-ÐÐ
­ÃÚÐ- ÐÐ
­ÄÚÐ-!ÐÐ
­ÚÐ-"ÐÐ
­ÆÚÐ-#ÐÐ
­ÇÚÐ-$ÐÐ
­ÚÐ-%ÐÐ
­ÊÚÐ-&ÐÐ
­ËÚÐ-'ÐÐ
­ÚÐ-"ÐÐ
­ÍÚÐ-&ÐÐ
­ÎÚÐ-ÐÐ
­ÏÚÐ-ÐÐ
­ÐÚÐ-ÐÐ
­ÑÚÐ-(ÐÐ
­ÒÚÐ-)ÐÐ
­ÓÚÐ-*ÐÐ
­ÕÚÐ-+ÐÐ
­ØÚÐ-,ÐÐ
­ÿÚÐ--ÐÐ
­ÚÚÐ-.ÐÐ
­ÚÐ-/ÐÐ
­ÜÚÐ-0ÐÐ
­ÝÚÐ-1ÐÐ
­ÞÚÐ-2ÐÐ
­ßÚÐ-3ÐÐ
­àÚÐ-4ÐÐ
­ÚÐ-5ÐÐ
­ÚÐ-6ÐÐ
­áÚÐ-7ÐÐ
­âÚÐ-8ÐÐ
­ÚÐ-9ÐÐ
­ãÚÐ-:ÐÐ
­äÚÐ-ÐÐ
­åÚÐ-ÐÐ
­æÚÐ-ÐÐ
­çÚÐ-;ÐÐ
­èÚÐ-<ÐÐ
­
-ÚÐ-=ÐÐ
­êÚÐ-ÐÐ
­ëÚÐ-ÐÐ
­ÚÐ-ÐÐ
­ÚÐ-ÐÐ
­ìÚÐ->ÐÐ
­íÚÐ-?ÐÐ
­îÚÐ-*ÐÐ
­ÚÐ-@ÐÐ
­ÚÐ-AÐÐ
­óÚÐ-BÐÐ
­ôÚÐ-CÐÐ
­õÚÐ-DÐÐ
­öÚÐ-EÐÐ
­÷ÚÐ-ÐÐ
­øÚÐ-8ÐÐ
­	ÚÐ-FÐÐ
­úÚÐ-:ÐÐ
­üÚÐ-ÐÐ
­ÚÐ-ÐÐ
­þÚÐ-ÐÐ
­ÚÐ-ÐGHÐ	E
-ÐÐ
­ÚÐ-IÐÐ
­‘ÚÐ-ÐÐ
­’ÚÐ-JÐÐ
­“ÚÐ-KÐÐ
­”ÚÐ-ÐÐ
­•ÚÐ-LÐÐ
­–ÚÐ-MÐÐ
­—ÚÐ-NÐÐ
­˜ÚÐ-OÐÐ
­™ÚÐ-PÐÐ
­šÚÐ-QÐÐ
­›ÚÐ-RÐÐ
­œÚÐ-SÐÐ
­ÚÐ-TÐÐ
­žÚÐ-ÐÐ
­ŸÚÐ-UÐÐ
­ ÚÐ-VÐÐ
­¡ÚÐ-WÐÐ
­¢ÚÐ-XÐÐ
­£ÚÐ-YÐÐ
­¤ÚÐ-TÐÐ
­¥ÚÐ-ÐÐ
­¦ÚÐ-ZÐÐ
­§ÚÐ-[ÐÐ
­¨ÚÐ-\ÐÐ
­ªÚÐ-TÐÐ
­ÚÐ-Ð]-^Ð_`-abcÐde­
\ No newline at end of file
+Gx_l®!0…jüoE¯xU
+AľOSystem.StringL{6f9dac99-8de1-4efc-8465-68ac443b7d08}SpecialFuncL{0db3d7bb-cde0-4416-9a7b-ce49a0124323}NoneImplementationL{3b83b776-fb25-43b8-99f2-3c507c9143fc}TextDocument	L{f3878285-8e4f-490b-bb1b-9acbb7eb04db}
+TextLinesL{a5de0b0b-1cb5-4913-ac21-9d70293ec00d}Id
longTagTextÎ(*-----------------------------------------------------------------------------------------------------²Fonction: Vérification etat manipulateur/selecteur sens de marche pour affectation signe "Auteur: LE BRECQ Î-----------------------------------------------------------------------------------------------------*)Moving_Sense();PFonction: Demande de mouvement en manuel Moving_Manuel();TFonction: Demande de mouvement en autonomeMoving_auto();,Moving_step_by_step();–Fonction: Blocage des consignes de vitesse et désactivation de l'interlock ¢IF ((Pedalier_frein = TRUE) OR (Safety_Function = FALSE) OR (Estop = TRUE)) THEN .	Consigne_vitesse := 0;END_IFfIF (Safety_Function = FALSE) OR (Estop = TRUE) THEN F	Start_interlock_traction := FALSE;!Interface"L{a9ed5b7e-75c5-4651-af16-d2c27e98cb94}#>FUNCTION_BLOCK Gestion_Traction$VAR_INPUT%°	Estop:								BOOL; // Monitoring Arrêt urgence - 0= AU Non-enclenché; 1= AU enclenchés&–	Mode_conduite:						INT; //0= Aucun Mode; 1= Mode Manuel; 2= Mode Autonome'	(¶	rConsigne_vitesse_Pedalier:			REAL; // Consigne de vitesse convertie - Pédalier accel 0-5V)Ä	rConsigne_vitesse_Virtual_Driver:	REAL; // Consigne de vitesse convertie - Vitesse Virtual Driver*”	Select_Marche_avant:				BOOL; // Entrée Digitale - Selecteur Marche Avant+œ	Select_Marche_arriere:				BOOL; // Entrée Digitale - Selecteur Marche Arrière, 	Safety_Function:					BOOL; // Entrée Digitale - Pédalier de sécurité Homme-Mort-Œ	Pedalier_frein:						BOOL; // Entréee Digitale - Pédalier de freinage.ˆ	PaP_avant:							BOOL; // Entrée Digitales - Marche Pas à Pas avant/Ž	PaP_arriere:						BOOL; // Entrée Digitales - Marche Pas à Pas arrière0END_VAR1VAR_OUTPUT28	Consigne_vitesse:					REAL;3F	Start_interlock_traction:			BOOL; 4VAR5H	Offset_pression_pedal_secu:			TOF; 6z	Sens_marche:						INT; // 0= Point Mort; 1= Recul; 2= Avance7>	timeHold_pap_setpoint:				TON;8@	Block_pap_translation:				BOOL;9"UniqueIdGenerator:900;POULevel<L{8e575c5b-1d37-49c6-941b-5c0ec7874787}=Standard> ChildObjectGuids?8System.Collections.ArrayList@,AddAttributeSubsequentAboolÐÐ-ÐÐ	E
++ÐÐ
­¯ÚÐ-ÐÐ
­ÚÐ-ÐÐ
­ÚÐ-ÐÐ
­ÚÐ-ÐÐ
­°ÚÐ-ÐÐ
­¿ÚÐ-ÐÐ
­ÀÚÐ-ÐÐ
­ÚÐ-ÐÐ
­ÚÐ-ÐÐ
­ ÚÐ-ÐÐ
­ÁÚÐ-ÐÐ
­;ÚÐ-ÐÐ
­<ÚÐ-ÐÐ
­=ÚÐ-ÐÐ
­>ÚÐ-ÐÐ
­?ÚÐ-ÐÐ
­ÏÚÐ-ÐÐ
­ÑÚÐ-ÐÐ
­DÚÐ-ÐÐ
­EÚÐ-ÐÐ
­FÚÐ-ÐÐ
­GÚÐ-ÐÐ
­HÚÐ-ÐÐ
­CÚÐ-ÐÐ
­7ÚÐ-ÐÐ
­@ÚÐ-ÐÐ
­AÚÐ-ÐÐ
­BÚÐ-ÐÐ
­çÚÐ-ÐÐ
­èÚÐ-ÐÐ
­
+ÚÐ-ÐÐ
­êÚÐ-ÐÐ
­ÚÐ-ÐÐ
­ÚÐ-ÐÐ
­ÚÐ- ÐÐ
­ÚÐ-ÐÐ
­ëÚÐ-ÐÐ
­ÚÐ-ÐÐ
­ìÚÐ-ÐÐ
­üÚÐ-ÐÐ
­ÚÐ-ÐÐ
­þÚÐ-ÐÐ
­ÚÐ-Ð!"Ð	E
+ ÐÐ
­bÚÐ-#ÐÐ
­cÚÐ-ÐÐ
­dÚÐ-$ÐÐ
­eÚÐ-%ÐÐ
­fÚÐ-ÐÐ
­gÚÐ-&ÐÐ
­hÚÐ-'ÐÐ
­iÚÐ-(ÐÐ
­jÚÐ-)ÐÐ
­kÚÐ-'ÐÐ
­lÚÐ-*ÐÐ
­mÚÐ-+ÐÐ
­nÚÐ-,ÐÐ
­oÚÐ--ÐÐ
­{ÚÐ-.ÐÐ
­~ÚÐ-/ÐÐ
­|ÚÐ-ÐÐ
­pÚÐ-0ÐÐ
­qÚÐ-ÐÐ
­rÚÐ-1ÐÐ
­sÚÐ-2ÐÐ
­tÚÐ-3ÐÐ
­uÚÐ-0ÐÐ
­vÚÐ-ÐÐ
­wÚÐ-4ÐÐ
­xÚÐ-5ÐÐ
­yÚÐ-6ÐÐ
­ÚÐ-'ÐÐ
­ƒÚÐ-7ÐÐ
­„ÚÐ-8ÐÐ
­zÚÐ-0ÐÐ
­ÚÐ-Ð9-:Ð;<-=>?Ð@A­
\ No newline at end of file