Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Beta development - modified receive scripts to pass PPM & Offset based on receiver type #1052

Merged
merged 19 commits into from
Aug 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
8e2a45e
Setting SDR Device ID
creas002 Aug 12, 2024
6b6b98a
Update setting_sdr_source_id.md
creas002 Aug 12, 2024
88bec1e
Update setting_sdr_source_id.md
creas002 Aug 12, 2024
acc9b24
Update setting_sdr_source_id.md - fixed mispelling
creas002 Aug 12, 2024
076d60b
Update setting_sdr_source_id.md - Fixed 2nd typo
creas002 Aug 12, 2024
ecafa81
Update setting_sdr_source_id.md - Fixed more typo's (SMH)
creas002 Aug 12, 2024
cc08e06
Update setting_sdr_source_id.md - Reformatting
creas002 Aug 12, 2024
073a3ef
Update setting_sdr_source_id.md
creas002 Aug 12, 2024
d8accf5
beta-development - Pass missing --ppm_correction parameter to satdump
creas002 Aug 12, 2024
1332596
Merge branch 'beta-development' of https://github.com/creas002/raspbe…
creas002 Aug 13, 2024
78ddba1
beta-development - bug fix - OS Lite versions Bookworm 64 & Bullseye 32
creas002 Aug 13, 2024
779abee
Clean up Bogus config/annotation directory created under $HOME
creas002 Aug 13, 2024
f01d9b6
Removed unneeded task
creas002 Aug 13, 2024
8894189
Reverting PPM changes to receive scripts
creas002 Aug 13, 2024
633b40a
Update noaa-v2.conf.j2
creas002 Aug 13, 2024
c9058c5
modified receive scripts to pass PPM & Offset based on receiver type
creas002 Aug 13, 2024
f25bc46
Ensure ownership/permissions are set correctly for key scripts
creas002 Aug 14, 2024
caa81f2
Merge branch 'beta-development' into beta-development
MihajloPi Aug 14, 2024
8886342
Ensure ownership/permissions are set correctly for key scripts
creas002 Aug 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions ansible/roles/common/tasks/configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -154,4 +154,36 @@
owner: "{{ target_user }}"
group: "{{ target_user }}"
mode: 0755

- name: receive_noaa.sh ownership permissions
file:
path: /home/{{ target_user }}/raspberry-noaa-v2/scripts/receive_noaa.sh
state: file
owner: "{{ target_user }}"
group: "{{ target_user }}"
mode: 0755

- name: receive_meteor.sh ownership permissions
file:
path: /home/{{ target_user }}/raspberry-noaa-v2/scripts/receive_meteor.sh
state: file
owner: "{{ target_user }}"
group: "{{ target_user }}"
mode: 0755

- name: schedule.sh ownership permissions
file:
path: /home/{{ target_user }}/raspberry-noaa-v2/scripts/schedule.sh
state: file
owner: "{{ target_user }}"
group: "{{ target_user }}"
mode: 0755

- name: common.sh ownership permissions
file:
path: /home/{{ target_user }}/raspberry-noaa-v2/scripts/common.sh
state: file
owner: "{{ target_user }}"
group: "{{ target_user }}"
mode: 0755
...
3 changes: 3 additions & 0 deletions ansible/roles/common/templates/noaa-v2.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@ NTP_SERVER={{ ntp_server }}
# Satellite Visualization
ENABLE_SATVIS={{ enable_satvis|lower }}

# Coronal mass ejection activity
ENABLE_CORONAL_GIF={{ enable_coronal|lower }}

# Web Server Configuration
WEB_SERVER_NAME={{ web_server_name }}
WEBPANEL_PORT={{ web_port }}
Expand Down
4 changes: 3 additions & 1 deletion scripts/receive_meteor.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ if [[ "$receiver" == "rtlsdr" ]]; then
ppm_correction="--ppm_correction"
else
gain_option="--general_gain"
fii
FREQ_OFFSET=""
fi

if [[ "$USE_DEVICE_STRING" == "true" ]]; then
sdr_id_option="--source_id"
Expand Down Expand Up @@ -170,6 +171,7 @@ polar_direction=0

log "Recording ${NOAA_HOME} via $receiver at ${METEOR_FREQUENCY} MHz using SatDump record " "INFO"
audio_temporary_storage_directory="$(dirname "${RAMFS_FILE_BASE}")"
log "$SATDUMP live meteor_m2-x_lrpt${mode} $audio_temporary_storage_directory --source $receiver --samplerate $samplerate $ppm_correction ${FREQ_OFFSET} --frequency ${METEOR_FREQUENCY}e6 $sdr_id_option $SDR_DEVICE_ID $gain_option $GAIN $bias_tee_option $finish_processing --fill_missing --timeout $CAPTURE_TIME" "INFO"
$SATDUMP live meteor_m2-x_lrpt${mode} "$audio_temporary_storage_directory" --source $receiver --samplerate $samplerate $ppm_correction ${FREQ_OFFSET} --frequency "${METEOR_FREQUENCY}e6" $sdr_id_option $SDR_DEVICE_ID $gain_option $GAIN $bias_tee_option $finish_processing --fill_missing --timeout $CAPTURE_TIME >> $NOAA_LOG 2>&1
mv "$audio_temporary_storage_directory/meteor_m2-x_lrpt${mode}.cadu" "${RAMFS_AUDIO_BASE}.cadu"

Expand Down
2 changes: 2 additions & 0 deletions scripts/receive_noaa.sh
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ if [[ "$receiver" == "rtlsdr" ]]; then
ppm_correction="--ppm_correction"
else
gain_option="--general_gain"
FREQ_OFFSET=""
fi

if [[ "$USE_DEVICE_STRING" == "true" ]]; then
Expand Down Expand Up @@ -168,6 +169,7 @@ daylight=$((SUN_ELEV > SUN_MIN_ELEV ? 1 : 0))
#start capture
log "Recording ${NOAA_HOME} via ${RECEIVER_TYPE} at ${freq} MHz via SatDump live pipeline" "INFO"
audio_temporary_storage_directory="$(dirname "${RAMFS_FILE_BASE}")"
log "$SATDUMP live noaa_apt $audio_temporary_storage_directory --source $receiver --samplerate $samplerate $ppm_correction ${FREQ_OFFSET} --frequency "${NOAA_FREQUENCY}e6" --satellite_number ${SAT_NUMBER} --sdrpp_noise_reduction $sdr_id_option $SDR_DEVICE_ID $gain_option $GAIN $bias_tee_option $crop_topbottom --start_timestamp $PASS_START --save_wav $finish_processing --timeout $CAPTURE_TIME" "INFO"
$SATDUMP live noaa_apt $audio_temporary_storage_directory --source $receiver --samplerate $samplerate $ppm_correction ${FREQ_OFFSET} --frequency "${NOAA_FREQUENCY}e6" --satellite_number ${SAT_NUMBER} --sdrpp_noise_reduction $sdr_id_option $SDR_DEVICE_ID $gain_option $GAIN $bias_tee_option $crop_topbottom --start_timestamp $PASS_START --save_wav $finish_processing --timeout $CAPTURE_TIME >> $NOAA_LOG 2>&1
rm "$audio_temporary_storage_directory/dataset.json" "$audio_temporary_storage_directory/product.cbor" >> $NOAA_LOG 2>&1
log "Files recorded" "INFO"
Expand Down