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.

Sign up for GitHub

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

Jump to bottom

Fixed CTCSS tone detection #1226

Merged
merged 3 commits into from
Jul 1, 2023
Merged

Fixed CTCSS tone detection #1226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e190d49
Fixed erroneous rounding code
NotherNgineer Jun 30, 2023
853647e
Fixed CTCSS tone detection
NotherNgineer Jul 1, 2023
dccefad
Correct tone index for XZ/WZ and sort table by tone freq
NotherNgineer Jul 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 6 additions & 5 deletions firmware/application/tone_key.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,11 @@

namespace tonekey {

// Keep list in ascending order by tone frequency
const tone_key_t tone_keys = {
{"None", 0.0},
{"0 XZ", 67.000},
{"1 WZ", 69.400},
{"1 XZ", 67.000},
{"39 WZ", 69.300},
{"2 XA", 71.900},
{"3 WA", 74.400},
{"4 XB", 77.000},
Expand Down Expand Up @@ -77,11 +78,11 @@ const tone_key_t tone_keys = {
{"37 M6", 241.800},
{"38 M7", 250.300},
{"50 0Z", 254.100},
{"Shure 19kHz", 19000.0},
{"Axient 28kHz", 28000.0},
{"Senn. 32.768k", 32768.0},
{"Senn. 32.000k", 32000.0},
{"Sony 32.382k", 32382.0},
{"Shure 19kHz", 19000.0}};
{"Senn. 32.768k", 32768.0}};

void tone_keys_populate(OptionsField& field) {
using option_t = std::pair<std::string, int32_t>;
Expand Down Expand Up @@ -120,7 +121,7 @@ std::string tone_key_string_by_value(uint32_t value) {
tone_index tone_key_index_by_value(uint32_t value) {
float diff;
float min_diff{(float)value};
float fvalue{(float)((min_diff + 50.0) / 100.0)};
float fvalue{(float)(min_diff / 100.0)};
tone_index min_idx{-1};
tone_index idx;

Expand Down
2 changes: 1 addition & 1 deletion firmware/baseband/proc_nfm_audio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ void NarrowbandFMAudio::execute(const buffer_c8_t& buffer) {
cur_sample = audio_f[c];
if (cur_sample * prev_sample < 0.0) {
z_acc += z_timer;
z_timer = 0;
z_timer = 1;
z_count++;
} else
z_timer++;
Expand Down