mirror of
https://github.com/DJ2LS/FreeDATA
synced 2024-05-14 08:04:33 +00:00
fixed wrong callsign for ping
This commit is contained in:
parent
e73ea21792
commit
5ec22b6b65
|
@ -644,9 +644,13 @@ def arq_disconnect_received(data_in):
|
||||||
def transmit_ping(callsign):
|
def transmit_ping(callsign):
|
||||||
static.DXCALLSIGN = bytes(callsign, 'utf-8')
|
static.DXCALLSIGN = bytes(callsign, 'utf-8')
|
||||||
logging.info("PING ["+ str(static.MYCALLSIGN, 'utf-8') + "] >>> [" + str(static.DXCALLSIGN, 'utf-8') + "] [BER."+str(static.BER)+"]")
|
logging.info("PING ["+ str(static.MYCALLSIGN, 'utf-8') + "] >>> [" + str(static.DXCALLSIGN, 'utf-8') + "] [BER."+str(static.BER)+"]")
|
||||||
frame_type = bytes([210])
|
|
||||||
ping_payload = b'PING'
|
ping_frame = bytearray(14)
|
||||||
ping_frame = frame_type + ping_payload
|
ping_frame[:1] = bytes([210])
|
||||||
|
ping_frame[1:2] = static.DXCALLSIGN_CRC8
|
||||||
|
ping_frame[2:3] = static.MYCALLSIGN_CRC8
|
||||||
|
ping_frame[3:9] = static.MYCALLSIGN
|
||||||
|
|
||||||
|
|
||||||
# wait while sending....
|
# wait while sending....
|
||||||
while static.CHANNEL_STATE == 'SENDING_SIGNALLING':
|
while static.CHANNEL_STATE == 'SENDING_SIGNALLING':
|
||||||
|
@ -655,10 +659,17 @@ def transmit_ping(callsign):
|
||||||
|
|
||||||
def received_ping(data_in):
|
def received_ping(data_in):
|
||||||
|
|
||||||
|
static.DXCALLSIGN_CRC8 = bytes(data_in[2:3])
|
||||||
|
static.DXCALLSIGN = bytes(data_in[3:9])
|
||||||
|
|
||||||
logging.info("PING ["+ str(static.MYCALLSIGN, 'utf-8') + "] <<< ["+ str(static.DXCALLSIGN, 'utf-8') + "] [BER."+str(static.BER)+"]")
|
logging.info("PING ["+ str(static.MYCALLSIGN, 'utf-8') + "] <<< ["+ str(static.DXCALLSIGN, 'utf-8') + "] [BER."+str(static.BER)+"]")
|
||||||
frame_type = bytes([211])
|
|
||||||
ping_payload = b'PING_ACK'
|
ping_frame = bytearray(14)
|
||||||
ping_frame = frame_type + static.MYCALLSIGN + ping_payload
|
ping_frame[:1] = bytes([211])
|
||||||
|
ping_frame[1:2] = static.DXCALLSIGN_CRC8
|
||||||
|
ping_frame[2:3] = static.MYCALLSIGN_CRC8
|
||||||
|
ping_frame[3:9] = static.MYCALLSIGN
|
||||||
|
|
||||||
# wait while sending....
|
# wait while sending....
|
||||||
while static.CHANNEL_STATE == 'SENDING_SIGNALLING':
|
while static.CHANNEL_STATE == 'SENDING_SIGNALLING':
|
||||||
time.sleep(0.01)
|
time.sleep(0.01)
|
||||||
|
@ -666,9 +677,9 @@ def received_ping(data_in):
|
||||||
|
|
||||||
def received_ping_ack(data_in):
|
def received_ping_ack(data_in):
|
||||||
|
|
||||||
dxcallsign = data_in[1:6]
|
static.DXCALLSIGN_CRC8 = bytes(data_in[2:3])
|
||||||
static.DXCALLSIGN = bytes(dxcallsign)
|
static.DXCALLSIGN = bytes(data_in[3:9])
|
||||||
static.DXCALLSIGN_CRC8 = helpers.get_crc_8(static.DXCALLSIGN)
|
|
||||||
logging.info("PING [" + str(static.DXCALLSIGN, 'utf-8') + "] >|< [" + str(static.MYCALLSIGN, 'utf-8') + "] [BER."+str(static.BER)+"]")
|
logging.info("PING [" + str(static.DXCALLSIGN, 'utf-8') + "] >|< [" + str(static.MYCALLSIGN, 'utf-8') + "] [BER."+str(static.BER)+"]")
|
||||||
static.TNC_STATE = 'IDLE'
|
static.TNC_STATE = 'IDLE'
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue