Update api_logic.py

api_logic.py

@@ -4,7 +4,7 @@ import os
 
 api_variable = os.getenv('api_key')
 
-# Устанавливаем значения по умолчанию
+# Инициализация переменных
 globs.ph_set = 0
 globs.ph_on_set = 0
 globs.ec_set = 0
@@ -22,38 +22,61 @@ def api():
     err = 0
 
     if api_variable == request.args.get('api'):
-        globs.ph_set = float(request.args.get('ph_set', 0.0))
-        globs.ph_on_set = float(request.args.get('ph_on_set', 0.0))
-        globs.ec_set = float(request.args.get('ec_set', 0.0))
-        globs.ec_A_set = float(request.args.get('ec_A_set', 0.0))
-        globs.ec_B_set = float(request.args.get('ec_B_set', 0.0))
-        globs.ec_C_set = float(request.args.get('ec_C_set', 0.0))
-        globs.l_ON_h_set = int(request.args.get('l_ON_h_set', 0))
-        globs.l_ON_m_set = int(request.args.get('l_ON_m_set', 0))
-        globs.l_OFF_h_set = int(request.args.get('l_OFF_h_set', 0))
-        globs.l_OFF_m_set = int(request.args.get('l_OFF_m_set', 0))
-        globs.ec_t_Voz_set = int(request.args.get('ec_t_Voz_set', 0))
-        globs.eep_set = int(request.args.get('eep_set', 0))
+        globs.dey = request.args.get('dey')
+        globs.wek = request.args.get('wek')
+        globs.v_hid = request.args.get('v_hid')
+        globs.v_min = request.args.get('v_min') 
+        globs.ph = request.args.get('ph')
+        globs.ec = request.args.get('ec')
+        globs.tS = request.args.get('tS')
+        globs.tA = request.args.get('tA')
+        globs.hDm = request.args.get('hDm')
+        globs.sVen = request.args.get('sVen')
+        
+        globs.rFul = request.args.get('rFul')
+        globs.rLi = request.args.get('rLi') 
+        globs.rWat = request.args.get('rWat') 
+        globs.rRas = request.args.get('rRas') 
+        globs.rPH = request.args.get('rPH') 
+        globs.rEC = request.args.get('rEC') 
+        globs.rSl = request.args.get('rSl') 
+        globs.rLe = request.args.get('rLe') 
+        globs.alW = request.args.get('alW') 
 
+        globs.ph_eep = request.args.get('ph_eep') 
+        globs.ph_on_eep = request.args.get('ph_on_eep')
+        globs.ec_eep = request.args.get('ec_eep') 
+        globs.ec_A_eep = request.args.get('ec_A_eep') 
+        globs.ec_B_eep = request.args.get('ec_B_eep')
+        globs.ec_C_eep = request.args.get('ec_C_eep')
+
+        globs.l_ON_h_eep = request.args.get('l_ON_h_eep')      
+        globs.l_ON_m_eep = request.args.get('l_ON_m_eep') 
+        globs.l_OFF_h_eep = request.args.get('l_OFF_h_eep')        
+        globs.l_OFF_m_eep = request.args.get('l_OFF_m_eep') 
+        globs.t_Voz_eep = request.args.get('t_Voz_eep')        
+        
         err = 1
     else:
         err = 0
-
-    # Формируем ответ в нужном формате
+    
+    # Оборачиваем ответ в "set_deta"
     response = {
-        "OFF_h_set": int(globs.l_OFF_h_set),
-        "OFF_m_set": int(globs.l_OFF_m_set),
-        "ON_h_set": int(globs.l_ON_h_set),
-        "ON_m_set": int(globs.l_ON_m_set),
-        "ec_A_set": float(globs.ec_A_set),
-        "ec_B_set": float(globs.ec_B_set),
-        "ec_C_set": float(globs.ec_C_set),
-        "ec_set": float(globs.ec_set),
-        "ec_t_Voz_set": int(globs.ec_t_Voz_set),
-        "eep_set": int(globs.eep_set),
-        "err": int(err),
-        "ph_on_set": float(globs.ph_on_set),
-        "ph_set": float(globs.ph_set)
+        "set_deta": {
+            "1_ph_set": float(globs.ph_set),
+            "2_ph_on_set": float(globs.ph_on_set),
+            "3_ec_set": float(globs.ec_set),
+            "4_ec_A_set": float(globs.ec_A_set),
+            "5_ec_B_set": float(globs.ec_B_set),
+            "6_ec_C_set": float(globs.ec_C_set),
+            "7_l_ON_h_set": int(globs.l_ON_h_set),
+            "7_l_ON_m_set": int(globs.l_ON_m_set),
+            "8_l_OFF_h_set": int(globs.l_OFF_h_set),
+            "8_l_OFF_m_set": int(globs.l_OFF_m_set),
+            "9_ec_t_Voz_set": int(globs.ec_t_Voz_set),
+            "eep_set": int(globs.eep_set),
+            "err": int(err)
+        }
     }
 
-    return jsonify(response)
+    return jsonify(response)