|
@@ -22,6 +22,9 @@
|
|
#ifdef SSH_ENABLE
|
|
#ifdef SSH_ENABLE
|
|
#include "server.h"
|
|
#include "server.h"
|
|
#endif
|
|
#endif
|
|
|
|
+#ifdef DALLAS_SENSOR_ENABLE
|
|
|
|
+#include "temper.h"
|
|
|
|
+#endif
|
|
#endif
|
|
#endif
|
|
#include "sntp.h"
|
|
#include "sntp.h"
|
|
#include "lwip/snmp.h"
|
|
#include "lwip/snmp.h"
|
|
@@ -202,7 +205,26 @@ void GetAKBWorktimeInt(int32_t *value)
|
|
*/
|
|
*/
|
|
void GetInternalTempStr(char *str, uint8_t *len)
|
|
void GetInternalTempStr(char *str, uint8_t *len)
|
|
{
|
|
{
|
|
- sprintf(str, "%0.1f", UPS.Temp);
|
|
|
|
|
|
+#ifdef DALLAS_SENSOR_ENABLE
|
|
|
|
+ if(sSettings.sTempControl[0].type_sensor == TS_AKB) {
|
|
|
|
+ if (sTemperSensors[0].SensorState == 1){
|
|
|
|
+ sprintf(str, "%s", "Обрыв линии");
|
|
|
|
+ } else {
|
|
|
|
+ sprintf(str, "%0.1f", sTemperSensors[0].Temperature);
|
|
|
|
+ }
|
|
|
|
+ } else if (sSettings.sTempControl[1].type_sensor == TS_AKB) {
|
|
|
|
+ if (sTemperSensors[1].SensorState == 1){
|
|
|
|
+ sprintf(str, "%s", "Обрыв линии");
|
|
|
|
+ } else {
|
|
|
|
+ sprintf(str, "%0.1f", sTemperSensors[1].Temperature);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ else
|
|
|
|
+#endif
|
|
|
|
+ {
|
|
|
|
+ sprintf(str, "%0.1f", UPS.Temp);
|
|
|
|
+ }
|
|
|
|
+
|
|
*len = strlen(str);
|
|
*len = strlen(str);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -494,7 +516,38 @@ void GetSntpLastDataStr(char *str, uint8_t *len)
|
|
sprintf(str, "%s", sSettings.sSNTP.data);
|
|
sprintf(str, "%s", sSettings.sSNTP.data);
|
|
*len = strlen(str);
|
|
*len = strlen(str);
|
|
}
|
|
}
|
|
|
|
+#ifndef BT6702_SERVICE
|
|
|
|
+// ************************************************************************** //
|
|
|
|
+// Температура с внешних датчиков
|
|
|
|
+#ifdef DALLAS_SENSOR_ENABLE
|
|
|
|
+/**
|
|
|
|
+ * @brief
|
|
|
|
+ */
|
|
|
|
+void GetTempCaseStr(char *str, uint8_t *len)
|
|
|
|
+{
|
|
|
|
+
|
|
|
|
+ if(sSettings.sTempControl[0].type_sensor == TS_CABINET) {
|
|
|
|
+ if (sTemperSensors[0].SensorState == 1){
|
|
|
|
+ sprintf(str, "%s", "Обрыв линии");
|
|
|
|
+ } else {
|
|
|
|
+ sprintf(str, "%0.1f", sTemperSensors[0].Temperature);
|
|
|
|
+ }
|
|
|
|
+ } else if (sSettings.sTempControl[1].type_sensor == TS_CABINET) {
|
|
|
|
+ if (sTemperSensors[1].SensorState == 1){
|
|
|
|
+ sprintf(str, "%s", "Обрыв линии");
|
|
|
|
+ } else {
|
|
|
|
+ sprintf(str, "%0.1f", sTemperSensors[1].Temperature);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ sprintf(str, "%s", "Нет датчика");
|
|
|
|
+ }
|
|
|
|
|
|
|
|
+ *len = strlen(str);
|
|
|
|
+}
|
|
|
|
+#endif
|
|
|
|
+#endif
|
|
// ************************************************************************** //
|
|
// ************************************************************************** //
|
|
// Параметры реле/сухих контактов
|
|
// Параметры реле/сухих контактов
|
|
#ifdef DINS_ENABLE
|
|
#ifdef DINS_ENABLE
|