3838#import time
3939#import datetime
4040from socket import *
41- # import pprint
41+ import pprint
4242
4343from miscFunctions import *
4444from constants import __version__ , SOFTWARE_NAME
@@ -104,7 +104,7 @@ def getZachtek(wCallsign, uCallsign, bCallsign, timeslot, last_date, strComment
104104 logging .warning (" Exit function, insufficient WSPR records to process" )
105105 return 0 , None , None
106106
107- ## pprint.pp(jWsprData)
107+ #pprint.pp(jWsprData)
108108 aDateTime = []
109109 aMatch = []
110110 # build array of 'time' from WSPR data (2023-07-23 06:36:00)
@@ -143,9 +143,10 @@ def getZachtek(wCallsign, uCallsign, bCallsign, timeslot, last_date, strComment
143143
144144 # calc altitude from power
145145 # reference https://github.com/HarrydeBug/WSPR-transmitters/blob/master/Standard%20Firmware/Release/Hardware_Version_2_ESP8285/WSPR-TX2.05/WSPR-TX2.05.ino line 1430
146- alt1 = int (jWsprData [x ]['power' ]) * 300
146+ # alt1 = int(jWsprData[x]['power']) * 300
147147 #alt2 = int(jWsprData[i+1]['power']) * 300
148- altitude = alt1
148+ altitude = (int (jWsprData [x ]['power' ]) + int (jWsprData [y ]['power' ])) * 300
149+ logging .debug (f" alt1 = { jWsprData [x ]['power' ]} , alt2 = { jWsprData [y ]['power' ]} , altitude(m) = { altitude } " )
149150
150151 ##logging.info(" Altitude: meters = " + str(altitude) + ", feet = " + str(round(altitude*3.28084)))
151152 logging .info (f" DateTime: { jWsprData [y ]['time' ]} , Grid: { jWsprData [y ]['tx_loc' ]} , Lat: { lat } , Lon: { lon } , Alt: { altitude } m { round (altitude * 3.28084 )} ft, x-y { x } { y } " )
@@ -160,8 +161,11 @@ def getZachtek(wCallsign, uCallsign, bCallsign, timeslot, last_date, strComment
160161 jUploadData .append (JSON )
161162
162163 logging .debug (f" jUploadData Len = { len (jUploadData )} " )
163- # print("----------------------------------------")
164+ print ("----------------------------------------" )
164165 #pprint.pp(jUploadData[i], indent=2)
166+ l = len (aMatch )
167+ pprint .pp (jWsprData [aMatch [l - 2 ]], indent = 2 )
168+ pprint .pp (jWsprData [aMatch [l - 1 ]], indent = 2 )
165169
166170 return 1 , jUploadData , jWsprData [y ]['time' ]
167171
0 commit comments