Merge remote-tracking branch 'MaD_CaT/master'
# Conflicts: # project.godot
This commit is contained in:
@@ -301,6 +301,11 @@ func interfer_create(u, interfer_name, ecms, param, kni, id, dict, source_interf
|
||||
|
||||
|
||||
func send_ecm(ecm, unit0) -> void:
|
||||
if ecm.krp != INTERFER_OFF:
|
||||
if not emit_enable:
|
||||
return
|
||||
elif not ecm.modulation:
|
||||
return
|
||||
msg6_num += 1
|
||||
var json_data = ecm.get_msg6_data(msg6_num)
|
||||
unit0.tx_stack.append(json_data)
|
||||
@@ -338,5 +343,3 @@ func push_id(id: int) -> void:
|
||||
|
||||
func on_emit_changed(state, ecms) -> void:
|
||||
emit_enable = state
|
||||
for ecm in ecms.values():
|
||||
ecm.modulation = state
|
||||
|
||||
Reference in New Issue
Block a user