remove hardware define

config/board_bt6703.h

@@ -246,5 +246,6 @@ typedef enum {
 #define LED_GREEN_MINOR           LED_MINOR_G
 #define LED_RED_MINOR             LED_MINOR_R
 
+#define RELAY_NO
 
 #endif /* BOARD_PRS_H */

config/board_bt6707.h

@@ -270,4 +270,6 @@ typedef enum {
 #define LED_RED_MINOR             LED_MINOR_R
 
 
+#define RELAY_NC
+
 #endif /* BOARD_BT6707_H_ */

modules/monitor/ups_monitor.c

@@ -140,18 +140,18 @@ void relay_setup_log(uint8_t *curr_source, ro_type_source_t src_act_ro, uint8_t
 			  SNMP_SendUserTrap((DO0_TOGGLED+i));
 			  if(state_relay){
 				  flUpdateLog = true;
-#if	defined HARDWARE_BT6707
+#if	defined RELAY_NC
 				  log_event_data((LOG_DO0_STATE + i), "Разомкнуто");
-#elif HARDWARE_BT6703
+#else
 				  log_event_data((LOG_DO0_STATE + i), "Замкнуто");
 #endif
 
 			  }
 			  else{
 				  flUpdateLog = true;
-#if	defined HARDWARE_BT6707
+#if	defined RELAY_NC
 				  log_event_data((LOG_DO0_STATE + i), "Замкнуто");
-#elif HARDWARE_BT6703
+#else
 				  log_event_data((LOG_DO0_STATE + i), "Разомкнуто");
 #endif
 			  }
@@ -166,7 +166,7 @@ void relay_setup_log_change(uint8_t *curr_source, uint8_t *prev_source, ro_type_
 
 	for(i = 0; i < OUTPUTS_TOTAL_COUNT; i ++){
 		if(curr_source[i] != prev_source[i] && (prev_source[i] == src_act_ro || curr_source[i] == src_act_ro)){
-#if	defined HARDWARE_BT6707
+#if	defined RELAY_NC
 			if(curr_source[i] != src_act_ro){
 				flUpdateLog = true;
 				 SetROInt(0, i);
@@ -179,7 +179,7 @@ void relay_setup_log_change(uint8_t *curr_source, uint8_t *prev_source, ro_type_
 				  SNMP_SendUserTrap((DO0_TOGGLED+i));
 				  log_event_data((LOG_DO0_STATE + i), "Разомкнуто");
 			  }
-#elif HARDWARE_BT6703
+#else
 			  if(curr_source[i] != src_act_ro){
 				  flUpdateLog = true;
 				  SetROInt(0, i);
@@ -412,7 +412,7 @@ void UPS_LineFailMonitor(void)
 
     	log_event_data(LOG_ALARM_LINE, "Авария");
     	SNMP_SendUserTrap(LINE_ALARM);
-#ifdef HARDWARE_BT6709
+#ifdef AKB_CHANGE_MONITOR
       if(UPS.Alarm & 0x40) {
         log_event_data(LOG_ALARM_CHANGE_AKB, "Авария");
     	  SNMP_SendUserTrap(BATTERY_CHANGE_ALARM);

modules/parameters.c

@@ -684,8 +684,12 @@ void GetROTypeActStr(char *str, uint8_t *len, uint8_t num)
   */
 void GetRO0TypeActStr(char *str, uint8_t *len)
 {
-    sprintf(str, "%d", sSettings.sRelays[DOUT1].ro_type_source);
-    *len = strlen(str);
+    uint8_t num = 0;
+    if (num < OUTPUTS_TOTAL_COUNT) {
+      GetROTypeActStr(str, len, num);
+    } else {
+      *len = 0;
+    }
 }
 
 /**
@@ -693,29 +697,36 @@ void GetRO0TypeActStr(char *str, uint8_t *len)
   */
 void GetRO1TypeActStr(char *str, uint8_t *len)
 {
-    sprintf(str, "%d", sSettings.sRelays[DOUT2].ro_type_source);
-    *len = strlen(str);
+    uint8_t num = 1;
+    if (num < OUTPUTS_TOTAL_COUNT) {
+      GetROTypeActStr(str, len, num);
+    } else {
+      *len = 0;
+    }
 }
 
-#ifdef HARDWARE_BT6707
 /**
   * @brief  Источник срабатывания реле
   */
 void GetRO2TypeActStr(char *str, uint8_t *len)
 {
-    sprintf(str, "%d", sSettings.sRelays[DOUT3].ro_type_source);
-    *len = strlen(str);
+    uint8_t num = 2;
+    if (num < OUTPUTS_TOTAL_COUNT) {
+      GetROTypeActStr(str, len, num);
+    } else {
+      *len = 0;
+    }
 }
-#endif
 
 /**
   * @brief  Состояние релейного выхода
   */
 void GetDOUTStatusStr(char *str, uint8_t *len, uint8_t num)
 {
-#if defined HARDWARE_BT6707
+#ifdef RELAY_NC
     sprintf(str, "%d", (get_state_din_outs(DOUT1 + num) ^ 1));
-#elif HARDWARE_BT6703
+#endif
+#ifdef RELAY_NO
     sprintf(str, "%d", get_state_din_outs(DOUT1 + num));
 #endif
 
@@ -727,13 +738,14 @@ void GetDOUTStatusStr(char *str, uint8_t *len, uint8_t num)
   */
 void GetDOUTStatusStrRU(char *str, uint8_t *len, uint8_t num)
 {
-#if defined HARDWARE_BT6707
+#ifdef RELAY_NC
     if (get_state_din_outs(DOUT1 + num) ^ 1) {
         sprintf(str, "Замкнут");
     } else {
         sprintf(str, "Разомкнут");
     }
-#elif HARDWARE_BT6703
+#endif   
+#ifdef RELAY_NO
     if (get_state_din_outs(DOUT1 + num)) {
         sprintf(str, "Замкнут");
     } else {
@@ -749,12 +761,12 @@ void GetDOUTStatusStrRU(char *str, uint8_t *len, uint8_t num)
   */
 void GetDOUT0StatusStr(char *str, uint8_t *len)
 {
-#if defined HARDWARE_BT6707
-    sprintf(str, "%d", (get_state_din_outs(DOUT1) ^ 1));
-#elif HARDWARE_BT6703
-    sprintf(str, "%d", get_state_din_outs(DOUT1));
-#endif
-    *len = strlen(str);
+    uint8_t num = 0;
+    if (num < OUTPUTS_TOTAL_COUNT) {
+      GetDOUTStatusStr(str, len, num);
+    } else {
+      *len = 0;
+    }
 }
 
 /**
@@ -762,25 +774,27 @@ void GetDOUT0StatusStr(char *str, uint8_t *len)
   */
 void GetDOUT1StatusStr(char *str, uint8_t *len)
 {
-#if defined HARDWARE_BT6707
-    sprintf(str, "%d", (get_state_din_outs(DOUT2) ^ 1));
-#elif HARDWARE_BT6703
-    sprintf(str, "%d", get_state_din_outs(DOUT2));
-#endif
-    *len = strlen(str);
+    uint8_t num = 1;
+    if (num < OUTPUTS_TOTAL_COUNT) {
+      GetDOUTStatusStr(str, len, num);
+    } else {
+      *len = 0;
+    }
 }
 
-#if defined HARDWARE_BT6707
 /**
   * @brief  Состояние релейного выхода
   */
 void GetDOUT2StatusStr(char *str, uint8_t *len)
 {
-    sprintf(str, "%d", (get_state_din_outs(DOUT3) ^ 1));
-    *len = strlen(str);
+    uint8_t num = 2;
+    if (num < OUTPUTS_TOTAL_COUNT) {
+      GetDOUTStatusStr(str, len, num);
+    } else {
+      *len = 0;
+    }
 }
 #endif
-#endif
 // ************************************************************************** //
 //                             Информация
 
@@ -2558,7 +2572,7 @@ void SetDIN1NameStr(char *str)
   */
 void SetROTypeActStr(char *str, uint8_t num)
 {
-    static uint8_t OldROtype_Sourse[2] = {0};
+    static uint8_t OldROtype_Sourse[OUTPUTS_TOTAL_COUNT] = {0};
 
     OldROtype_Sourse[num] = sSettings.sRelays[num].ro_type_source;
 
@@ -2574,7 +2588,10 @@ void SetROTypeActStr(char *str, uint8_t num)
   */
 void SetRO1TypeActStr(char *str)
 {
-  SetROTypeActStr(str, 0);
+  uint8_t num = 0;
+  if (num < OUTPUTS_TOTAL_COUNT) {
+    SetROTypeActStr(str, num);
+  }
 }
 
 /**
@@ -2582,17 +2599,23 @@ void SetRO1TypeActStr(char *str)
   */
 void SetRO2TypeActStr(char *str)
 {
-  SetROTypeActStr(str, 1);
+  uint8_t num = 1;
+  if (num < OUTPUTS_TOTAL_COUNT) {
+    SetROTypeActStr(str, num);
+  }
 }
-#ifdef HARDWARE_BT6707
+
 /**
   * @brief  Источник срабатывания реле 3
   */
 void SetRO3TypeActStr(char *str)
 {
-  SetROTypeActStr(str, 2);
+    uint8_t num = 2;
+    if (num < OUTPUTS_TOTAL_COUNT) {
+      SetROTypeActStr(str, num);
+    }
 }
-#endif
+
 /**
   * @brief
   */

modules/parameters.h

@@ -533,12 +533,10 @@ void GetRO0TypeActStr(char *str, uint8_t *len);
   */
 void GetRO1TypeActStr(char *str, uint8_t *len);
 
-#ifdef HARDWARE_BT6707
 /**
   * @brief  Источник срабатывания реле
   */
 void GetRO2TypeActStr(char *str, uint8_t *len);
-#endif
 
 /**
   * @brief  Состояние релейного выхода
@@ -560,13 +558,11 @@ void GetDOUT0StatusStr(char *str, uint8_t *len);
   */
 void GetDOUT1StatusStr(char *str, uint8_t *len);
 
-#if defined HARDWARE_BT6707
 /**
   * @brief  Состояние релейного выхода
   */
 void GetDOUT2StatusStr(char *str, uint8_t *len);
 #endif
-#endif
 
 #ifdef TELNET_ENABLE
 // ************************************************************************** //
@@ -1127,12 +1123,10 @@ void SetRO1TypeActStr(char *str);
   */
 void SetRO2TypeActStr(char *str);
 
-#ifdef HARDWARE_BT6707
 /**
   * @brief  Источник срабатывания реле 3
   */
 void SetRO3TypeActStr(char *str);
-#endif
 
 /**
   * @brief