[bt6708]remove inouts module

modules/HTTP_Server/http_server.c

@@ -870,7 +870,7 @@ void HTTP_SetSettings(char *buf, uint16_t lenBuf)
 		memset(value, 0, len);
 	}
 	memset(value, 0, len);
-
+#ifndef HARDWARE_BT6708
   // Параметры реле и сухих контактов
   GetParamValue(buf, "di1=", value, &valueLen);
   SetDINTypeActStr(value, 0);
@@ -887,6 +887,7 @@ void HTTP_SetSettings(char *buf, uint16_t lenBuf)
   GetParamValue(buf, "ro3=", value, &valueLen);
 	SetROTypeActStr(value, 2);
 	memset(value, 0, len);
+#endif
 
   GetParamValue(buf, "utc=", value, &valueLen);
   SetSntpTimeZoneStr(value);

modules/HTTP_Server/web_params_api.c

@@ -84,6 +84,8 @@ void HTTP_GetParamsPage1(char *buf)
   strcat(buf, "\",\"bat_time_left\":\"");
   strncat(buf, str, len);
   
+#ifndef HARDWARE_BT6708
+
   GetDINStatusStr(str, &len, 0);
   strcat(buf, "\",\"di1\":\"");
   strncat(buf, str, len);
@@ -96,10 +98,11 @@ void HTTP_GetParamsPage1(char *buf)
   strcat(buf, "\",\"ro2\":\"");
   strncat(buf, str, len);
 
-#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if	defined HARDWARE_BT6706
   GetDOUTStatusStr(str, &len, 2);
   strcat(buf, "\",\"ro3\":\"");
   strncat(buf, str, len);
+#endif
 #endif
 
   // Дополнительные параметры
@@ -168,6 +171,7 @@ void HTTP_GetSettings(char *buf)
   strcat(buf, "\",\"managerIP5\":\"");
   strncat(buf, str, len);
 
+#ifndef HARDWARE_BT6708
   /*Параметры реле и сухих контактов*/
   GetDINTypeActStr(str, &len, 0);
   strcat(buf, "\",\"di1\":\"");
@@ -181,12 +185,13 @@ void HTTP_GetSettings(char *buf)
   strcat(buf, "\",\"ro2\":\"");
   strncat(buf, str, len);
 
-#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if	defined HARDWARE_BT6706
   GetROTypeActStr(str, &len, 2);
   strcat(buf, "\",\"ro3\":\"");
   strncat(buf, str, len);
 #endif
-	
+#endif
+
   /* WEB */
   GetIpStr(str, &len);  
   strcat(buf, "\",\"ipaddr\":\"");

modules/Telnet_Server/CLI_Commands.c

@@ -320,6 +320,7 @@ static const CLI_Command_Definition_t prvSensorCommandDefinition =
 {
 	( const int8_t * const ) "sensor", /* The command string to type. */
 	( const int8_t * const ) "\tsensor info: вывод параметров системы\r\n"
+#ifdef HARDWARE_BT6706
 								"\tsensor 	setup DI <num> <state>: установка нормального состояния сухого контакта:\r\n"
 								"\t\t\t\t0 - разомкнутое состояние\r\n"
 								"\t\t\t\t1 - замкнутое состояние\r\n"
@@ -327,8 +328,10 @@ static const CLI_Command_Definition_t prvSensorCommandDefinition =
 								"\t\t\t\t1 - Наличие сети\r\n"
 								"\t\t\t\t2 - Наличие выходного напряжения\r\n"
 								"\t\t\t\t3 - Разряд АКБ\r\n"
-								"\t\t\t\t4 - Отклбчение АКБ\r\n"
-								"\t\t\t\t5 - SNMP SET\r\n",
+								"\t\t\t\t4 - Отключение АКБ\r\n"
+								"\t\t\t\t5 - SNMP SET\r\n"
+#endif
+	,
 	prvTaskSensorCommand, /* The function to run. */
 	-1 /* No parameters are expected. */
 };
@@ -1347,25 +1350,27 @@ static portBASE_TYPE prvTaskConfigCommand( int8_t *pcWriteBuffer, size_t xWriteB
 		switch(i){
 		case ARG_CONFIG_INFO:
 			switch(config_menu){
-			case 0:
+			case PARAM_CONFIG_SNMP:
 				/* Return the next command help string, before moving the pointer on to
 				the next command in the list. */
 				strncpy( ( char * ) pcWriteBuffer, ( const char * ) pcInfoTableHeader, strlen( ( char * ) pcInfoTableHeader ) );
 				snmp_config_param(pcWriteBuffer);
 				break;
-			case 1:
+#ifdef HARDWARE_BT6706
+			case PARAM_CONFIG_INOUTS:
 				inouts_config_param(pcWriteBuffer);
 				break;
-			case 2:
+#endif
+			case PARAM_CONFIG_NET:
 				net_config_param(pcWriteBuffer);
 				break;
-			case 3:
+			case PARAM_CONFIG_TIME:
 				time_config_param(pcWriteBuffer);
 				break;
 			}
 
 			config_menu ++;
-			if(config_menu == 4){
+			if(config_menu == PARAM_CONFIG_ALL){
 				config_menu = 0;
 				return pdFALSE;
 			}
@@ -1641,6 +1646,13 @@ static portBASE_TYPE prvTaskSensorCommand( int8_t *pcWriteBuffer, size_t xWriteB
 	int32_t val = 0, val2 = 0;
 	uint8_t fail = 0;
 	static uint8_t config_menu = 0;
+	uint8_t MAX_CONFIG_PARAM = 0;
+
+#ifdef HARDWARE_BT6706
+	MAX_CONFIG_PARAM = 3;
+#else
+	MAX_CONFIG_PARAM = 2;
+#endif
 
 	const int8_t * const pcSensorTableHeader = ( int8_t * ) "\r\n*********Параметры Контроллера*********\r\n";
 
@@ -1687,13 +1699,15 @@ static portBASE_TYPE prvTaskSensorCommand( int8_t *pcWriteBuffer, size_t xWriteB
 			case 1:
 				ups_sensor_akb_param(pcWriteBuffer);
 				break;
+#ifdef HARDWARE_BT6706
 			case 2:
 				inouts_sensor_param(pcWriteBuffer);
 				break;
+#endif
 			}
 
 			config_menu ++;
-			if(config_menu == 3){
+			if(config_menu == MAX_CONFIG_PARAM){
 				config_menu = 0;
 				return pdFALSE;
 			}
@@ -1707,6 +1721,7 @@ static portBASE_TYPE prvTaskSensorCommand( int8_t *pcWriteBuffer, size_t xWriteB
 	}
 	else{
 		switch(i){
+#ifdef HARDWARE_BT6706
 		case ARG_SENSOR_SETUP:
 			if(telnet_code_auth != ADMIN){
 				strncpy( ( char * ) pcWriteBuffer, ( const char * ) pcPermissionDenied, strlen( ( char * ) pcPermissionDenied ) );
@@ -1792,6 +1807,7 @@ static portBASE_TYPE prvTaskSensorCommand( int8_t *pcWriteBuffer, size_t xWriteB
 			}
 
 		break;
+#endif
 		default:
 			strncpy( ( char * ) pcWriteBuffer, ( const char * ) pcInvalidCommand, strlen( ( char * ) pcInvalidCommand ) );
 		break;

modules/Telnet_Server/CLI_Commands.h

@@ -58,6 +58,16 @@ typedef enum{
 	ARG_CONFIG_ALL
 }config_args_t;
 
+typedef enum{
+	PARAM_CONFIG_SNMP = 0,
+#ifdef HARDWARE_BT6706
+	PARAM_CONFIG_INOUTS,
+#endif
+	PARAM_CONFIG_NET,
+	PARAM_CONFIG_TIME,
+	PARAM_CONFIG_ALL
+}config_params_t;
+
 typedef enum{
 	ARG_NETCONFIG_APPLY = 0,
 	ARG_NETCONFIG_CONFIRM,
@@ -72,7 +82,9 @@ typedef enum{
 
 typedef enum{
 	ARG_SENSOR_INFO = 0,
+#ifdef HARDWARE_BT6706
 	ARG_SENSOR_SETUP,
+#endif
 	ARG_SENSOR_ALL
 }sensor_args_t;
 

modules/Telnet_Server/CLI_Parameters.c

@@ -68,6 +68,7 @@ void snmp_config_param(int8_t *buf)
 	strcat(( char * ) buf, "\r\n");
 }
 
+#ifndef HARDWARE_BT6708
 //Настройки сухих контактов
 void inouts_config_param(int8_t *buf)
 {
@@ -134,6 +135,7 @@ void inouts_config_param(int8_t *buf)
 	}
 	strncat( ( char * ) buf, ( const char * ) pcSharedTableHeader, strlen( ( char * ) pcSharedTableHeader ) );
 }
+#endif
 
 //Сетевые настройки
 void net_config_param(int8_t *buf)
@@ -280,6 +282,7 @@ void ups_sensor_akb_param(int8_t *buf)
 	strcat(( char * ) buf, "\r\n");
 }
 
+#ifndef HARDWARE_BT6708
 //Параметры сухих контактов
 void inouts_sensor_param(int8_t *buf)
 {
@@ -309,3 +312,4 @@ void inouts_sensor_param(int8_t *buf)
 
 	strcat(( char * ) buf, "\r\n");
 }
+#endif

modules/Telnet_Server/CLI_Parameters.h

@@ -12,8 +12,10 @@
 //Настройки SNMP
 void snmp_config_param(int8_t *buf);
 
+#ifndef HARDWARE_BT6708
 //Настройки сухих контактов
 void inouts_config_param(int8_t *buf);
+#endif
 
 //Сетевые настройки
 void net_config_param(int8_t *buf);
@@ -27,7 +29,8 @@ void ups_sensor_param(int8_t *buf);
 //Параметры аккумуляторных батарей
 void ups_sensor_akb_param(int8_t *buf);
 
+#ifndef HARDWARE_BT6708
 //Параметры сухих контактов
 void inouts_sensor_param(int8_t *buf);
-
+#endif
 #endif /* CLI_PARAMETERS_H_ */

modules/log/log.c

@@ -30,11 +30,15 @@ const char* logsStrShortRu[] =
     "Авторизация",
     "Тест ИБП",
     "Откл. нагрузки ИБП",
+#ifndef HARDWARE_BT6708
     "Авария дискр. входа 1",
     "Состояние выхода 1",
     "Состояние выхода 2",
-#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if	defined HARDWARE_BT6706
     "Состояние выхода 3",
+#endif
+#endif
+#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
     "Авария вых. напряжения",
 #endif
     "Авария температуры",

modules/log/log.h

@@ -28,11 +28,15 @@ typedef __packed enum {
 	LOG_LOGIN,		//
 	LOG_TEST_UPS,		//
 	LOG_SHUTDOWN_UPS,
+#ifndef HARDWARE_BT6708
 	LOG_ALARM_DIO,
 	LOG_DO0_STATE,
 	LOG_DO1_STATE,
-#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if	defined HARDWARE_BT6706
 	LOG_DO2_STATE,
+#endif
+#endif
+#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
 	LOG_ALARM_VAC_OUTPUT,
 #endif
 	LOG_ALARM_TEMP,

modules/monitor/ups_monitor.c

@@ -70,7 +70,9 @@ void UPS_Monitor(void *params)
       UPS_BatteryConnectMonitor();
     }
     UPS_ConnectMonitor();
+#ifndef HARDWARE_BT6708
     UPS_DI0Monitor();
+#endif
 #ifdef HARDWARE_BT6702
     UPS_CriticalAlarmMonitor();
     UPS_NonCriticalAlarmMonitor();
@@ -79,7 +81,7 @@ void UPS_Monitor(void *params)
     vTaskDelay(1000);
   }
 }
-
+#ifndef HARDWARE_BT6708
 /**
   * @brief  Мониторинг бита DI0 state
   */
@@ -142,7 +144,7 @@ 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_BT6706 || HARDWARE_BT6708
+#if	defined HARDWARE_BT6706
 				  log_event_data((LOG_DO0_STATE + i), "Разомкнуто");
 #elif HARDWARE_BT6702
 				  log_event_data((LOG_DO0_STATE + i), "Замкнуто");
@@ -151,7 +153,7 @@ void relay_setup_log(uint8_t *curr_source, ro_type_source_t src_act_ro, uint8_t
 			  }
 			  else{
 				  flUpdateLog = true;
-#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if	defined HARDWARE_BT6706
 				  log_event_data((LOG_DO0_STATE + i), "Замкнуто");
 #elif HARDWARE_BT6702
 				  log_event_data((LOG_DO0_STATE + i), "Разомкнуто");
@@ -161,13 +163,14 @@ void relay_setup_log(uint8_t *curr_source, ro_type_source_t src_act_ro, uint8_t
 	}
 }
 
+
 void relay_setup_log_change(uint8_t *curr_source, uint8_t *prev_source, ro_type_source_t src_act_ro)
 {
 	uint8_t i = 0;
 
 	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_BT6706 || HARDWARE_BT6708
+#if	defined HARDWARE_BT6706
 			if(curr_source[i] != src_act_ro){
 				flUpdateLog = true;
 				 SetROInt(0, i);
@@ -198,6 +201,8 @@ void relay_setup_log_change(uint8_t *curr_source, uint8_t *prev_source, ro_type_
 		}
 	}
 }
+#endif
+
 
 #ifdef HARDWARE_BT6702
 /**
@@ -348,7 +353,7 @@ void UPS_LineFailMonitor(void)
   static uint8_t lineFailOldState = 0;
   uint8_t lineFailCurrent;
 
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6706
   uint8_t i = 0;
   static uint8_t OldROtype_Sourse[OUTPUTS_TOTAL_COUNT] = {0};
   uint8_t CurrROtype_Sourse[OUTPUTS_TOTAL_COUNT] = {0};
@@ -367,12 +372,12 @@ void UPS_LineFailMonitor(void)
     	log_event_data(LOG_ALARM_LINE, "Авария");
           SNMP_SendUserTrap(LINE_ALARM);
           flUpdateLog = true;
-#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if	defined HARDWARE_BT6706
     	relay_setup_log(CurrROtype_Sourse, AC_PRESENT, 1);
 #endif
     }
     else{
-#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if	defined HARDWARE_BT6706
       relay_setup_log(CurrROtype_Sourse, AC_PRESENT, 0);
 #endif
       log_event_data(LOG_ALARM_LINE, "Норма");
@@ -391,7 +396,7 @@ void UPS_LineFailMonitor(void)
   if (lineFailCurrent != lineFailOldState)
   {
     if (lineFailCurrent){
-#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if	defined HARDWARE_BT6706
     	relay_setup_log(CurrROtype_Sourse, AC_PRESENT, 1);
 #endif
 
@@ -400,7 +405,7 @@ void UPS_LineFailMonitor(void)
     	flUpdateLog = true;
     }
     else{
-#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if	defined HARDWARE_BT6706
       relay_setup_log(CurrROtype_Sourse, AC_PRESENT, 0);
 #endif
       log_event_data(LOG_ALARM_LINE, "Норма");
@@ -409,7 +414,7 @@ void UPS_LineFailMonitor(void)
     }
   }
 
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6706
   else{
 	  if (lineFailCurrent)
 		  relay_setup_log_change(CurrROtype_Sourse, OldROtype_Sourse, AC_PRESENT);
@@ -432,7 +437,7 @@ void UPS_VACoutputMonitor(void)
 
   static uint8_t stateCurrentVACoutput = HYST_IDLE;
   uint8_t VACoutputCurrent;
-
+#if	defined HARDWARE_BT6706
   uint8_t i = 0;
   static bool isValueRecv = false;
   static uint8_t OldROtype_Sourse[OUTPUTS_TOTAL_COUNT] = {0};
@@ -443,7 +448,7 @@ void UPS_VACoutputMonitor(void)
 	  if(!isValueRecv)
 		  OldROtype_Sourse[i] = CurrROtype_Sourse[i];
   }
-
+#endif
 
   VACoutputCurrent = UPS.VAC_out;
 
@@ -455,16 +460,18 @@ void UPS_VACoutputMonitor(void)
       LED_On(LED_MINOR_R);
       LED_On(LED_MINOR_G);
       stateCurrentVACoutput = HYST_UP;
-
+#if	defined HARDWARE_BT6706
       relay_setup_log(CurrROtype_Sourse, DC_PRESENT, 1);
-
+#endif
 	  log_event_data(LOG_ALARM_VAC_OUTPUT, "Авария");
 	  // Отправка трапа о завышении
 	//  SNMP_SendUserTrap(POWER_ALARM);
 	  flUpdateLog = true;
 	}
     else{
+#if	defined HARDWARE_BT6706
     	relay_setup_log_change(CurrROtype_Sourse, OldROtype_Sourse, DC_PRESENT);
+#endif
     }
   }
   /* Отслеживается нормализация */
@@ -475,19 +482,20 @@ void UPS_VACoutputMonitor(void)
     	LED_Off(LED_MINOR_R);
     	LED_Off(LED_MINOR_G);
     	stateCurrentVACoutput = HYST_IDLE;
-
+#if	defined HARDWARE_BT6706
 	  relay_setup_log(CurrROtype_Sourse, DC_PRESENT, 0);
-
+#endif
 	  log_event_data(LOG_ALARM_VAC_OUTPUT, "Норма");
 	  // Отправка трапа о нормализации
 	 // SNMP_SendUserTrap(POWER_NORM);
 	  flUpdateLog = true;
 	}
   }
-
+#if	defined HARDWARE_BT6706
   for(i = 0; i < OUTPUTS_TOTAL_COUNT; i ++){
   	  OldROtype_Sourse[i] = CurrROtype_Sourse[i];
     }
+#endif
 }
 
 #endif
@@ -502,7 +510,7 @@ void UPS_LowBatMonitor(void)
   static bool flag_alarm_time = false;
   uint8_t lowBatCurrent;
 
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6706
   uint8_t i = 0;
   static uint8_t OldROtype_Sourse[OUTPUTS_TOTAL_COUNT] = {0};
   uint8_t CurrROtype_Sourse[OUTPUTS_TOTAL_COUNT] = {0};
@@ -523,7 +531,7 @@ void UPS_LowBatMonitor(void)
     	log_event_data(LOG_ALARM_LOW_BAT, "Авария");
           SNMP_SendUserTrap(LOW_BAT_ALARM);
           flUpdateLog = true;
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6706
       relay_setup_log(CurrROtype_Sourse, CHARGE_AKB, 1);
 #endif
     }
@@ -531,7 +539,7 @@ void UPS_LowBatMonitor(void)
 	  SNMP_SendUserTrap(LOW_BAT_NORM);
 	  log_event_data(LOG_ALARM_LOW_BAT, "Норма");
 	  flUpdateLog = true;
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6706
 	  relay_setup_log(CurrROtype_Sourse, CHARGE_AKB, 0);
 #endif
 	}
@@ -554,7 +562,7 @@ void UPS_LowBatMonitor(void)
 		  SNMP_SendUserTrap(LOW_BAT_NORM);
 		  log_event_data(LOG_ALARM_LOW_BAT, "Норма");
 		  flUpdateLog = true;
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6706
 		  relay_setup_log(CurrROtype_Sourse, CHARGE_AKB, 0);
 #endif
 		}
@@ -563,7 +571,7 @@ void UPS_LowBatMonitor(void)
 		flag_alarm_time = true;
 	}
   }
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6706
   else{
 	  flag_alarm_time = false;
 	  if (lowBatCurrent)
@@ -733,7 +741,7 @@ void UPS_BatteryConnectMonitor(void)
   static uint8_t AKBconnectOldState = 0;
   uint8_t AKBconnectCurrent;
 
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6706
   uint8_t i = 0;
   static uint8_t OldROtype_Sourse[OUTPUTS_TOTAL_COUNT] = {0};
   uint8_t CurrROtype_Sourse[OUTPUTS_TOTAL_COUNT] = {0};
@@ -757,7 +765,7 @@ void UPS_BatteryConnectMonitor(void)
       log_event_data(LOG_ALARM_AKB, "Авария");
 	  SNMP_SendUserTrap(BATTERY_CONNECT_ALARM);
 	  flUpdateLog = true;
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6706
       relay_setup_log(CurrROtype_Sourse, OFF_AKB, 1);
 #endif
     }
@@ -765,7 +773,7 @@ void UPS_BatteryConnectMonitor(void)
     	log_event_data(LOG_ALARM_AKB, "Норма");
 		  SNMP_SendUserTrap(BATTERY_CONNECT_NORM);
 		  flUpdateLog = true;
-#if	defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if	defined HARDWARE_BT6706
 		  relay_setup_log(CurrROtype_Sourse, OFF_AKB, 0);
 #endif
     }
@@ -780,7 +788,7 @@ void UPS_BatteryConnectMonitor(void)
 		  log_event_data(LOG_ALARM_AKB, "Норма");
 		  SNMP_SendUserTrap(BATTERY_CONNECT_NORM);
 		  flUpdateLog = true;
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6706
 		  relay_setup_log(CurrROtype_Sourse, OFF_AKB, 0);
 #endif
 		}
@@ -788,7 +796,7 @@ void UPS_BatteryConnectMonitor(void)
 		  log_event_data(LOG_ALARM_AKB, "Авария");
 		  SNMP_SendUserTrap(BATTERY_CONNECT_ALARM);
 		  flUpdateLog = true;
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6706
 		  relay_setup_log(CurrROtype_Sourse, OFF_AKB, 1);
 #endif
 		}
@@ -797,7 +805,7 @@ void UPS_BatteryConnectMonitor(void)
 		flag_alarm_time = true;
 	}
   }
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6706
   else{
 	  flag_alarm_time = false;
 	  if (AKBconnectCurrent)

modules/parameters.c

@@ -339,6 +339,7 @@ void GetSntpLastDataStr(char *str, uint8_t *len)
   *len = strlen(str);
 }
 
+#ifndef HARDWARE_BT6708
 // ************************************************************************** //
 //                             Параметры реле/сухих контактов
 
@@ -460,7 +461,7 @@ void GetDOUT2StatusStr(char *str, uint8_t *len)
 	*len = strlen(str);
 }
 #endif
-
+#endif
 // ************************************************************************** //
 //                             Информация
 
@@ -1386,7 +1387,7 @@ void SetSntpTimeZoneStr(char *str)
   sSettings.sSNTP.timeZone = newUtc; // atof(str);
   //TM_RTC_Correction(sSettings.sSNTP.timeZone);
 }
-
+#ifndef HARDWARE_BT6708
 // ************************************************************************** //
 //                             Параметры реле/сухих контактов
 
@@ -1428,7 +1429,7 @@ void SetROInt(uint8_t val, uint8_t num)
 {
 	set_state_douts((DOUT1+num), val);
 }
-
+#endif
 // ************************************************************************** //
 //                             Параметры настройки ИБП
 

modules/parameters.h

@@ -310,6 +310,7 @@ void GetAuthEnableStateStr(char *str, uint8_t *len);
 
 #endif
 
+#ifndef HARDWARE_BT6708
 // ************************************************************************** //
 //                             Параметры реле/сухих контактов
 
@@ -363,7 +364,7 @@ void GetDOUT1StatusStr(char *str, uint8_t *len);
   */
 void GetDOUT2StatusStr(char *str, uint8_t *len);
 #endif
-
+#endif
 
 #if defined HARDWARE_BT6706 || HARDWARE_BT6708
 // ************************************************************************** //
@@ -585,6 +586,7 @@ void SetSntpServerIpStr(char *str);
   */
 void SetSntpTimeZoneStr(char *str);
 
+#ifndef HARDWARE_BT6708
 // ************************************************************************** //
 //                             Параметры реле/сухих контактов
 
@@ -608,6 +610,7 @@ void SetROStr(char *str, uint8_t num);
   */
 void SetROInt(uint8_t val, uint8_t num);
 
+#endif
 // ************************************************************************** //
 //                             Параметры настройки ИБП
 

modules/settings_api.c

@@ -193,12 +193,13 @@ void SETTINGS_SetSntpDef(void)
   strcpy(sSettings.sSNTP.data, "none");
 }
 
+#ifndef HARDWARE_BT6708
 /**
   * @brief  Установить параметры настроек сухих контактов / реле по умолчанию
   */
 void SETTINGS_SetINOUTSDef(void)
 {
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6706
 	sSettings.sInOuts.ro_type_source[0] = AC_PRESENT;
 	sSettings.sInOuts.ro_type_source[1] = DC_PRESENT;
 	sSettings.sInOuts.ro_type_source[2] = CHARGE_AKB;
@@ -209,6 +210,7 @@ void SETTINGS_SetINOUTSDef(void)
 
 	sSettings.sInOuts.din_type_act[0] = DI_CONN;
 }
+#endif
 
 #ifdef HARDWARE_BT6702
 /**
@@ -276,7 +278,9 @@ void SETTINGS_SetDefault(void)
   SETTINGS_SetSnmpDef();
   SETTINGS_SetServiceDef();
   SETTINGS_SetSntpDef();
+#ifndef HARDWARE_BT6708
   SETTINGS_SetINOUTSDef();
+#endif
   SETTINGS_SetUPSSettingsDef();
 #ifdef HARDWARE_BT6702
   SETTINGS_SetRADIUSDef();
@@ -303,7 +307,9 @@ void SETTINGS_SetPartDefault(void)
   SETTINGS_SetUPSSettingsDef();
  // SETTINGS_SetServiceDef();
   SETTINGS_SetSntpDef();
+#ifndef HARDWARE_BT6708
   SETTINGS_SetINOUTSDef();
+#endif
  // SETTINGS_SetRADIUSDef();
 #if defined HARDWARE_BT6708
   SETTINGS_SetWhiteListDef();
@@ -328,7 +334,9 @@ void SETTINGS_SetAllDefault(void)
   SETTINGS_SetServiceDef();
   SETTINGS_SetSntpDef();
   SETTINGS_SetUPSSettingsDef();
+#ifndef HARDWARE_BT6708
   SETTINGS_SetINOUTSDef();
+#endif
 #ifdef HARDWARE_BT6702
   SETTINGS_SetRADIUSDef();
   SETTINGS_SetSSLcrtDef();
@@ -358,7 +366,9 @@ void SETTINGS_SetDefaultDebug(void)
   SETTINGS_SetFlagsDef();
   //SETTINGS_SetServiceDef();
   SETTINGS_SetSntpDef();
+#ifndef HARDWARE_BT6708
   SETTINGS_SetINOUTSDef();
+#endif
   SETTINGS_SetUPSSettingsDef();
   //SETTINGS_SetInfoDef();
 #ifdef HARDWARE_BT6702

modules/settings_api.h

@@ -143,7 +143,7 @@ typedef struct
   */
 typedef enum
 {
-#if defined HARDWARE_BT6706 || HARDWARE_BT6708
+#if defined HARDWARE_BT6706
 	AC_PRESENT = 1,
 	DC_PRESENT,
 	CHARGE_AKB,
@@ -228,7 +228,9 @@ typedef struct
   SNMP_t        sSnmp;
   AUTH_t		sAuth[MAX_WEB_USERS];
   SNTP_t        sSNTP;
+#ifndef HARDWARE_BT6708
   INOUTS_t		sInOuts;
+#endif
   UPS_Setting_t UPS_Setting;
 #ifdef HARDWARE_BT6702
   RADIUS_t		sRADIUS;
@@ -290,7 +292,9 @@ void SETTINGS_SetSntpDef(void);
 /**
   * @brief  Установить параметры настроек сухих контактов / реле по умолчанию
   */
+#ifndef HARDWARE_BT6708
 void SETTINGS_SetINOUTSDef(void);
+#endif
 #ifdef HARDWARE_BT6702
 /**
   * @brief  Установить параметры RADIUS по умолчанию