Added monitoring web system. Minor changes in regulator and in control.

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

diff --git a/app-stefic/control/board.c b/app-stefic/control/board.c
index f8676d4844dd6acde14709e13ad44c8d42eca2d0..f4c09f040a6d7d1efb35b0a3243a35a203c4b9f5 100644 (file)
--- a/app-stefic/control/board.c
+++ b/app-stefic/control/board.c
@@ -55,30 +55,37 @@ int oi_period_wrfnc(ULOI_PARAM_coninfo void *context){
 
 void set_fan_PIN(){
     if (oi_fan == 1) {
-        SET_OUT_PIN(OUT_PORT,P1_29_FAN);
+//         SET_OUT_PIN(OUT_PORT,P1_30_FAN);
+        SET_OUT_PIN(LED_PORT,P0_28_FAN);
         printf("FAN PIN UP\n");
     } else {
-        CLR_OUT_PIN(OUT_PORT,P1_29_FAN);
+//         CLR_OUT_PIN(OUT_PORT,P1_30_FAN);
+        CLR_OUT_PIN(LED_PORT,P0_28_FAN);
         printf("FAN PIN DOWN\n");
     }
 }
 
 void set_humidifier_PIN(){
+    IO0DIR |= 0x40000000;
     if (oi_humidifier == 1) {
-        SET_OUT_PIN(OUT_PORT,P1_30_HUMIDIFIER);
+//         SET_OUT_PIN(OUT_PORT,P1_29_HUMIDIFIER);
+        SET_OUT_PIN(LED_PORT,P0_30_HUMIDIFIER);
         printf("HUM PIN UP\n");
     } else {
-        CLR_OUT_PIN(OUT_PORT,P1_30_HUMIDIFIER);
+//         CLR_OUT_PIN(OUT_PORT,P1_29_HUMIDIFIER);
+        CLR_OUT_PIN(LED_PORT,P0_30_HUMIDIFIER);
         printf("HUM PIN DOWN\n");
     }
 }
 
 void set_light_PIN(){
     if (oi_light == 1) {
-        SET_OUT_PIN(OUT_PORT,P1_31_LIGHT);
+//         SET_OUT_PIN(OUT_PORT,P1_31_LIGHT);
+        SET_OUT_PIN(LED_PORT,P0_25_LIGHT);
         printf("LIGHT PIN UP\n");
     } else {
-        CLR_OUT_PIN(OUT_PORT,P1_31_LIGHT);
+//         CLR_OUT_PIN(OUT_PORT,P1_31_LIGHT);
+        CLR_OUT_PIN(LED_PORT,P0_25_LIGHT);
         printf("LIGHT PIN DOWN\n");
     }
 }
@@ -110,7 +117,7 @@ void send_data() {
     static const int MAX_CID_CNT = 4;
     cid_data_t cids[MAX_CID_CNT];
 
-    if (oi_period == 1){
+    if (oi_period == HEART_PERIOD){
         cids[cid_cnt].cid = HEART_CID;
         cids[cid_cnt].value = status_val;
         cid_cnt++;
@@ -147,7 +154,7 @@ void send_data() {
             buff_len += 2;
         }
 
-        msgsend = ul_send_query(ul_fd, 0, UL_CMD_PDO, UL_BFL_NORE, (void*) buf, buff_len);
+        msgsend = ul_send_command(ul_fd, 0, UL_CMD_PDO, UL_BFL_NORE, (void*) buf, buff_len);
         printf("[I] DATA\n");
         ul_freemsg(ul_fd);
     }
@@ -163,12 +170,11 @@ void oiinit(void){
     oi_light = 0;
     oi_cid_light = 0;
     oi_slot_light = 0;
-    oi_period = 1;
+    oi_period = 2;
     status_val = 5;
 }
 
 void check_PDO(int cid, int data){
-    printf("CID: %i\n", cid);
     if (cid == oi_slot_fan){
         oi_fan = data;
         set_fan_PIN();
@@ -187,7 +193,8 @@ void regulate(void){}
 
 void work_with(void){
 
-    PINSEL1 &= 0xFFFFB3FF;
+//     PINSEL1 &= 0xFFFFB3FF;
+    PINSEL1 &= 0xCCF3FFFF;
 
     // u vetsi karbicky je SET z 0 do 3.3
     // u mensi je SET z -3.3 do 0
@@ -196,9 +203,24 @@ void work_with(void){
 //     IO0SET = P0_21_BIT;
 //     IO0SET = P0_22_BIT;
 
-    SET_OUT_PIN(OUT_PORT, P1_29_FAN);
-    SET_OUT_PIN(OUT_PORT, P1_31_LIGHT);
-    SET_OUT_PIN(OUT_PORT, P1_30_HUMIDIFIER);
+//     CLR_OUT_PIN(OUT_PORT, P1_26_UNUSED_BIT);
+// 
+//     CLR_OUT_PIN(OUT_PORT, P1_30_FAN);
+//     CLR_OUT_PIN(OUT_PORT, P1_31_LIGHT);
+//     CLR_OUT_PIN(OUT_PORT, P1_29_HUMIDIFIER);
+//     CLR_OUT_PIN(OUT_PORT, P1_28_UNUSED_BIT);
+//     SET_OUT_PIN(OUT_PORT, P1_27_UNUSED_BIT);
+
+
+IO0DIR |= 0x40000000;
+
+CLR_OUT_PIN(LED_PORT, P0_25_LIGHT);  //25
+CLR_OUT_PIN(LED_PORT, P0_28_FAN);  //28
+// CLR_OUT_PIN(LED_PORT, P0_30_PIN); //30
+
+// SET_OUT_PIN(LED_PORT, P0_25_PIN);  //25
+// SET_OUT_PIN(LED_PORT, P0_28_PIN);  //28
+SET_OUT_PIN(LED_PORT, P0_30_HUMIDIFIER);
 
 
     IO0SET = LED1_BIT; //vypinani LED