Merge pull request #136 from krasoffski/fix_zero_padding_for_pwr

Fix whitespace padding for PWR

.github/workflows/ci.yml

@@ -34,8 +34,8 @@ jobs:
 
     - name: Install dependencies and build
       run: |
-        sudo apt-get -y update
-        sudo apt-get -y install build-essential cmake libfftw3-dev libusb-1.0-0-dev librtlsdr-dev libcurl4-gnutls-dev cppcheck iwyu
+        sudo apt-get update
+        sudo apt-get -y --no-install-recommends install build-essential cmake libfftw3-dev libusb-1.0-0-dev librtlsdr-dev libcurl4-gnutls-dev cppcheck
         make
 
     - name: Perform CodeQL Analysis (SAST)

.gitignore

@@ -1,7 +1,7 @@
-*.1
 *.o
 *.a
 *.iq
+*.c2
 rtlsdr_wsprd
 fftw_wisdom.dat
 hashtable.txt

.gitpod.yml

@@ -1,24 +0,0 @@
-
-tasks:
-  - init: make
-
-github:
-  prebuilds:
-    # enable for the master/default branch (defaults to true)
-    master: true
-    # enable for all branches in this repo (defaults to false)
-    branches: true
-    # enable for pull requests coming from this repo (defaults to true)
-    pullRequests: true
-    # enable for pull requests coming from forks (defaults to false)
-    pullRequestsFromForks: true
-    # add a "Review in Gitpod" button as a comment to pull requests (defaults to true)
-    addComment: false
-    # add a "Review in Gitpod" button to pull requests (defaults to false)
-    addBadge: false
-    # add a label once the prebuild is ready to pull requests (defaults to false)
-    addLabel: prebuilt-in-gitpod
-
-vscode:
-  extensions:
-    - esbenp.prettier-vscode

Makefile

@@ -8,7 +8,7 @@ LIBS = -lusb-1.0 -lrtlsdr -lpthread -lfftw3f -lcurl -lm
 
 OBJS = rtlsdr_wsprd.o wsprd/wsprd.o wsprd/wsprsim_utils.o wsprd/wsprd_utils.o wsprd/tab.o wsprd/fano.o wsprd/nhash.o
 
-TARGETS = rtlsdr_wsprd #rtlsdr_wsprd.1
+TARGETS = rtlsdr_wsprd
 
 .PHONY: all clean
 
@@ -25,8 +25,3 @@ clean:
 
 install:
 	install rtlsdr_wsprd /usr/local/bin/rtlsdr_wsprd
-	#install rtlsdr_wsprd.1.gz /usr/local/man/man1/rtlsdr_wsprd.1.gz
-
-%.1: %.c | %
-	-help2man --no-info --output=$@ ./$|
-	#gzip rtlsdr_wsprd.1

README.md

@@ -16,7 +16,7 @@ To install and use your dongle on a Raspberry Pi with a Raspberry Pi OS, follow
 
 ```bash
 echo "== Install dependencies"
-sudo apt-get update && sudo apt-get -y install build-essential clang cmake libfftw3-dev libusb-1.0-0-dev libcurl4-gnutls-dev ntp git
+sudo apt-get update && sudo apt-get -y install build-essential clang cmake libfftw3-dev libusb-1.0-0-dev libcurl4-gnutls-dev help2man ntp git
 
 echo "== Install rtl-sdr library (on RPi, don't use your distro package)"
 git clone https://github.com/osmocom/rtl-sdr
@@ -64,7 +64,7 @@ This application written in C does:
 
   3. Install dependencies & useful tools (for example, [NTP](https://en.wikipedia.org/wiki/Network_Time_Protocol) for time synchronization). Example with a Debian based OS, like Rasbian, or Raspberry Pi OS:
      ```bash
-     sudo apt-get update && sudo apt-get -y install build-essential clang cmake libfftw3-dev libusb-1.0-0-dev libcurl4-gnutls-dev ntp git
+     sudo apt-get update && sudo apt-get -y install build-essential clang cmake libfftw3-dev libusb-1.0-0-dev libcurl4-gnutls-dev help2man ntp git
      ```
 
   4. Install `rtl-sdr` library manually. **Do not use the `librtlsdr-dev` package on Raspberry PiOS**. There is a know bug with this lib and rtlsdr_wsprd will not be able to get enough samples (don't decode anything & 100% CPU pattern).

rtlsdr_wsprd.c

@@ -448,13 +448,12 @@ void printSpots(uint32_t n_results) {
     }
 
     for (uint32_t i = 0; i < n_results; i++) {
-        printf("Spot :  %04d-%02d-%02d %02d:%02d:%02d %6.2f %6.2f %10.6f %2d %7s %6s %2s\n",
+        printf("Spot :  %04d-%02d-%02d %02d:%02dz %6.2f %6.2f %10.6f %2d %7s %6s %2s\n",
                rx_state.gtm->tm_year + 1900,
                rx_state.gtm->tm_mon + 1,
                rx_state.gtm->tm_mday,
                rx_state.gtm->tm_hour,
                rx_state.gtm->tm_min,
-               rx_state.gtm->tm_sec,
                dec_results[i].snr,
                dec_results[i].dt,
                dec_results[i].freq,
@@ -836,7 +835,7 @@ int main(int argc, char **argv) {
     initDecoder_options();
 
     if (argc <= 1)
-        usage(stderr, 1);
+        usage(stdout, EXIT_SUCCESS);
 
     while ((opt = getopt_long(argc, argv, short_options, long_options, &option_index)) != -1) {
         switch (opt) {
@@ -865,7 +864,7 @@ int main(int argc, char **argv) {
                     if (!rx_options.directsampling)
                         rx_options.directsampling = 2;
                 } else if (!strcasecmp(optarg, "80m")) {
-                    rx_options.dialfreq = 3592600;
+                    rx_options.dialfreq = 3568600;
                     if (!rx_options.directsampling)
                         rx_options.directsampling = 2;
                 } else if (!strcasecmp(optarg, "60m")) {
@@ -1139,7 +1138,7 @@ int main(int argc, char **argv) {
     uint32_t usec  = sec * 1000000 + lTime.tv_usec;
     uint32_t uwait = 120000000 - usec;
     printf("Wait for time sync (start in %d sec)\n\n", uwait / 1000000);
-    printf("              Date  Time(z)    SNR     DT       Freq Dr    Call    Loc Pwr\n");
+    printf("              Date   Time    SNR     DT       Freq Dr    Call    Loc Pwr\n");
 
     /* Prepare a low priority param for the decoder thread */
     struct sched_param param;

wsprd/wsprd_utils.c

@@ -263,7 +263,7 @@ int unpk_(signed char *message, char *hashtab, char *loctab, char *call_loc_pow,
         if (nu == 0 || nu == 3 || nu == 7) {
             ndbm = ntype;
             memset(call_loc_pow, 0, sizeof(char) * 23);
-            sprintf(cdbm, "%2d", ndbm);
+            sprintf(cdbm, "%02d", ndbm);
             strncat(call_loc_pow, callsign, strlen(callsign));
             strncat(call_loc_pow, " ", 1);
             strncat(call_loc_pow, grid, 4);