Repairs in code

[hydro.git] / app-stefic / control / board.c

diff --git a/app-stefic/control/board.c b/app-stefic/control/board.c
index 10f5e8324853cb9bf78d973e600f2de1de435e2f..f8676d4844dd6acde14709e13ad44c8d42eca2d0 100644 (file)
--- a/app-stefic/control/board.c
+++ b/app-stefic/control/board.c
@@ -55,30 +55,30 @@ int oi_period_wrfnc(ULOI_PARAM_coninfo void *context){
 
 void set_fan_PIN(){
     if (oi_fan == 1) {
-        SET_OUT_PIN(OUT_PORT,P1_27_FAN);
+        SET_OUT_PIN(OUT_PORT,P1_29_FAN);
         printf("FAN PIN UP\n");
     } else {
-        CLR_OUT_PIN(OUT_PORT,P1_27_FAN);
+        CLR_OUT_PIN(OUT_PORT,P1_29_FAN);
         printf("FAN PIN DOWN\n");
     }
 }
 
 void set_humidifier_PIN(){
     if (oi_humidifier == 1) {
-        SET_OUT_PIN(OUT_PORT,P1_28_HUMIDIFIER);
+        SET_OUT_PIN(OUT_PORT,P1_30_HUMIDIFIER);
         printf("HUM PIN UP\n");
     } else {
-        CLR_OUT_PIN(OUT_PORT,P1_28_HUMIDIFIER);
+        CLR_OUT_PIN(OUT_PORT,P1_30_HUMIDIFIER);
         printf("HUM PIN DOWN\n");
     }
 }
 
 void set_light_PIN(){
     if (oi_light == 1) {
-        SET_OUT_PIN(OUT_PORT,P1_29_LIGHT);
+        SET_OUT_PIN(OUT_PORT,P1_31_LIGHT);
         printf("LIGHT PIN UP\n");
     } else {
-        CLR_OUT_PIN(OUT_PORT,P1_29_LIGHT);
+        CLR_OUT_PIN(OUT_PORT,P1_31_LIGHT);
         printf("LIGHT PIN DOWN\n");
     }
 }
@@ -131,10 +131,7 @@ void send_data() {
         cid_cnt++;
     }
 
-    if (cid_cnt == 0){
-        heartbeat();
-    } else {
-
+    if (cid_cnt != 0){
         int i;
         int buff_len;
 
@@ -152,7 +149,6 @@ void send_data() {
 
         msgsend = ul_send_query(ul_fd, 0, UL_CMD_PDO, UL_BFL_NORE, (void*) buf, buff_len);
         printf("[I] DATA\n");
-        free(buf);
         ul_freemsg(ul_fd);
     }
 }
@@ -172,6 +168,7 @@ void oiinit(void){
 }
 
 void check_PDO(int cid, int data){
+    printf("CID: %i\n", cid);
     if (cid == oi_slot_fan){
         oi_fan = data;
         set_fan_PIN();
@@ -199,9 +196,10 @@ void work_with(void){
 //     IO0SET = P0_21_BIT;
 //     IO0SET = P0_22_BIT;
 
-    SET_OUT_PIN(OUT_PORT, P1_27_FAN);
-    CLR_OUT_PIN(OUT_PORT, P1_28_HUMIDIFIER);
-    SET_OUT_PIN(OUT_PORT, P1_29_LIGHT);
+    SET_OUT_PIN(OUT_PORT, P1_29_FAN);
+    SET_OUT_PIN(OUT_PORT, P1_31_LIGHT);
+    SET_OUT_PIN(OUT_PORT, P1_30_HUMIDIFIER);
+
 
     IO0SET = LED1_BIT; //vypinani LED
     IO0CLR = LED2_BIT; //zapinani LED