增加F427声光报警

f427/applications/cascade.c

@@ -706,12 +706,12 @@ void cascade_scan_thread(void *arg)
 				//电量信息
 				for(int i = 0; i < cnt;i++)
 				{
-					slave_info.chache->north.data.ac_dc.power[i].voltage 	= all.pch[i+1].power[0].voltage *1000;
-					slave_info.chache->north.data.ac_dc.power[i].current 	= all.pch[i+1].power[0].current *1000;
-					slave_info.chache->north.data.ac_dc.power[i].power 	= all.pch[i+1].power[0].power *1000;
-					slave_info.chache->north.data.ac_dc.power[i].consumer  = all.pch[i+1].power[0].consump *1000;
-					slave_info.chache->north.data.ac_dc.power[i].factor 	= all.pch[i+1].power[0].factor *1000;
-					slave_info.chache->north.data.ac_dc.power[i].freq 		= all.pch[i+1].power[0].freq *1000;
+					slave_info.chache->north.data.ac_dc.power[i].voltage 	= all.pch[i+1].power[0].voltage *10;
+					slave_info.chache->north.data.ac_dc.power[i].current 	= all.pch[i+1].power[0].current *10;
+					slave_info.chache->north.data.ac_dc.power[i].power 	= all.pch[i+1].power[0].power *10;
+					slave_info.chache->north.data.ac_dc.power[i].consumer  = all.pch[i+1].power[0].consump *10;
+					slave_info.chache->north.data.ac_dc.power[i].factor 	= all.pch[i+1].power[0].factor *10;
+					slave_info.chache->north.data.ac_dc.power[i].freq 		= all.pch[i+1].power[0].freq *10;
 				}
 				//总信息
 				//slave_info.chache->north.data.ac_dc.power_all. = all.ttl.total;
@@ -753,10 +753,10 @@ void cascade_scan_thread(void *arg)
 				{
 					for(int j = A_P; j <= C_P;j++)
 					{
-						slave_info.chache->north.data.ac_3.ac_3_chn_p[i][j].p_consumer = all.pch[i+1].power[j].consump * 1000;
-						slave_info.chache->north.data.ac_3.ac_3_chn_p[i][j].p_current  = all.pch[i+1].power[j].current * 1000;
-						slave_info.chache->north.data.ac_3.ac_3_chn_p[i][j].p_power    = all.pch[i+1].power[j].power * 1000;
-						slave_info.chache->north.data.ac_3.ac_3_chn_p[i][j].p_voltage  = all.pch[i+1].power[j].voltage * 1000;
+						slave_info.chache->north.data.ac_3.ac_3_chn_p[i][j].p_consumer = all.pch[i+1].power[j].consump * 10;
+						slave_info.chache->north.data.ac_3.ac_3_chn_p[i][j].p_current  = all.pch[i+1].power[j].current * 10;
+						slave_info.chache->north.data.ac_3.ac_3_chn_p[i][j].p_power    = all.pch[i+1].power[j].power * 10;
+						slave_info.chache->north.data.ac_3.ac_3_chn_p[i][j].p_voltage  = all.pch[i+1].power[j].voltage * 10;
 						slave_info.chache->north.data.ac_3.ac_3_chn_p[i][j].p_status   = all.pch[i+1].status;		
 					}
 				}	

f427/applications/cfg.h

@@ -49,8 +49,8 @@
     
     #define CHANNEL_DELAY                       8
 
-    #define PROD_TYPE                           PDU_AC_I3O3
-    //#define PROD_TYPE                           PDU_AC_I1O1
+    //#define PROD_TYPE                           PDU_AC_I3O3
+    #define PROD_TYPE                           PDU_AC_I1O1
     //#define PROD_TYPE 													 PDU_DC_I1O1
     #define USE_UI
     #define ROTATE                             90

f427/applications/datadef.h

@@ -241,12 +241,12 @@ typedef struct {
 
 
 typedef struct {
-	char phase_seq[33];
+	char phase_seq[36];
 }phase_seq_3_1_t;
 
 typedef struct {
-	char phase_left[33];
-	char phase_right[33];
+	char phase_left[36];
+	char phase_right[36];
 }phase_seq_3_2_t;
 
 

f427/applications/main.c

@@ -101,7 +101,7 @@ __exit:
 
 static int user_init(void)
 {
-		sleep(1);								
+		sleep(3);								
     paras_data_t *p=paras_get();
     modbus_data_t *cas=&p->cas;
 		wanning_init();

f427/applications/power.c

@@ -11,6 +11,7 @@
 #include "beep.h"
 #include "time.h"
 #include "snmp.h"
+#include "led.h"
 
 #define  SECOND_MIL   20
 
@@ -608,7 +609,8 @@ static void wanning_operation(op_wanning_info  *info,char *name)
 			memcpy(data.AlarmContext,w_info.waning_context,64);
 			snmp_power_alarm_trap(&data);
 	}
-	beep_set(1);
+	beep_set(BEEP_MODE_WARN1);
+	led_set(LED_MODE_WARN1);
 }
 
 
@@ -634,8 +636,8 @@ static void lose_operation(char *name,int id,uint8_t ph)
 			memcpy(data.AlarmContext,w_info.waning_context,64);
 			snmp_power_alarm_trap(&data);
 	}
-	beep_set(1);	
-	
+	beep_set(BEEP_MODE_WARN1);	
+	led_set(LED_MODE_WARN1);
 }
 
 
@@ -810,11 +812,12 @@ static int board_read(power_handle_t *h, board_data_t *pbrd,uint8_t flag)
 										if(r) break;
 										for (i=0; i<pbrd->chs; i++) {
 											pch = &pbrd->pch[i];
-											pch->thr.v_upper = ((tmp[1]<<16)|tmp[0])/10;
-											pch->thr.v_lower = ((tmp[3]<<16)|tmp[2])/10;
-											pch->thr.c_upper = ((tmp[5]<<16)|tmp[4])/10;
-											pch->thr.p_upper = ((tmp[9]<<16)|tmp[8])/10;
-											pch->thr.w_upper = ((tmp[13]<<16)|tmp[12]/10);
+											int index = i*16;
+											pch->thr.v_upper = ((tmp[1+index]<<16)|tmp[0+index])/10;
+											pch->thr.v_lower = ((tmp[3+index]<<16)|tmp[2+index])/10;
+											pch->thr.c_upper = ((tmp[5+index]<<16)|tmp[4+index])/10;
+											pch->thr.p_upper = ((tmp[9+index]<<16)|tmp[8+index])/10;
+											pch->thr.w_upper = ((tmp[13+index]<<16)|tmp[12+index]/10);
 										}
 									}else
 									{
@@ -823,22 +826,24 @@ static int board_read(power_handle_t *h, board_data_t *pbrd,uint8_t flag)
 										if(r) break;
 										for (i=0; i< 7; i++) {
 											pch = &pbrd->pch[i];
-											pch->thr.v_upper = ((tmp[1]<<16)|tmp[0])/10;
-											pch->thr.v_lower = ((tmp[3]<<16)|tmp[2])/10;
-											pch->thr.c_upper = ((tmp[5]<<16)|tmp[4])/10;
-											pch->thr.p_upper = ((tmp[9]<<16)|tmp[8])/10;
-											pch->thr.w_upper = ((tmp[13]<<16)|tmp[12]/10);										
+											int index = i*16;
+											pch->thr.v_upper = ((tmp[1+index]<<16)|tmp[0+index])/10;
+											pch->thr.v_lower = ((tmp[3+index]<<16)|tmp[2+index])/10;
+											pch->thr.c_upper = ((tmp[5+index]<<16)|tmp[4+index])/10;
+											pch->thr.p_upper = ((tmp[9+index]<<16)|tmp[8+index])/10;
+											pch->thr.w_upper = ((tmp[13+index]<<16)|tmp[12+index]/10);										
 										}
 										offset = POWER_AC_THRESHOLD_L + (16*7);
 										
 										r = read_reg(h, pch->info.addr, offset, tmp, (pbrd->chs-7) * 16);
 										for (i=0; i< (pbrd->chs-7); i++) {
 											pch = &pbrd->pch[i+7];
-											pch->thr.v_upper = ((tmp[1]<<16)|tmp[0])/10;
-											pch->thr.v_lower = ((tmp[3]<<16)|tmp[2])/10;
-											pch->thr.c_upper = ((tmp[5]<<16)|tmp[4])/10;
-											pch->thr.p_upper = ((tmp[9]<<16)|tmp[8])/10;
-											pch->thr.w_upper = ((tmp[13]<<16)|tmp[12])/10;										
+											int index = i*16;
+											pch->thr.v_upper = ((tmp[1+index]<<16)|tmp[0+index])/10;
+											pch->thr.v_lower = ((tmp[3+index]<<16)|tmp[2+index])/10;
+											pch->thr.c_upper = ((tmp[5+index]<<16)|tmp[4+index])/10;
+											pch->thr.p_upper = ((tmp[9+index]<<16)|tmp[8+index])/10;
+											pch->thr.w_upper = ((tmp[13+index]<<16)|tmp[12+index])/10;										
 										}
 										
 									}

f427/applications/sensor.c

@@ -86,7 +86,7 @@ static void sensor_wanning_operation(op_sensor_w_info  *info,char *name)
 			memcpy(sensor_data.AlarmContext,w_info.waning_context,64);
 			snmp_sensor_alarm_trap(&sensor_data);
 	}
-	beep_set(1);
+	beep_set(BEEP_MODE_WARN1);
 }
 
 

f427/applications/ui/beep.c

@@ -21,7 +21,7 @@ static beep_para_t beep_para[BEEP_MODE_MAX]={
     {200,  200,  25},       //BEEP_MODE_FAULT
     {50,   50,   -1},       //BEEP_MODE_FATAL
 #else
-    {500, 500,   300},      //BEEP_MODE_WARN1
+    {500, 500,   60},      //BEEP_MODE_WARN1
     {333, 333,   450},      //BEEP_MODE_WARN2
     {500,  500,  10},       //BEEP_MODE_ERROR
     {200,  200,  25},       //BEEP_MODE_FAULT

f427/applications/ui/led.c

@@ -9,8 +9,8 @@
     #define LEDR_GPIO    GET_PIN(F, 9)
     #define LEDG_GPIO    GET_PIN(F, 10)
 #else
-    #define LEDR_GPIO    -1
-    #define LEDG_GPIO    GET_PIN(E, 6)
+    #define LEDR_GPIO    GET_PIN(D, 1)
+    #define LEDG_GPIO    GET_PIN(D, 0)
 #endif
 
 
@@ -48,7 +48,7 @@ static led_para_t led_para[LED_MODE_MAX]={
 #else
     {LED_ID_GREEN,   1000,   1000, -1, 0},      //LED_MODE_NORMAL
     {LED_ID_GREEN,   300, 1000,  -1, 0},     //LED_MODE_UPGRADING
-    {LED_ID_GREEN,   500, 500,  300,  0},    //LED_MODE_WARN1,
+    {LED_ID_GREEN,   500, 500,  60,  0},    //LED_MODE_WARN1,
     {LED_ID_GREEN,   333, 333,  450,  0},    //LED_MODE_WARN2,
     {LED_ID_GREEN,   500, 500,  10, 0},      //LED_MODE_ERROR,
     {LED_ID_GREEN,   200, 200,  25, 0},      //LED_MODE_FAULT
@@ -82,7 +82,7 @@ static void led_handler(void *arg, int last)
             gpio_set(h->io, h->info->off_level);
         }
 
-        led_set(LED_MODE_NORMAL);
+        led_reset();
     } 
 }
 //////////////////////////////////////////////////

f427/applications/ui/menu.c

@@ -882,7 +882,7 @@ int menu_init(void)
     }
    key_init();
    led_init();
-	 led_set(0);
+	 //led_set(0);
    beep_init();
    lcd_init(LCD_WIDTH,LCD_HEIGHT, misc->rotate);
    tmr_start(h,500);
@@ -2235,7 +2235,7 @@ int menu_handle(void)
         case KEY_UP:
         case KEY_DOWN:
         {
-            //led_reset();
+            led_reset();
 						beep_reset();
         }
         break;