From e10e102b8b0ff3bf35f16b5276d56059d242e1fd Mon Sep 17 00:00:00 2001
From: Vasilii Chernov <vchernov@inr.ru>
Date: Mon, 8 Feb 2016 11:55:33 +0100
Subject: Add support for setting register value to script transfrom. Add
 set_property and get_property functions to pcipywrap. Cleaning cmakelists
 from unused dependencies

---
 xml/test_pywrap/props.xml     | 10 +++++++---
 xml/test_pywrap/test_prop2.py | 11 ++++++-----
 2 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'xml/test_pywrap')

diff --git a/xml/test_pywrap/props.xml b/xml/test_pywrap/props.xml
index 137ad04..59d593c 100644
--- a/xml/test_pywrap/props.xml
+++ b/xml/test_pywrap/props.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0"?>
 <model xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <transform path="/test/prop1" register="test_prop1" unit="C" read_from_register="(503975./1024000)*${/registers/fpga/reg1} + 28715./100" description="formula to get real fpga temperature from the fpga_temperature register in decimal"/>
-  <script path="/test/prop2"
+  <transform path="/test/prop1" 
+      register="test_prop1"
+      unit="C" 
+      read_from_register="(503975./1024000)*${/registers/fpga/reg1} + 28715./100" 
+      description="formula to get real fpga temperature from the fpga_temperature register in decimal"/>
+  <transform path="/test/prop2"
 	  register="test_prop2"
 	  unit="C"
 	  script="test_prop2.py"
 	  description="test python script #1"/>
-  <script path="/test/prop3"
+  <transform path="/test/prop3"
 	  register="test_prop3"
 	  unit="C"
 	  script="test_prop3.py"
diff --git a/xml/test_pywrap/test_prop2.py b/xml/test_pywrap/test_prop2.py
index e9a3364..68c6f1e 100644
--- a/xml/test_pywrap/test_prop2.py
+++ b/xml/test_pywrap/test_prop2.py
@@ -1,7 +1,8 @@
 import pcipywrap
-import os
     
-def read_from_register(): 
-    reg1_val =  pcipywrap.read_register('reg1');     
-    test_prop1_val = pcipywrap.read_register('test_prop3');
-    return test_prop1_val - reg1_val;
+def read_from_register():    
+    return pcipywrap.get_property('/registers/fpga/reg1') / 3
+    
+def write_to_register(value):    
+    pcipywrap.set_property('/registers/fpga/reg1', value*3)
+
-- 
cgit v1.2.3