From 60c6bf9f6916b6ae2c05a499675ff54480256ece Mon Sep 17 00:00:00 2001 From: "nicolas.zilio@hotmail.fr" <> Date: Fri, 11 Sep 2015 19:40:33 +0200 Subject: more towards views --- xml/test/camera.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xml/test') diff --git a/xml/test/camera.xml b/xml/test/camera.xml index 5b486ee..815a50e 100644 --- a/xml/test/camera.xml +++ b/xml/test/camera.xml @@ -277,9 +277,9 @@ 16 R sensor_temperature - - formuu1 - formuu2 + + formuu1 + formuu2 enumm2 -- cgit v1.2.3 From 2dfb23016c39a331bf5ed4111b630dffa330edbb Mon Sep 17 00:00:00 2001 From: "nicolas.zilio@hotmail.fr" <> Date: Mon, 14 Sep 2015 11:56:38 +0200 Subject: views working fine, units in progress --- xml/test/camera.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xml/test') diff --git a/xml/test/camera.xml b/xml/test/camera.xml index 815a50e..bf26d80 100644 --- a/xml/test/camera.xml +++ b/xml/test/camera.xml @@ -466,14 +466,14 @@ formuu2 C - ((1./4)*(@reg - 1200)) if @freq==0 else ((3./10)*(@reg - 1000)) + ((1./4)*(@reg + 1200)) if @freq==0 else ((3./10)*(@reg + 1000)) 4*@value + 1200 if @freq==0 else (10./3)*@value + 1000 formula to get real sensor temperature from the sensor_temperature register in decimal enumm2 high - low + low enum towards sensor_temperature register -- cgit v1.2.3 From a1bf5e300e2345b642d0a13e7e26d22c56156e47 Mon Sep 17 00:00:00 2001 From: "nicolas.zilio@hotmail.fr" <> Date: Mon, 14 Sep 2015 15:49:46 +0200 Subject: views with units functionnal (beware, as formulas are completely crap now, we could get segfault, for example if we want to write a negative value in register) --- xml/test/camera.xml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'xml/test') diff --git a/xml/test/camera.xml b/xml/test/camera.xml index bf26d80..ed01014 100644 --- a/xml/test/camera.xml +++ b/xml/test/camera.xml @@ -491,4 +491,38 @@ enum towards cmosis_exp_register register + + + @self+273.15 + @self*(9./5)+32 + + + @self-273.15 + (@self-273.15)*(9./5)+32 + + + (@self-32)*5./9 + (@self+273.15-32)*5./9 + + + @self*1000 + @self*1000000 + @self*1000000000 + + + @self/1000 + @self*1000 + @self*1000000 + + + @self/1000000 + @self/1000 + @self*1000 + + + @self/1000000000 + @self/1000000 + @self/1000 + + -- cgit v1.2.3 From 1234f4a7e2410b127120aaa20dfe3c996ad34ef4 Mon Sep 17 00:00:00 2001 From: "nicolas.zilio@hotmail.fr" <> Date: Tue, 15 Sep 2015 14:17:23 +0200 Subject: correction of some fails to load correct --- xml/test/camera.xml | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'xml/test') diff --git a/xml/test/camera.xml b/xml/test/camera.xml index ed01014..021ed61 100644 --- a/xml/test/camera.xml +++ b/xml/test/camera.xml @@ -253,6 +253,10 @@ all RW fr_num_lines_thr + + formuu2 + enumm2 +
0x100
@@ -278,8 +282,8 @@ R sensor_temperature - formuu1 - formuu2 + formuu1 + formuu2 enumm2 @@ -294,10 +298,6 @@ 10 RW fpga_temperature - - formuu1 - enumm1 - 29 @@ -348,6 +348,11 @@ 5 RW motor_phi + + formuu1 + enumm3 + + 5 @@ -392,6 +397,11 @@ 0 RW num_triggers + + formuu1 + formuu3 + enumm3 +
0x180
-- cgit v1.2.3 From e43b676d8294f37410ea0fa1f9fa39d10df64408 Mon Sep 17 00:00:00 2001 From: "nicolas.zilio@hotmail.fr" <> Date: Tue, 15 Sep 2015 17:27:27 +0200 Subject: not perfect but working --- xml/test/camera.xml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'xml/test') diff --git a/xml/test/camera.xml b/xml/test/camera.xml index 021ed61..6506467 100644 --- a/xml/test/camera.xml +++ b/xml/test/camera.xml @@ -463,8 +463,8 @@ formuu1 C - (503975./1024000)*@reg - 27315./100 - (@value + 27315./100)*(102400./503975) + (503975./1024000)*@reg@ - 27315./100 + (@value@ + 27315./100)*(102400./503975) formula to get real fpga temperature from the fpga_temperature register in decimal @@ -476,8 +476,8 @@ formuu2 C - ((1./4)*(@reg + 1200)) if @freq==0 else ((3./10)*(@reg + 1000)) - 4*@value + 1200 if @freq==0 else (10./3)*@value + 1000 + ((1./4)*(@reg@ + 1200)) if @freq@==0 else ((3./10)*(@reg@ + 1000)) + 4*@value@ + 1200 if @freq@==0 else (10./3)*@value@ + 1000 formula to get real sensor temperature from the sensor_temperature register in decimal @@ -503,21 +503,21 @@ - @self+273.15 - @self*(9./5)+32 + @self@+273.15 + @self@*(9./5)+32 - @self-273.15 - (@self-273.15)*(9./5)+32 + @self@-273.15 + (@self@-273.15)*(9./5)+32 - (@self-32)*5./9 - (@self+273.15-32)*5./9 + (@self@-32)*5./9 + (@self@+273.15-32)*5./9 - @self*1000 - @self*1000000 - @self*1000000000 + @self@*1000 + @self@*1000000 + @self@*1000000000 @self/1000 -- cgit v1.2.3