Update api_logic.py
Browse files- api_logic.py +9 -14
api_logic.py
CHANGED
@@ -18,9 +18,6 @@ globs.l_OFF_m_set = 0
|
|
18 |
globs.t_Voz_set = 0
|
19 |
globs.eep_set = 0
|
20 |
|
21 |
-
|
22 |
-
|
23 |
-
|
24 |
globs.rFul = 0
|
25 |
globs.rLi = 0
|
26 |
globs.rWat = 0
|
@@ -31,10 +28,6 @@ globs.rSl = 0
|
|
31 |
globs.rLe = 0
|
32 |
globs.alW = 0
|
33 |
|
34 |
-
|
35 |
-
|
36 |
-
|
37 |
-
|
38 |
def api():
|
39 |
err = 0
|
40 |
|
@@ -73,13 +66,16 @@ def api():
|
|
73 |
globs.l_OFF_m_eep = request.args.get('l_OFF_m_eep')
|
74 |
globs.t_Voz_eep = request.args.get('t_Voz_eep')
|
75 |
|
76 |
-
globs.set_akt = request.args.get('set_akt')
|
77 |
-
|
78 |
-
err = 1
|
79 |
else:
|
80 |
err = 0
|
81 |
|
82 |
-
#
|
|
|
|
|
|
|
|
|
|
|
83 |
response = {
|
84 |
"ph_set": float(globs.ph_set),
|
85 |
"ph_on_set": float(globs.ph_on_set),
|
@@ -92,9 +88,8 @@ def api():
|
|
92 |
"OFF_h_set": int(globs.l_OFF_h_set),
|
93 |
"OFF_m_set": int(globs.l_OFF_m_set),
|
94 |
"t_Voz_set": int(globs.t_Voz_set),
|
95 |
-
"eep_set": int(
|
96 |
"err": int(err)
|
97 |
-
|
98 |
}
|
99 |
|
100 |
-
return jsonify(response)
|
|
|
18 |
globs.t_Voz_set = 0
|
19 |
globs.eep_set = 0
|
20 |
|
|
|
|
|
|
|
21 |
globs.rFul = 0
|
22 |
globs.rLi = 0
|
23 |
globs.rWat = 0
|
|
|
28 |
globs.rLe = 0
|
29 |
globs.alW = 0
|
30 |
|
|
|
|
|
|
|
|
|
31 |
def api():
|
32 |
err = 0
|
33 |
|
|
|
66 |
globs.l_OFF_m_eep = request.args.get('l_OFF_m_eep')
|
67 |
globs.t_Voz_eep = request.args.get('t_Voz_eep')
|
68 |
|
69 |
+
globs.set_akt = request.args.get('set_akt') err = 1
|
|
|
|
|
70 |
else:
|
71 |
err = 0
|
72 |
|
73 |
+
# Обработка eep_set по новому принципу
|
74 |
+
current_eep_set = globs.eep_set if globs.eep_set > 0 else 0
|
75 |
+
if globs.eep_set > 0:
|
76 |
+
globs.eep_set = 0 # Обнуляем после чтения
|
77 |
+
|
78 |
+
# Формируем ответ
|
79 |
response = {
|
80 |
"ph_set": float(globs.ph_set),
|
81 |
"ph_on_set": float(globs.ph_on_set),
|
|
|
88 |
"OFF_h_set": int(globs.l_OFF_h_set),
|
89 |
"OFF_m_set": int(globs.l_OFF_m_set),
|
90 |
"t_Voz_set": int(globs.t_Voz_set),
|
91 |
+
"eep_set": int(current_eep_set), # Используем временную переменную
|
92 |
"err": int(err)
|
|
|
93 |
}
|
94 |
|
95 |
+
return jsonify(response)
|