Skip to content

Commit 52e5d3c

Browse files
committed
Fix version number
2 parents 258b063 + 1d4ef9a commit 52e5d3c

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
# wsprdaemon (WD) Latest version is v2.10g
1+
# wsprdaemon (WD) Latest version is v2.10k
2+
2.10k Add WD's version number to spots uploaded to wsprnet.org
3+
4+
2.10j Upload WSJT-x 2.3.0 binaries
5+
6+
2.10i Fix installation of python-numpy on Ubuntu 20.04.1 LTE
7+
8+
2.10h Fix a bug which on fast CPUs caused loss of connection to Kiwis. There is no need to upgrade to 2.10h unless your installation is failing to connect to your Kiwis.
29

310
2.10g Fix uninitialized variable bug which was causing recording jobs to abort
411

wsprdaemon.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ shopt -s -o nounset ### bash stops with error if undeclared variable is
7979
#declare -r VERSION=2.10g ### Fix uninitialized veriable bug which was causing recording jobs to abort
8080
#declare -r VERSION=2.10h ### Client mode: fix race condition on check for kiwirecorder.py
8181
#declare -r VERSION=2.10i ### Client mode: On Ubuntu 20.04 LTS, Fix installation of python-numpy
82-
declare -r VERSION=2.10j ### Load WSJT-x V2.3.0 wsprd and jt9 commands and the libraries they need
82+
#declare -r VERSION=2.10j ### Load WSJT-x V2.3.0 wsprd and jt9 commands and the libraries they need
83+
declare -r VERSION=2.10k ### Add 'WD_...' rx site sw version number to spots uploaded to wsprnet.org
8384
### TODO: Support FST4W decodomg through the use of 'jt9'
8485
### TODO: Flush antique ~/signal_level log files
8586
### TODO: Fix inode overflows when SIGNAL_LEVEL_UPLOAD="no" (e.g. at LX1DQ)
@@ -3581,7 +3582,7 @@ function upload_to_wsprnet_daemon()
35813582
### Upload all the spots for one CALL_GRID in one curl transaction
35823583
[[ ${verbosity} -ge 1 ]] && printf "$(date): upload_to_wsprnet_daemon() uploading ${call}_${grid} spots file ${UPLOADS_TMP_WSPRNET_SPOTS_TXT_FILE} with $(cat ${UPLOADS_TMP_WSPRNET_SPOTS_TXT_FILE} | wc -l) spots in it.\n"
35833584
[[ ${verbosity} -ge 3 ]] && printf "$(date): upload_to_wsprnet_daemon() uploading spot file ${UPLOADS_TMP_WSPRNET_SPOTS_TXT_FILE}:\n$(cat ${UPLOADS_TMP_WSPRNET_SPOTS_TXT_FILE})\n"
3584-
curl -m ${UPLOADS_WSPNET_CURL_TIMEOUT-300} -F allmept=@${UPLOADS_TMP_WSPRNET_SPOTS_TXT_FILE} -F call=${call} -F grid=${grid} http://wsprnet.org/meptspots.php > ${UPLOADS_TMP_WSPRNET_CURL_LOGFILE_PATH} 2>&1
3585+
curl -m ${UPLOADS_WSPNET_CURL_TIMEOUT-300} -F version=WD_${VERSION} -F allmept=@${UPLOADS_TMP_WSPRNET_SPOTS_TXT_FILE} -F call=${call} -F grid=${grid} http://wsprnet.org/meptspots.php > ${UPLOADS_TMP_WSPRNET_CURL_LOGFILE_PATH} 2>&1
35853586
local ret_code=$?
35863587
if [[ $ret_code -ne 0 ]]; then
35873588
[[ ${verbosity} -ge 2 ]] && echo -e "$(date): upload_to_wsprnet_daemon() curl returned error code => ${ret_code} and logged:\n$( cat ${UPLOADS_TMP_WSPRNET_CURL_LOGFILE_PATH})\nSo leave spot files for next loop iteration"

0 commit comments

Comments
 (0)