From 7c5bc1a066d6716e7b4940129c68a64eb22a9b8a Mon Sep 17 00:00:00 2001
From: Marianpol <marcin.musial20@gmail.com>
Date: Sun, 1 Nov 2020 15:47:00 +0100
Subject: [PATCH] Fap5 scenario fix

---
 pyren/mod_ecu_default.py |  4 ++--
 pyren/scen_ecri_fap5.py  | 28 ++++++++++++++--------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pyren/mod_ecu_default.py b/pyren/mod_ecu_default.py
index 1e4a9d6..5171351 100644
--- a/pyren/mod_ecu_default.py
+++ b/pyren/mod_ecu_default.py
@@ -218,9 +218,9 @@ def get_default_std_b( df, mn, se, elm, calc, getDTCmnemo ):
     description = df[dtc].label  
     
     if mod_globals.os=='android':
-      defstr = "%-6s(DTC%-6s) %-41s %-6s %-10s"%(df[dtc].agcdRef,dtc+dtcType,description,interpretation,isAlive)
+      defstr = "DTC%-6s (%s) %-41s %-6s %-10s"%(dtc+dtcType,df[dtc].agcdRef,description,interpretation,isAlive)
     else:
-      defstr = "%-6s(DTC%-6s) %-50s %-6s %-10s"%(df[dtc].agcdRef,dtc+dtcType,description,interpretation,isAlive)
+      defstr = "DTC%-6s (%s) %-50s %-6s %-10s"%(dtc+dtcType,df[dtc].agcdRef,description,interpretation,isAlive)
 
     stBitsDef = ['warningIndicatorRequested',
      'testNotCompletedThisOperationCycle',
diff --git a/pyren/scen_ecri_fap5.py b/pyren/scen_ecri_fap5.py
index 3030184..f237bf8 100755
--- a/pyren/scen_ecri_fap5.py
+++ b/pyren/scen_ecri_fap5.py
@@ -151,9 +151,9 @@ def run( elm, ecu, command, data ):
     print '\tCHECK CONDITIONS'
     print 
     print '*'*90
-    print datastr7
-    print datastr5
-    print datastr6
+    print pyren_encode(datastr7)
+    print pyren_encode(datastr5)
+    print pyren_encode(datastr6)
     print '*'*90
     print get_message_by_id('1149')  
     print 
@@ -239,17 +239,17 @@ def run( elm, ecu, command, data ):
     print '\tPhase  - ', phase
     #print '\tResult - ', result
     print '*'*90
-    print datastr0
-    print datastr1 
-    print datastr2 
-    print datastr3 
-    print datastr4 
-    print datastr5 
-    print datastr6 
-    print datastr7 
-    print datastr8 
-    print datastr9 
-    print datastra 
+    print pyren_encode(datastr0)
+    print pyren_encode(datastr1) 
+    print pyren_encode(datastr2) 
+    print pyren_encode(datastr3) 
+    print pyren_encode(datastr4) 
+    print pyren_encode(datastr5) 
+    print pyren_encode(datastr6) 
+    print pyren_encode(datastr7) 
+    print pyren_encode(datastr8) 
+    print pyren_encode(datastr9) 
+    print pyren_encode(datastra) 
     print '*'*90
     if pfe: break
     print 'Press Q to emergency exit'