diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c60aa9..8ed012b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,3 +25,8 @@ All notable changes to this project will be documented in this file. ### Changed - Carrier detect not via Direwolf (only ax0), but via carrier-detect.sh script in main loop, so all channles (ax0, ax1 and ax2) have DCD + +## [0.0.3] - 2022-02-02 + +### Changed +- Carrier detect now written in C for speed diff --git a/aprs_utils/carrier_detect/carrier_detect_led b/aprs_utils/carrier_detect/carrier_detect_led new file mode 100755 index 0000000..25342d3 Binary files /dev/null and b/aprs_utils/carrier_detect/carrier_detect_led differ diff --git a/aprs_utils/carrier_detect/carrier_detect_led.c b/aprs_utils/carrier_detect/carrier_detect_led.c new file mode 100644 index 0000000..7f0e624 --- /dev/null +++ b/aprs_utils/carrier_detect/carrier_detect_led.c @@ -0,0 +1,22 @@ +#include +#include + +#define DCD_LED 17 + +int main() +{ + if (gpioInitialise() < 0) + { + // pigpio initialisation failed. + printf("pigpio failed"); + } + else + { + // pigpio initialised okay. + gpioSetMode(DCD_LED, PI_OUTPUT); // Set DCD_LED as output + gpioWrite(DCD_LED, 1); // Set DCD_LED high + gpioSleep(PI_TIME_RELATIVE, 1, 0); // sleep for one second + gpioWrite(DCD_LED, 0); // Set DCD_LED low + gpioTerminate(); + } +} diff --git a/aprs_utils/carrier_detect/howto-compile.txt b/aprs_utils/carrier_detect/howto-compile.txt new file mode 100644 index 0000000..4c56b08 --- /dev/null +++ b/aprs_utils/carrier_detect/howto-compile.txt @@ -0,0 +1 @@ +gcc -Wall -pthread -o prog dcd.c -lpigpio -lrt diff --git a/aprs_utils/carrier_detect_led b/aprs_utils/carrier_detect_led new file mode 100755 index 0000000..25342d3 Binary files /dev/null and b/aprs_utils/carrier_detect_led differ diff --git a/aprs_utils/process_traffic.sh b/aprs_utils/process_traffic.sh index 16c064e..7d6371f 100755 --- a/aprs_utils/process_traffic.sh +++ b/aprs_utils/process_traffic.sh @@ -55,7 +55,7 @@ LAST_EPOCH_DATE="$(date -d"$CURRENT_DATE_TIME" +%s)" while read LINE do # Light up carrier detect - /home/marcel/ham/aprs_utils/carrier_detect_led.sh & + sudo /home/marcel/ham/aprs_utils/carrier_detect_led & # Start filter for received messages to PE1RXF (all sufixes) # Messages addressed to PE1RXF are stored in file /home/marcel/ham/aprs_utils/aprs_received_messages.log diff --git a/installation_pe1rxf-aprs-server.txt b/installation_pe1rxf-aprs-server.txt index ebc6cb5..9e0bc54 100644 --- a/installation_pe1rxf-aprs-server.txt +++ b/installation_pe1rxf-aprs-server.txt @@ -262,7 +262,7 @@ sudo visudo marcel ALL = (root) NOPASSWD: /usr/sbin/kissattach marcel ALL = (root) NOPASSWD: /usr/sbin/kissparms marcel ALL = (root) NOPASSWD: /usr/bin/socat - marcel ALL = (root) NOPASSWD: /usr/bin/pigpiod + marcel ALL = (root) NOPASSWD: /home/marcel/ham/aprs_utuls/carrier_detect_led --- Install command line calculator diff --git a/start_aprs_server.sh b/start_aprs_server.sh index 30e23df..56b6f90 100755 --- a/start_aprs_server.sh +++ b/start_aprs_server.sh @@ -23,7 +23,7 @@ ################################################################################## # Start pigpiod for accessing gpio pins for carrier_detect - sudo pigpiod + #sudo pigpiod ########################### # initializing soundmodem # @@ -67,7 +67,7 @@ ########################### # initializing LoRa modem # ########################### -# /home/marcel/ham/RPi-LoRa-KISS-TNC/start_all.sh + /home/marcel/ham/RPi-LoRa-KISS-TNC/start_all.sh # Start filter for received messages to PE1RXF (all sufixes) # Messages addressed to PE1RXF are stored in file /home/marcel/ham/aprs_utils/aprs_received_messages.log