DmitrMakeev commited on
Commit
bcf8ccd
·
verified ·
1 Parent(s): 79c2681

Update api_logic.py

Browse files
Files changed (1) hide show
  1. api_logic.py +20 -22
api_logic.py CHANGED
@@ -1,11 +1,10 @@
1
  from flask import request, jsonify
2
  import globs
3
  import os
4
- api_variable = os.getenv('api_key')
5
-
6
-
7
 
 
8
 
 
9
  globs.ph_set = 0
10
  globs.ph_on_set = 0
11
  globs.ec_set = 0
@@ -16,10 +15,9 @@ globs.l_ON_h_set = 0
16
  globs.l_ON_m_set = 0
17
  globs.l_OFF_h_set = 0
18
  globs.l_OFF_m_set = 0
19
- globs.ec_t_Voz_set = 0
20
  globs.eep_set = 0
21
 
22
-
23
  def api():
24
  err = 0
25
 
@@ -63,22 +61,22 @@ def api():
63
  err = 0
64
 
65
  # Оборачиваем ответ в "set_deta"
66
- response = {
67
- "set_deta": {
68
- "1_ph_set": float(globs.ph_set),
69
- "2_ph_on_set": float(globs.ph_on_set),
70
- "3_ec_set": float(globs.ec_set),
71
- "4_ec_A_set": float(globs.ec_A_set),
72
- "5_ec_B_set": float(globs.ec_B_set),
73
- "6_ec_C_set": float(globs.ec_C_set),
74
- "7_l_ON_h_set": int(globs.l_ON_h_set),
75
- "7_l_ON_m_set": int(globs.l_ON_m_set),
76
- "8_l_OFF_h_set": int(globs.l_OFF_h_set),
77
- "8_l_OFF_m_set": int(globs.l_OFF_m_set),
78
- "9_ec_t_Voz_set": int(globs.ec_t_Voz_set),
79
- "eep_set": int(globs.eep_set),
80
- "err": int(err)
 
81
  }
82
- }
83
 
84
- return jsonify(response)
 
1
  from flask import request, jsonify
2
  import globs
3
  import os
 
 
 
4
 
5
+ api_variable = os.getenv('api_key')
6
 
7
+ # Инициализация переменных
8
  globs.ph_set = 0
9
  globs.ph_on_set = 0
10
  globs.ec_set = 0
 
15
  globs.l_ON_m_set = 0
16
  globs.l_OFF_h_set = 0
17
  globs.l_OFF_m_set = 0
18
+ globs.ec_t_Voz_set = 0
19
  globs.eep_set = 0
20
 
 
21
  def api():
22
  err = 0
23
 
 
61
  err = 0
62
 
63
  # Оборачиваем ответ в "set_deta"
64
+ response = {
65
+ "set_deta": {
66
+ "1_ph_set": float(globs.ph_set),
67
+ "2_ph_on_set": float(globs.ph_on_set),
68
+ "3_ec_set": float(globs.ec_set),
69
+ "4_ec_A_set": float(globs.ec_A_set),
70
+ "5_ec_B_set": float(globs.ec_B_set),
71
+ "6_ec_C_set": float(globs.ec_C_set),
72
+ "7_l_ON_h_set": int(globs.l_ON_h_set),
73
+ "7_l_ON_m_set": int(globs.l_ON_m_set),
74
+ "8_l_OFF_h_set": int(globs.l_OFF_h_set),
75
+ "8_l_OFF_m_set": int(globs.l_OFF_m_set),
76
+ "9_ec_t_Voz_set": int(globs.ec_t_Voz_set),
77
+ "eep_set": int(globs.eep_set),
78
+ "err": int(err)
79
+ }
80
  }
 
81
 
82
+ return jsonify(response)