Add label to scan activity message (#544)

label on Activity output

Co-authored-by: kinglevel <edvardhans@gmail.com>

.devcontainer/Dockerfile

@@ -13,7 +13,8 @@ RUN DEBIAN_FRONTEND=noninteractive \
         gdb \
         clang-format-14 \
         python3-pip \
-        pre-commit
+        pre-commit \
+        vim
 
 WORKDIR /app
 COPY .github/install_dependencies /app/

Dockerfile

@@ -49,18 +49,12 @@ RUN git clone https://github.com/f4exb/libmirisdr-4 && \
 # set working dir for project build
 WORKDIR /rtl_airband_build
 
-# copy in the rtl_airband source
-# WARNING: not copying in the whole repo, this may need to be updated if build files are added outside of src/
-COPY ./.git/ .git/
-COPY ./src/ src/
-COPY ./scripts/ scripts/
-COPY ./CMakeLists.txt .
+# copy in the rtl_airband source, coping in the full repo so find_version will be correct
+COPY ./ .
 
 # configure and build
 # TODO: detect platforms
-RUN uname -m && \
-    echo | gcc -### -v -E - | tee compiler_native_info.txt && \
-    cmake -B build_dir -DPLATFORM=generic -DCMAKE_BUILD_TYPE=Release -DNFM=TRUE -DBUILD_UNITTESTS=TRUE && \
+RUN cmake -B build_dir -DPLATFORM=generic -DCMAKE_BUILD_TYPE=Release -DNFM=TRUE -DBUILD_UNITTESTS=TRUE && \
     VERBOSE=1 cmake --build build_dir -j4
 
 # make sure unit tests pass

init.d/rtl_airband.service

@@ -1,8 +1,8 @@
 [Unit]
 Description=SDR AM/NFM demodulator
 Documentation=https://github.com/rtl-airband/RTLSDR-Airband/wiki
-Wants=network.target
-After=network.target
+Wants=network.target  # NOTE: `network-online.target` may be better for some use cases
+After=network.target  # NOTE: `network-online.target` may be better for some use cases
 
 [Service]
 Type=simple

src/rtl_airband.cpp

@@ -124,7 +124,7 @@ void* controller_thread(void* params) {
         } else {
             if (consecutive_squelch_off == 10) {
                 if (log_scan_activity)
-                    log(LOG_INFO, "Activity on %7.3f MHz\n", dev->channels[0].freqlist[i].frequency / 1000000.0);
+                    log(LOG_INFO, "Activity on %7.3f MHz (%s)\n", dev->channels[0].freqlist[i].frequency / 1000000.0, dev->channels[0].freqlist[i].label);
                 if (i != dev->last_frequency) {
                     // squelch has just opened on a new frequency - we might need to update outputs' metadata
                     gettimeofday(&tv, NULL);