Enable LO output on tinySA4

This reverts commit dd97453ceb.
pull/71/head
erikkaashoek 3 years ago
parent a81efdb1cc
commit bd420b1ad4

@ -18,7 +18,7 @@
*/ */
#include "ch.h" #include "ch.h"
//#ifdef TINYSA_F303 #ifdef TINYSA_F303
#ifdef TINYSA_F072 #ifdef TINYSA_F072
#error "Remove comment for #ifdef TINYSA_F303" #error "Remove comment for #ifdef TINYSA_F303"
#endif #endif
@ -26,7 +26,7 @@
#define TINYSA4 #define TINYSA4
#endif #endif
#define TINYSA4_PROTO #define TINYSA4_PROTO
//#endif #endif
#ifdef TINYSA_F072 #ifdef TINYSA_F072
#ifdef TINYSA_F303 #ifdef TINYSA_F303

@ -970,13 +970,13 @@ void set_tracking_output(int t)
dirty = true; dirty = true;
} }
#ifndef TINYSA4 //#ifndef TINYSA4
void toggle_tracking_output(void) void toggle_tracking_output(void)
{ {
setting.tracking_output = !setting.tracking_output; setting.tracking_output = !setting.tracking_output;
dirty = true; dirty = true;
} }
#endif //#endif
void toggle_pulse(void) void toggle_pulse(void)
{ {

@ -338,7 +338,7 @@ static const enum {
bool refDouble = false; bool refDouble = false;
static const bool refDiv2 = false; static const bool refDiv2 = false;
static const bool rfEnable = true; static const bool rfEnable = true;
static const bool auxEnable = false; static bool auxEnable = false;
static const bool feedbackFromDivided = true; static const bool feedbackFromDivided = true;
static const bool LDF = false; // for fractional mode static const bool LDF = false; // for fractional mode
@ -684,6 +684,8 @@ void ADF4351_aux_drive(int p)
auxPower = p; auxPower = p;
sendConfig(); sendConfig();
} }
#endif
void ADF4351_enable_aux_out(int s) void ADF4351_enable_aux_out(int s)
{ {
if ( auxEnable == s) if ( auxEnable == s)
@ -692,8 +694,6 @@ void ADF4351_enable_aux_out(int s)
sendConfig(); sendConfig();
} }
#endif
void ADF4351_enable(int s) void ADF4351_enable(int s)
{ {
@ -2703,10 +2703,10 @@ static int old_high = 2;
void enable_ADF_output(int f, int t) void enable_ADF_output(int f, int t)
{ {
(void) t; // (void) t;
ADF4351_enable(f); ADF4351_enable(f);
ADF4351_enable_out(f); ADF4351_enable_out(f);
// ADF4351_enable_aux_out(t); ADF4351_enable_aux_out(t);
} }
#ifdef __NEW_SWITCHES__ #ifdef __NEW_SWITCHES__

@ -3796,7 +3796,7 @@ static UI_FUNCTION_ADV_CALLBACK(menu_settings_ultra_acb){
} }
#endif #endif
#ifndef TINYSA4 //#ifdef TINYSA4
static UI_FUNCTION_ADV_CALLBACK(menu_lo_output_acb){ static UI_FUNCTION_ADV_CALLBACK(menu_lo_output_acb){
(void)item; (void)item;
(void)data; (void)data;
@ -3806,7 +3806,7 @@ static UI_FUNCTION_ADV_CALLBACK(menu_lo_output_acb){
} }
toggle_tracking_output(); toggle_tracking_output();
} }
#endif //#endif
static UI_FUNCTION_ADV_CALLBACK(menu_pause_acb) static UI_FUNCTION_ADV_CALLBACK(menu_pause_acb)
{ {
@ -4765,9 +4765,7 @@ static const menuitem_t menu_lock_display[] = {
static const menuitem_t menu_config2[] = static const menuitem_t menu_config2[] =
{ {
{ MT_ADV_CALLBACK, 0, "PULSE\nHIGH", menu_settings_pulse_acb}, { MT_ADV_CALLBACK, 0, "PULSE\nHIGH", menu_settings_pulse_acb},
#ifndef TINYSA4
{ MT_ADV_CALLBACK | MT_LOW, 0,"LO OUTPUT", menu_lo_output_acb}, { MT_ADV_CALLBACK | MT_LOW, 0,"LO OUTPUT", menu_lo_output_acb},
#endif
#ifdef __ULTRA__ #ifdef __ULTRA__
{ MT_ADV_CALLBACK, 0, "ENABLE\nULTRA", menu_ultra_acb}, { MT_ADV_CALLBACK, 0, "ENABLE\nULTRA", menu_ultra_acb},
#endif #endif

Loading…
Cancel
Save

Powered by TurnKey Linux.