UL/TX
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Lots of refactoring

Browse Source
This commit is contained in:
Brent Perteet
2025-06-11 10:55:00 -05:00
parent a437bcf8b5
commit aaa7f0dc29
35 changed files with 1165 additions and 809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
source/taps.c
View File

@@ -16,8 +16,10 @@
#include "amps.h"
#include "adc.h"
#include "utils.h"
#include "io.h"
#include "System/system.h"
extern ADC_t adc;
extern SYSTEM_DATA_t sys;
extern uint8_t Port_State[];
extern uint8_t Cur_Mode,Test_Mode;
extern uint32_t new_freq;
@@ -42,7 +44,35 @@ void Check_Taps(void)
}
}
void taps_setTapLF(uint8_t tap)
{
//EXPANDER_CLEAR(~TAPS_OFF_MASK, NO_UPDATE);
switch (tap)
{
case 2:
{
EXPANDER_SET(_TAP2_LF_ON, UPDATE);
break;
}
case 3:
{
EXPANDER_SET(_TAP3_LF_ON, UPDATE);
break;
}
case 4:
{
EXPANDER_SET(_TAP4_LF_ON, UPDATE);
break;
}
default:
{
EXPANDER_SET(_TAP1_LF_ON, UPDATE);
break;
}
}
}
void Set_taps_LF(void) // D' Type Amplifier
{
@@ -55,7 +85,7 @@ void Set_taps_LF(void) // D' Type Amplifier
if(!Taps_Flag)
{
Port_State[BOTTOM_SR] &= TAPS_OFF_MASK;
New_Ohms = (adc.Ohms_slowfilt);
New_Ohms = (sys.adc.Ohms_slowfilt);
switch (New_Ohms)
{
@@ -105,7 +135,7 @@ void Set_taps_LF(void) // D' Type Amplifier
SPI0_SendBytes(Port_State, 3, EXPANDER);
last_Ohms = adc.Ohms_slowfilt;
last_Ohms = sys.adc.Ohms_slowfilt;
Taps_Flag = true;
}
@@ -117,9 +147,6 @@ void Set_taps_LF(void) // D' Type Amplifier
SPI0_SendBytes(Port_State, 3, EXPANDER);
}
// Port_State[BOTTOM_SR] &= TAPS_OFF_MASK;
// Port_State[BOTTOM_SR] |= TAP2_LF_ON; // force TAP 2 for new transformer test (remove later)
// SPI0_SendBytes(Port_State, 3, EXPANDER);
}
@@ -128,9 +155,9 @@ void Set_taps_HF(void) // AB Amplifier
{
if(Hys_Taps)
{
last_Ohms = adc.Ohms_slowfilt;
last_Ohms = sys.adc.Ohms_slowfilt;
if(adc.Ohms_slowfilt < 200)
if(sys.adc.Ohms_slowfilt < 200)
Port_State[MID_SR] &= TAP102_HF_OFF; // 1:1
else
@@ -146,12 +173,12 @@ float32_t test;
test = last_Ohms + last_Ohms/10;
if(adc.Ohms_slowfilt > test )
if(sys.adc.Ohms_slowfilt > test )
return(true);
test = last_Ohms - last_Ohms/10;
if(adc.Ohms_slowfilt < test)
if(sys.adc.Ohms_slowfilt < test)
return(true);
else
return(false);