首頁 探索 說明
登入
rotek
/
bt-67xx_universal_hw
2
0
複刻 0
Files 問題管理 0 合併請求 0 Wiki
瀏覽代碼

Merge branch 'master' of https://192.168.14.200:3000/dtelenkov/bt-670x

Avetisyan Karen 7 年之前
父節點
e3832c41c3 0a53f1ac6d
當前提交
d93941b308
共有 9 個文件被更改，包括 42 次插入 和 24 次删除
分割檢視 顯示文件統計
  1. 3 3
      docs/SmartUPS.MIB
  2. 2 2
      modules/Ethernet/netconf.c
  3. 9 2
      modules/HTTP_Server/http_server.c
  4. 1 0
      modules/log/log.c
  5. 2 1
      modules/log/log.h
  6. 10 10
      modules/monitor/ups_monitor.c
  7. 7 1
      modules/parameters.c
  8. 1 1
      modules/settings_api.c
  9. 7 4
      user/init_task.c

+ 3 - 3
docs/SmartUPS.MIB
查看文件 

@@ -75,9 +75,9 @@ RoTeK-swt-BT-BT-6702-signals-MIB DEFINITIONS ::= BEGIN
 
     ACCESS  write

     STATUS  current

     DESCRIPTION

-    "Управление отключением нагрузки ИБП:

-	0 - Остановить процедуру отключения нагрузки

-	n - Отключить нагрузку на n минут

+    "Control of shut down UPS load:

+	0 - stop shut down load

+	n - shut down load in n minutes

 	n: 0.2, 0.3, .., 1, 2, .., 10"

     ::= { signals 8 }

+ 2 - 2
modules/Ethernet/netconf.c
查看文件 

@@ -218,7 +218,7 @@ void LwIP_DHCP_task(void * pvParameters)
 
           

 		  vTaskDelay(50);

 		  /* Установлен динамический IP, можно отправить трап о перезагрузке устройства */

-		  SNMP_SendUserTrap(DEVICE_REBOOTED);

+		//  SNMP_SendUserTrap(DEVICE_REBOOTED);

 		  

           vTaskDelete(xHandleDHCP);

         }

@@ -255,7 +255,7 @@ void LwIP_DHCP_task(void * pvParameters)
 
 

 			vTaskDelay(50);

 			/* Установлен статический IP, можно отправить трап о перезагрузке устройства */

-		    SNMP_SendUserTrap(DEVICE_REBOOTED);

+		   // SNMP_SendUserTrap(DEVICE_REBOOTED);

 			

 			vTaskDelete(xHandleDHCP);

           }

+ 9 - 2
modules/HTTP_Server/http_server.c
查看文件 

@@ -1761,6 +1761,10 @@ int HTTP_ConfirmWebPwd(char *bufIn, char *bufOut, uint16_t lenBufIn, uint16_t *l
 
             sprintf(tempStr, "%d", user_id);

             strcat(bufOut, "\r\nSet-Cookie: role=");

             strcat(bufOut, tempStr);

+            if(sSettings.sRADIUS.Auth_enable)

+				strcat(bufOut, "\r\nSet-Cookie: auth=1");

+			else

+				strcat(bufOut, "\r\nSet-Cookie: auth=0");

             strcat(bufOut, "\r\n\r\n");

             strcat(bufOut,"<!DOCTYPE html><html lang=""><head><meta http-equiv=\"refresh\" content=\"0;url=/index.html\"/></head></html>\r\n\r\n");

 

@@ -1825,7 +1829,10 @@ void HTTP_LOGIN(char *bufOut, uint16_t *lenBufOut)
 
 	strcat(bufOut, "\r\nSet-Cookie: id=");

 	strcat(bufOut, tempStr);

 	strcat(bufOut, "\r\nSet-Cookie: role=0");

-	strcat(bufOut, "\r\nSet-Cookie: auth=0");

+	if(sSettings.sRADIUS.Auth_enable)

+		strcat(bufOut, "\r\nSet-Cookie: auth=1");

+	else

+		strcat(bufOut, "\r\nSet-Cookie: auth=0");

 	strcat(bufOut, "\r\n\r\n");

 	strcat(bufOut,"<!DOCTYPE html><html lang=""><head><meta http-equiv=\"refresh\" content=\"0;url=/index.html\"/></head></html>\r\n\r\n");

 

@@ -2989,7 +2996,7 @@ void ssl_server(void *pvParameters)
 
             else if (strncmp(receiveBuf, "GET /changepwd.cgi", 18) == 0)

             {

                 HTTP_ChangeUserPwd(receiveBuf, sendBuf, receivedBufLen, &sendBufLoadLen);

-                ssl_sendframes(&ssl, file.data, file.len);

+                ssl_sendframes(&ssl, sendBuf, sendBufLoadLen);

             }

             // На производстве

             else if (strncmp(receiveBuf, "GET /setProdate.cgi", 19) == 0)

+ 1 - 0
modules/log/log.c
查看文件 

@@ -16,6 +16,7 @@ const char* logsStrShortRu[] =
 
 	"Перезагрузка контроллера",

     "Сброс настроек",

     "Обновление ПО",

+    "Включение",

     "Смена пароля",

     "Сохранение настроек",

     "Авторизация",

+ 2 - 1
modules/log/log.h
查看文件 

@@ -13,7 +13,8 @@ extern char logFileBuf[FILE_BUF_MAX_LEN];
 
 typedef __packed enum {

 	LOG_SYSTEM_BOOT = 0x00,			// device booted

 	LOG_SYSTEM_DEFCONFIG,	// default config applied

-	LOG_UPDATE_SOFT,		//

+	LOG_UPDATE_SOFT,

+	LOG_TURN_ON,		//

 	LOG_PSW_CHANGE,		//

 	LOG_SETTING_SAVE,		//

 	LOG_LOGIN,		//

+ 10 - 10
modules/monitor/ups_monitor.c
查看文件 

@@ -175,7 +175,7 @@ void UPS_CriticalAlarmMonitor(void)
 
   // Значение параметра изменилось

   if (CriticalAlarmCurrent != CriticalAlarmOldState)

   {

-	  if(OldRO0type_Sourse == CRITICAL){

+	  if(CurrRO1type_Sourse == CRITICAL){

 		  memset(str, 0, 30);

 		  if(CriticalAlarmCurrent){

 			  SetROInt(1, 0);

@@ -188,7 +188,7 @@ void UPS_CriticalAlarmMonitor(void)
 
 		  SNMP_SendUserTrap(DO0_TOGGLED);

 		  log_event_data(LOG_DO0_STATE, str);

 	  }

-	  if(OldRO2type_Sourse == CRITICAL){

+	  if(CurrRO2type_Sourse == CRITICAL){

 		  memset(str, 0, 30);

 		  if(CriticalAlarmCurrent){

 			  SetROInt(1, 1);

@@ -204,7 +204,7 @@ void UPS_CriticalAlarmMonitor(void)
 
   }

   else

   {

-	  if(OldRO0type_Sourse == CRITICAL && OldRO0type_Sourse != OldRO0type_Sourse){

+	  if(CurrRO1type_Sourse == CRITICAL && CurrRO1type_Sourse != OldRO0type_Sourse){

 		  memset(str, 0, 30);

 		  if(CriticalAlarmCurrent){

 			  SetROInt(1, 0);

@@ -217,7 +217,7 @@ void UPS_CriticalAlarmMonitor(void)
 
 		  SNMP_SendUserTrap(DO0_TOGGLED);

 		  log_event_data(LOG_DO0_STATE, str);

 	  }

-	  if(OldRO2type_Sourse == CRITICAL && OldRO2type_Sourse != OldRO2type_Sourse){

+	  if(CurrRO2type_Sourse == CRITICAL && CurrRO2type_Sourse != OldRO2type_Sourse){

 		  memset(str, 0, 30);

 		  if(CriticalAlarmCurrent){

 			  SetROInt(1, 1);

@@ -281,7 +281,7 @@ void UPS_NonCriticalAlarmMonitor(void)
 
   // Значение параметра изменилось

   if (NonCriticalAlarmCurrent != NonCriticalAlarmOldState)

   {

-	  if(OldRO0type_Sourse == NON_CRITICAL){

+	  if(CurrRO1type_Sourse == NON_CRITICAL){

 		  memset(str, 0, 30);

 		  if(NonCriticalAlarmCurrent){

 			  SetROInt(1, 0);

@@ -294,15 +294,15 @@ void UPS_NonCriticalAlarmMonitor(void)
 
 		  SNMP_SendUserTrap(DO0_TOGGLED);

 		  log_event_data(LOG_DO0_STATE, str);

 	  }

-	  if(OldRO2type_Sourse == NON_CRITICAL){

+	  if(CurrRO2type_Sourse == NON_CRITICAL){

 		  memset(str, 0, 30);

 		  if(NonCriticalAlarmCurrent){

 			  SetROInt(1, 1);

-			  strcat(str, "Разомкнуто");

+			  strcat(str, "Замкнуто");

 		  }

 		  else{

 			  SetROInt(0, 1);

-			  strcat(str, "Замкнуто");

+			  strcat(str, "Разомкнуто");

 		  }

 	  	  SNMP_SendUserTrap(DO1_TOGGLED);

 	  	log_event_data(LOG_DO1_STATE, str);

@@ -310,7 +310,7 @@ void UPS_NonCriticalAlarmMonitor(void)
 
   }

   else

   {

-	  if(OldRO0type_Sourse == NON_CRITICAL && OldRO0type_Sourse != OldRO0type_Sourse){

+	  if(CurrRO1type_Sourse == NON_CRITICAL && CurrRO1type_Sourse != OldRO0type_Sourse){

 		  memset(str, 0, 30);

 		  if(NonCriticalAlarmCurrent){

 			  SetROInt(1, 0);

@@ -323,7 +323,7 @@ void UPS_NonCriticalAlarmMonitor(void)
 
 		  SNMP_SendUserTrap(DO0_TOGGLED);

 		  log_event_data(LOG_DO0_STATE, str);

 	  }

-	  if(OldRO2type_Sourse == NON_CRITICAL && OldRO2type_Sourse != OldRO2type_Sourse){

+	  if(CurrRO2type_Sourse == NON_CRITICAL && CurrRO2type_Sourse != OldRO2type_Sourse){

 		  memset(str, 0, 30);

 		  if(NonCriticalAlarmCurrent){

 			  SetROInt(1, 1);

+ 7 - 1
modules/parameters.c
查看文件 

@@ -1073,8 +1073,14 @@ void SetDINTypeActStr(char *str, uint8_t num)
 
   */

 void SetROTypeActStr(char *str, uint8_t num)

 {

+	static uint8_t OldROtype_Sourse[2] = {0};

+

+	OldROtype_Sourse[num] = sSettings.sInOuts.ro_type_source[num];

+

 	sSettings.sInOuts.ro_type_source[num] = atoi(str);

-	SetROInt(0, num);

+

+	if(OldROtype_Sourse[num] != sSettings.sInOuts.ro_type_source[num])

+		SetROInt(0, num);

 }

 

 /**

+ 1 - 1
modules/settings_api.c
查看文件 

@@ -88,7 +88,7 @@ void SETTINGS_SetSnmpDef(void)
 
   strcpy(sSettings.sSnmp.readCommunity, "public");

   strcpy(sSettings.sSnmp.writeCommunity, "public");

   strcpy(sSettings.sSnmp.sysContact, "");

-  strcpy(sSettings.sSnmp.sysName, "BT6702");

+  strcpy(sSettings.sSnmp.sysName, "BT-6702");

   strcpy(sSettings.sSnmp.sysLocation, "");

   strcpy(sSettings.sSnmp.managerIP, "0.0.0.0");

   strcpy(sSettings.sSnmp.managerIP2, "0.0.0.0");

+ 7 - 4
user/init_task.c
查看文件 

@@ -122,8 +122,7 @@ void InitTask(void *params)
 
 #endif

 // -----------------------------------------------------------------------------      

   

-  /* UDP for net settings */

-  //UDP_netsetting_init();

+

 // -----------------------------------------------------------------------------

 #ifdef UPS_ENABLE

   xTaskCreate(UPS_Monitor, "UPS_Monitor", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL);

@@ -164,6 +163,9 @@ void InitTask(void *params)
 
 	 xTaskCreate(vTaskPeriodicSynchro, "sntpPeriodicSinhro", 2*configMINIMAL_STACK_SIZE,

 				 NULL, tskIDLE_PRIORITY, NULL);

 // -----------------------------------------------------------------------------  

+

+	 /* UDP for net settings */

+	  UDP_netsetting_init();

 // Тестирование

     

   // Тест таблицы трапов  

@@ -176,14 +178,15 @@ void InitTask(void *params)
 
 #endif  

 // -----------------------------------------------------------------------------      

 

-  if(strncmp(sSettings.sFlags.testState, "T2OK", 4)){

+ /* if(strncmp(sSettings.sFlags.testState, "T2OK", 4)){

 	  xTaskCreate(vTaskTesting, "Testing", configMINIMAL_STACK_SIZE,

               NULL, tskIDLE_PRIORITY, NULL);

-  }

+  }*/

 

   //TEST_InitRS485();

   //TEST_IO();

   

+  log_event_data(LOG_TURN_ON, " ");

   /* Контроль успешной загрузки. Сброс флага bootry */

   /* Сброс флага и сохранение нового значения во флеш памяти происходт после

      некоторой задержки для запуска всех задач */