Minor repairs.

diff --git a/app-stefic/control/board.c b/app-stefic/control/board.c
index 365fbf02d4902cc7d7c2452d5e09f1037899dbc3..16be3a32ce389d0582ff61f81acd1226f4f58014 100644 (file)
--- a/app-stefic/control/board.c
+++ b/app-stefic/control/board.c
@@ -6,7 +6,6 @@
 #include "board.h"
 
 // OBJECT INTERFACE VARIABLES
-uint16_t status_val;
 uint16_t oi_fan;
 uint16_t oi_cid_fan;
 uint16_t oi_humidifier;

diff --git a/app-stefic/control/definitions.c b/app-stefic/control/definitions.c
index 16bbeffe665f88907299d08f4e47029e342aa533..3d50715029937189c814bb447e4374c36f868060 120000 (symlink)
--- a/app-stefic/control/definitions.c
+++ b/app-stefic/control/definitions.c
@@ -1 +1 @@
-/home/stefic/BAP/build_ulan/ulan/embedded/hydro/app/sensor/definitions.c
\ No newline at end of file
+/home/stefic/BAP/build_ulan/ulan/embedded/hydro/app-stefic/sensor/definitions.c
\ No newline at end of file

diff --git a/app-stefic/control/definitions.h b/app-stefic/control/definitions.h
index 021c6a23f7b8e836b73fc49d88f5dd26bca3a9c7..eaff606cda0798cc57bd7b03626e3ad58a9e5261 120000 (symlink)
--- a/app-stefic/control/definitions.h
+++ b/app-stefic/control/definitions.h
@@ -1 +1 @@
-/home/stefic/BAP/build_ulan/ulan/embedded/hydro/app/sensor/definitions.h
\ No newline at end of file
+/home/stefic/BAP/build_ulan/ulan/embedded/hydro/app-stefic/sensor/definitions.h
\ No newline at end of file

diff --git a/app-stefic/control/hydroponie.c b/app-stefic/control/hydroponie.c
index 677369924f470f5e83bff5ffdf559c879d32552e..ea64e23f91a9b0aa8ded812862338e0cbd24d65c 120000 (symlink)
--- a/app-stefic/control/hydroponie.c
+++ b/app-stefic/control/hydroponie.c
@@ -1 +1 @@
-/home/stefic/BAP/build_ulan/ulan/embedded/hydro/app/sensor/hydroponie.c
\ No newline at end of file
+/home/stefic/BAP/build_ulan/ulan/embedded/hydro/app-stefic/sensor/hydroponie.c
\ No newline at end of file

diff --git a/app-stefic/control/hydroponie.h b/app-stefic/control/hydroponie.h
index d2c367fff804d8a571104300679ec7c6b755439e..e42717e5e963435847f845a2d33ade7e063fd3ca 120000 (symlink)
--- a/app-stefic/control/hydroponie.h
+++ b/app-stefic/control/hydroponie.h
@@ -1 +1 @@
-/home/stefic/BAP/build_ulan/ulan/embedded/hydro/app/sensor/hydroponie.h
\ No newline at end of file
+/home/stefic/BAP/build_ulan/ulan/embedded/hydro/app-stefic/sensor/hydroponie.h
\ No newline at end of file

diff --git a/app-stefic/control/hydroponieoi.c b/app-stefic/control/hydroponieoi.c
index 56421c12e48112c74df8ff1a170bf4dad6da91b0..30ab74c6c7cefd03adcb7a9925c867e63476361c 100644 (file)
--- a/app-stefic/control/hydroponieoi.c
+++ b/app-stefic/control/hydroponieoi.c
@@ -12,15 +12,7 @@
 #define I_LIGHT_CID 610
 #define I_PERIOD 700
 
-
 uint16_t status_val;
-uint16_t oi_fan;
-uint16_t oi_cid_fan;
-uint16_t oi_humidifier;
-uint16_t oi_cid_humidifier;
-uint16_t oi_light;
-uint16_t oi_cid_light;
-uint16_t oi_period;
 
 int status_rdfnc(ULOI_PARAM_coninfo void *context)
 {

diff --git a/app-stefic/control/ul_idstr.c b/app-stefic/control/ul_idstr.c
index 75fedd09f963dbc22fe739f520f81040aa0a3ba4..d4e0135c11c675c2845d8b7aa743fdbba4c57295 120000 (symlink)
--- a/app-stefic/control/ul_idstr.c
+++ b/app-stefic/control/ul_idstr.c
@@ -1 +1 @@
-/home/stefic/BAP/build_ulan/ulan/embedded/hydro/app/sensor/ul_idstr.c
\ No newline at end of file
+/home/stefic/BAP/build_ulan/ulan/embedded/hydro/app-stefic/sensor/ul_idstr.c
\ No newline at end of file

diff --git a/app-stefic/control/ul_idstr.h b/app-stefic/control/ul_idstr.h
index 0e55400563047e4c1a8bf6ca41404ba5fc47e84b..34efbc118b0876908e56970c7a933618d6525bd0 120000 (symlink)
--- a/app-stefic/control/ul_idstr.h
+++ b/app-stefic/control/ul_idstr.h
@@ -1 +1 @@
-/home/stefic/BAP/build_ulan/ulan/embedded/hydro/app/sensor/ul_idstr.h
\ No newline at end of file
+/home/stefic/BAP/build_ulan/ulan/embedded/hydro/app-stefic/sensor/ul_idstr.h
\ No newline at end of file

diff --git a/app-stefic/sensor/board.c b/app-stefic/sensor/board.c
index e51f83a10d32e0620bc0e468d33c23eebe7929ce..5eb441efdafbef18f256c9e60f77fd33c5544984 100644 (file)
--- a/app-stefic/sensor/board.c
+++ b/app-stefic/sensor/board.c
@@ -8,7 +8,6 @@
 adc_stat_t adcst;
 
 // OBJECT INTERFACE VARIABLES
-uint16_t status_val;
 int16_t oi_temperature;
 uint16_t oi_cid_temp;
 int16_t oi_humidity;
@@ -17,12 +16,16 @@ uint16_t oi_period;
 
 // OBJECT INTERFACE FUNCTIONS
 int oi_cid_temp_wrfnc(ULOI_PARAM_coninfo void *context){
-    uloi_uint_wrfnc(ULOI_ARG_coninfo context);
+    printf("cid_temp: %i\n",oi_cid_temp);
+    uloi_uint_wrfnc(ULOI_ARG_coninfo &oi_cid_temp);
+    printf("cid_temp: %i\n",oi_cid_temp);
     return 1;
 }
 
 int oi_cid_hum_wrfnc(ULOI_PARAM_coninfo void *context){
-    uloi_uint_wrfnc(ULOI_ARG_coninfo context);
+    printf("cid_hum: %i\n",oi_cid_hum);
+    uloi_uint_wrfnc(ULOI_ARG_coninfo &oi_cid_hum);
+    printf("cid_hum: %i\n",oi_cid_hum);
     return 1;
 }
 

diff --git a/app-stefic/sensor/definitions.c b/app-stefic/sensor/definitions.c
index 3a16c11f1f27b3cb198f6d4c89c9b055cbc9d37d..22cf70720041c5d2b8cd2ebd5ac0bcca28a39dd0 100644 (file)
--- a/app-stefic/sensor/definitions.c
+++ b/app-stefic/sensor/definitions.c
@@ -5,9 +5,9 @@
 #include <system_def.h>
 #include <cpu_def.h>
 
-// #include <lpciap.h>
+#include <lpciap.h>
 // #include <keyval_id.h>
-// #include <keyval_loc.h>
+#include <keyval_loc.h>
 // #include <lpciap_kvpb.h>
 
 #include "definitions.h"
@@ -86,12 +86,7 @@ int all_init(void){
     /***********************************/
     // set configuration for device
 //     kvpb_get_key(kvpb_block,KVPB_KEYID_ULAN_ADDR,1,&uaddr);
-//     kvpb_get_key(kvpb_block,KVPB_KEYID_ULAN_SN,4,&usn);
-// 
-//     kvpb_get_key(kvpb_block,KVPB_KEYID_ADC_CFG,sizeof(adc_cal_t),&adccal);
-//     kvpb_get_key(kvpb_block,KVPB_KEYID_CON_PARAM,sizeof(pid_con_param_t),&con_param);
-//     kvpb_get_key(kvpb_block,KVPB_KEYID_APPL_PARAM,sizeof(appl_param_t),&appl_param);
-//     printf("Keyval variables read\n");
+//     kvpb_get_key(kvpb_block,KVPB_KEYID_ULAN_SN,4,&sn);
 
     //opening file descriptor
     ul_fd = ul_open(NULL,NULL);

diff --git a/app-stefic/sensor/definitions.h b/app-stefic/sensor/definitions.h
index af5144e5f0f581e7ab14cbd41cb24998f655b015..4b88538cc3377714b3ea820231ed8ba0b785099e 100644 (file)
--- a/app-stefic/sensor/definitions.h
+++ b/app-stefic/sensor/definitions.h
@@ -15,10 +15,6 @@
 
 #define UL_DEV "/dev/ulan"
 
-// #define KVPB_KEYID_ADC_CFG     0x101
-// #define KVPB_KEYID_CON_PARAM   0x102
-// #define KVPB_KEYID_APPL_PARAM  0x103
-
 extern long sn;
 uchar server_adr;
 ul_msginfo msginfo;
@@ -34,7 +30,7 @@ ul_dyac_t ul_dyac_global;
 #ifndef UL_WITHOUT_HANDLE
 extern uloi_coninfo_t *coninfo;
 extern ul_dyac_t *ul_dyac;
-//extern kvpb_block_t *kvpb_block;
+// extern kvpb_block_t *kvpb_block;
 #endif
 
 #ifdef OS_POSIX

diff --git a/app-stefic/sensor/hydroponieoi.c b/app-stefic/sensor/hydroponieoi.c
index 03e529ac046fce137084dbbcf57b96a154f4c7d0..df1128f23a1d09d25cfcc94cb56e263dcfa2152a 100644 (file)
--- a/app-stefic/sensor/hydroponieoi.c
+++ b/app-stefic/sensor/hydroponieoi.c
@@ -10,13 +10,7 @@
 #define I_HUMIDITY_CID 210
 #define I_PERIOD 300
 
-
 uint16_t status_val;
-int16_t oi_temperature;
-uint16_t oi_cid_temp;
-int16_t oi_humidity;
-uint16_t oi_cid_hum;
-uint16_t oi_period;
 
 int status_rdfnc(ULOI_PARAM_coninfo void *context)
 {