Merge remote-tracking branch 'Pasha/master' into master-prd
This commit is contained in:
@@ -288,6 +288,6 @@ texture_pressed = ExtResource("13_ggrwd")
|
||||
[connection signal="drag_continue" from="." to="." method="_on_drag_continue"]
|
||||
[connection signal="toggled" from="btn_view" to="." method="on_button_view_toggled"]
|
||||
[connection signal="toggled" from="chk_auto" to="." method="on_value_changed"]
|
||||
[connection signal="toggled" from="btn_activate" to="." method="on_btn_activate_toggled"]
|
||||
[connection signal="toggled" from="btn_activate" to="." method="on_btn_activate"]
|
||||
[connection signal="toggled" from="btn_activate" to="." method="on_btn_activate_toggled"]
|
||||
[connection signal="toggled" from="btn_center" to="." method="on_btn_center_toggled"]
|
||||
|
||||
@@ -56,10 +56,12 @@ class Interfer:
|
||||
data_to_json['ss'] = msg_num
|
||||
data_to_json['ispp'] = ispp
|
||||
data_to_json['krp'] = krp
|
||||
if get_params.size() < 1:
|
||||
get_params.append('soc_temp')
|
||||
data_to_json['get'] = get_params
|
||||
if krp != INTERFER_OFF:
|
||||
data_to_json['kni'] = kni
|
||||
data_to_json['powp'] = powp # TODO: Необходимо добавить управление мощностью
|
||||
data_to_json['get'] = []
|
||||
data_to_json['params'] = params
|
||||
var pac = JSON.stringify(data_to_json).to_utf8_buffer()
|
||||
return pac
|
||||
|
||||
Reference in New Issue
Block a user