mirror of
https://github.com/portapack-mayhem/mayhem-firmware.git
synced 2025-10-17 17:35:18 +00:00
Added options for tuning CLKOUT freq.
- Now we have variable CLKOUT. - CLKOUT can be set between 10kHz and 60MHz. (The output signal will become mostly sine shape when reaching 50MHz.) - Click on freq setting field to change tuning step.
This commit is contained in:
@@ -145,6 +145,9 @@ SetRadioView::SetRadioView(
|
||||
|
||||
add_children({
|
||||
&check_clkout,
|
||||
&field_clkout_freq,
|
||||
&labels_clkout_khz,
|
||||
&value_freq_step,
|
||||
&labels_bias,
|
||||
&check_bias,
|
||||
&button_done,
|
||||
@@ -165,6 +168,31 @@ SetRadioView::SetRadioView(
|
||||
EventDispatcher::send_message(message);
|
||||
};
|
||||
|
||||
field_clkout_freq.set_value(portapack::persistent_memory::clkout_freq());
|
||||
value_freq_step.set_style(&style_text);
|
||||
|
||||
field_clkout_freq.on_select = [this](NumberField&) {
|
||||
freq_step_khz++;
|
||||
if(freq_step_khz > 3) {
|
||||
freq_step_khz = 0;
|
||||
}
|
||||
switch(freq_step_khz) {
|
||||
case 0:
|
||||
value_freq_step.set(" |");
|
||||
break;
|
||||
case 1:
|
||||
value_freq_step.set(" | ");
|
||||
break;
|
||||
case 2:
|
||||
value_freq_step.set(" | ");
|
||||
break;
|
||||
case 3:
|
||||
value_freq_step.set("| ");
|
||||
break;
|
||||
}
|
||||
field_clkout_freq.set_step(pow(10, freq_step_khz));
|
||||
};
|
||||
|
||||
check_bias.set_value(portapack::get_antenna_bias());
|
||||
check_bias.on_select = [this](Checkbox&, bool v) {
|
||||
portapack::set_antenna_bias(v);
|
||||
@@ -175,6 +203,8 @@ SetRadioView::SetRadioView(
|
||||
button_done.on_select = [this, &nav](Button&){
|
||||
const auto model = this->form_collect();
|
||||
portapack::persistent_memory::set_correction_ppb(model.ppm * 1000);
|
||||
portapack::persistent_memory::set_clkout_freq(model.freq);
|
||||
clock_manager.enable_clock_output(portapack::persistent_memory::clkout_enabled());
|
||||
nav.pop();
|
||||
};
|
||||
}
|
||||
@@ -190,6 +220,7 @@ void SetRadioView::form_init(const SetFrequencyCorrectionModel& model) {
|
||||
SetFrequencyCorrectionModel SetRadioView::form_collect() {
|
||||
return {
|
||||
.ppm = static_cast<int8_t>(field_ppm.value()),
|
||||
.freq = static_cast<uint32_t>(field_clkout_freq.value()),
|
||||
};
|
||||
}
|
||||
|
||||
|
@@ -114,6 +114,7 @@ private:
|
||||
|
||||
struct SetFrequencyCorrectionModel {
|
||||
int8_t ppm;
|
||||
uint32_t freq;
|
||||
};
|
||||
|
||||
class SetRadioView : public View {
|
||||
@@ -130,6 +131,7 @@ private:
|
||||
.background = Color::black(),
|
||||
.foreground = Color::light_grey(),
|
||||
};
|
||||
uint8_t freq_step_khz = 3;
|
||||
|
||||
Text label_source {
|
||||
{ 0, 1 * 16, 17 * 8, 16 },
|
||||
@@ -152,9 +154,26 @@ private:
|
||||
};
|
||||
|
||||
Checkbox check_clkout {
|
||||
{ 28, (6 * 16 - 4) },
|
||||
4,
|
||||
"Enable 10MHz CLKOUT"
|
||||
{ 18, (6 * 16 - 4) },
|
||||
13,
|
||||
"Enable CLKOUT"
|
||||
};
|
||||
|
||||
NumberField field_clkout_freq {
|
||||
{ 20 * 8, 6 * 16 },
|
||||
5,
|
||||
{ 10, 60000 },
|
||||
1000,
|
||||
' '
|
||||
};
|
||||
|
||||
Labels labels_clkout_khz {
|
||||
{ { 26 * 8, 6 * 16 }, "kHz", Color::light_grey() }
|
||||
};
|
||||
|
||||
Text value_freq_step {
|
||||
{ 21 * 8, (7 * 16 ), 4 * 8, 16 },
|
||||
"| "
|
||||
};
|
||||
|
||||
Labels labels_bias {
|
||||
|
@@ -21,6 +21,7 @@
|
||||
|
||||
#include "clock_manager.hpp"
|
||||
|
||||
#include "portapack_persistent_memory.hpp"
|
||||
#include "portapack_io.hpp"
|
||||
|
||||
#include "hackrf_hal.hpp"
|
||||
@@ -467,7 +468,11 @@ void ClockManager::stop_audio_pll() {
|
||||
void ClockManager::enable_clock_output(bool enable) {
|
||||
if(enable) {
|
||||
clock_generator.enable_output(clock_generator_output_clkout);
|
||||
clock_generator.set_ms_frequency(clock_generator_output_clkout, 10000000, si5351_vco_f, 0);
|
||||
if(portapack::persistent_memory::clkout_freq() < 1000) {
|
||||
clock_generator.set_ms_frequency(clock_generator_output_clkout, portapack::persistent_memory::clkout_freq() * 128000, si5351_vco_f, 7);
|
||||
} else {
|
||||
clock_generator.set_ms_frequency(clock_generator_output_clkout, portapack::persistent_memory::clkout_freq() * 1000, si5351_vco_f, 0);
|
||||
}
|
||||
} else {
|
||||
clock_generator.disable_output(clock_generator_output_clkout);
|
||||
}
|
||||
|
Reference in New Issue
Block a user