diff options
| author | senator <senator> | 2010-05-11 14:19:17 +0000 |
|---|---|---|
| committer | senator <senator> | 2010-05-11 14:19:17 +0000 |
| commit | 884eed483d223d737e58a0aa24009a8c6805ce11 (patch) | |
| tree | e561c2af7f78d55fa174e69581aa73552e488d97 | |
| parent | d75ccb1523bfff98f2360b0b3406077f65bfd10c (diff) | |
smaller fixes to visutron900plus integration
| -rw-r--r-- | server/xml/macros/cycloplegisk_refraktion-1.0.xml | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/server/xml/macros/cycloplegisk_refraktion-1.0.xml b/server/xml/macros/cycloplegisk_refraktion-1.0.xml index becf626..7c66cf3 100644 --- a/server/xml/macros/cycloplegisk_refraktion-1.0.xml +++ b/server/xml/macros/cycloplegisk_refraktion-1.0.xml @@ -76,18 +76,13 @@ end return value, timestamp, source </map> - - - - - <map name="visutron900plus.osin.sph_near"> -- Returning 0, 0 invalidates the result value = 0 timestamp = 0 source = 0 - if(phoroptor and visutron900plus.osin and visutron900plus.osin.sph_near and visutron900plus.osin.sph_near.value and visutron900plus.osin.sph_near.timestamp) + if(visutron900plus and visutron900plus.osin and visutron900plus.osin.sph_near and visutron900plus.osin.sph_near.value and visutron900plus.osin.sph_near.timestamp) then value = visutron900plus.osin.sph_near.value -- convert . to , @@ -103,7 +98,7 @@ timestamp = 0 source = 0 - if(phoroptor and visutron900plus.osin and visutron900plus.osin.cyl and visutron900plus.osin.cyl.value and visutron900plus.osin.cyl.timestamp) + if(visutron900plus and visutron900plus.osin and visutron900plus.osin.cyl and visutron900plus.osin.cyl.value and visutron900plus.osin.cyl.timestamp) then value = visutron900plus.osin.cyl.value -- convert . to , @@ -119,7 +114,7 @@ timestamp = 0 source = 0 - if(phoroptor and visutron900plus.osin and visutron900plus.osin.axis and visutron900plus.osin.axis.value and visutron900plus.osin.axis.timestamp) + if(visutron900plus and visutron900plus.osin and visutron900plus.osin.axis and visutron900plus.osin.axis.value and visutron900plus.osin.axis.timestamp) then value = visutron900plus.osin.axis.value -- convert . to , @@ -135,7 +130,7 @@ timestamp = 0 source = 0 - if(phoroptor and visutron900plus.odxt and visutron900plus.odxt.sphn and visutron900plus.odxt.sph_near.value and visutron900plus.odxt.sph_near.timestamp) + if(visutron900plus and visutron900plus.odxt and visutron900plus.odxt.sph_near and visutron900plus.odxt.sph_near.value and visutron900plus.odxt.sph_near.timestamp) then value = visutron900plus.odxt.sph_near.value -- convert . to , @@ -151,7 +146,7 @@ timestamp = 0 source = 0 - if(phoroptor and visutron900plus.odxt and visutron900plus.odxt.cyl and visutron900plus.odxt.cyl.value and visutron900plus.odxt.cyl.timestamp) + if(visutron900plus and visutron900plus.odxt and visutron900plus.odxt.cyl and visutron900plus.odxt.cyl.value and visutron900plus.odxt.cyl.timestamp) then value = visutron900plus.odxt.cyl.value -- convert . to , @@ -167,7 +162,7 @@ timestamp = 0 source = 0 - if(phoroptor and visutron900plus.odxt and visutron900plus.odxt.axis and visutron900plus.odxt.axis.value and visutron900plus.odxt.axis.timestamp) + if(visutron900plus and visutron900plus.odxt and visutron900plus.odxt.axis and visutron900plus.odxt.axis.value and visutron900plus.odxt.axis.timestamp) then value = visutron900plus.odxt.axis.value -- convert . to , |