Merge remote-tracking branch 'sasha/master-prd'
This commit is contained in:
@@ -56,13 +56,11 @@ 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['params'] = params
|
||||
data_to_json['get'] = get_params
|
||||
var pac = JSON.stringify(data_to_json).to_utf8_buffer()
|
||||
return pac
|
||||
|
||||
|
||||
@@ -347,8 +347,8 @@ func on_data_capsrpb_received(unit0: capsrpb.CapsRpb):
|
||||
if not unit0.json_dic.has('ts'): return
|
||||
if unit0.json_dic['ts'] != 7: return
|
||||
if not unit0.json_dic.has('msfs'): return
|
||||
|
||||
var msfs = unit.json_dic['msfs']
|
||||
|
||||
var msfs = unit0.json_dic['msfs']
|
||||
for fs in msfs:
|
||||
if fs is Dictionary:
|
||||
if not fs.has('nmfs'):
|
||||
|
||||
Reference in New Issue
Block a user