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

modules/Ethernet/snmp_api.c

@@ -193,6 +193,10 @@ void SNMP_SetObjDescr(void)
   strcat(sSettings.sSnmp.sysDescr, sSettings.sInfo.serialNumber);
   strcat(sSettings.sSnmp.sysDescr, " ");
   strcat(sSettings.sSnmp.sysDescr, UPS.model);
+#ifdef HARDWARE_BT6702
+  strcat(sSettings.sSnmp.sysDescr, " ");
+  strcat(sSettings.sSnmp.sysDescr, UPS.serial);
+#endif
   
   len = strlen(sSettings.sSnmp.sysDescr);
   snmp_mib2_set_sysdescr((u8_t*)sSettings.sSnmp.sysDescr, &len);

modules/HTTP_Server/web_params_api.c

@@ -334,6 +334,12 @@ void HTTP_GetInfo(char *buf)
   strcat(buf, "\",\"ups_model\":\"");
   strncat(buf, str, len);
 
+#ifdef HARDWARE_BT6702
+  GetUPSSerialStr(str, &len);
+  strcat(buf, "\",\"ups_sn\":\"");
+  strncat(buf, str, len);
+#endif
+
   GetUPSVersionStr(str, &len);
   strcat(buf, "\",\"ups_fwversion\":\"");
   strncat(buf, str, len);

modules/MegaTec/megatec.c

@@ -90,7 +90,10 @@ void send_MegaTec_cmd(cmdMegaTecEnums_t command)
 		uint8_t req[10];
 
 		memset(req, 0, 10);
-		sprintf(req, "%s%d\r", MegaTecCMD[command], TimeParam);
+		if(TimeParam < 10)
+			sprintf(req, "%s0%d\r", MegaTecCMD[command], TimeParam);
+		else
+			sprintf(req, "%s%d\r", MegaTecCMD[command], TimeParam);
 		ups_send_block(req, strlen(req));
 	}
 	else if(command == ups_shutdown){

modules/parameters.c

@@ -572,6 +572,15 @@ void GetUPSModelStr(char *str, uint8_t *len)
   strncpy(str, UPS.model, *len);
 }
 
+/**
+  * @brief  Серийный номер UPS
+  */
+void GetUPSSerialStr(char *str, uint8_t *len)
+{
+  *len = strlen(UPS.serial);
+  strncpy(str, UPS.serial, *len);
+}
+
 /**
   * @brief  Версия UPS ПО
   */

modules/parameters.h

@@ -179,6 +179,11 @@ void GetLocationStr(char *str, uint8_t *len);
   */
 void GetCommentsStr(char *str, uint8_t *len);
 
+/**
+  * @brief  Серийный номер UPS
+  */
+void GetUPSSerialStr(char *str, uint8_t *len);
+
 /**
   * @brief  Модель UPS
   */