More refactoring
Lots of things removed but compiles again
This commit is contained in:
27
source/adc.c
27
source/adc.c
@@ -20,11 +20,12 @@
|
||||
//Application includes
|
||||
#include "timer.h"
|
||||
#include "adc.h"
|
||||
#include "frq.h"
|
||||
//#include "frq.h"
|
||||
#include "ports.h"
|
||||
#include "utils.h"
|
||||
#include "hwFixes.h"
|
||||
#include "System/system.h"
|
||||
#include "driver.h"
|
||||
|
||||
/*******************************************************************************
|
||||
* Definitions
|
||||
@@ -348,7 +349,8 @@ static float32_t ScaleLowGainCurrent(float32_t input)
|
||||
uint32_t numEntries = sizeof(currentTableLowGain) / sizeof(float32_t) / 2;
|
||||
|
||||
//Get target frequency
|
||||
float32_t targetFreq = FREQ_GetFreqByIndex(frequency).frequency1;
|
||||
//float32_t targetFreq = FREQ_GetFreqByIndex(frequency).frequency1;
|
||||
float32_t targetFreq = sys.driver->frequency->frequency;
|
||||
|
||||
#if 0 //TESTING - Use a specific frequency
|
||||
targetFreq = 384;
|
||||
@@ -404,7 +406,8 @@ static float32_t ScaleHighGainCurrent(float32_t input)
|
||||
uint32_t numEntries = sizeof(currentTableHighGain) / sizeof(float32_t) / 2;
|
||||
|
||||
//Get target frequency
|
||||
float32_t targetFreq = FREQ_GetFreqByIndex(frequency).frequency1;
|
||||
//float32_t targetFreq = FREQ_GetFreqByIndex(frequency).frequency1;
|
||||
float32_t targetFreq = sys.driver->frequency->frequency;
|
||||
|
||||
#if 0 //TESTING - Use a specific frequency
|
||||
targetFreq = 384;
|
||||
@@ -460,7 +463,8 @@ static float32_t ScaleLowGainVoltage(float32_t input)
|
||||
uint32_t numEntries = sizeof(voltageTableLowGain) / sizeof(float32_t) / 2;
|
||||
|
||||
//Get target frequency
|
||||
float32_t targetFreq = FREQ_GetFreqByIndex(frequency).frequency1;
|
||||
//float32_t targetFreq = FREQ_GetFreqByIndex(frequency).frequency1;
|
||||
float32_t targetFreq = sys.driver->frequency->frequency;
|
||||
|
||||
#if 0 //TESTING - Use a specific frequency
|
||||
targetFreq = 384;
|
||||
@@ -517,7 +521,8 @@ static float32_t ScaleLowGainCurrent208023(float32_t input)
|
||||
uint32_t numEntries = sizeof(currentTableLowGain208023) / sizeof(float32_t) / 2;
|
||||
|
||||
//Get target frequency
|
||||
float32_t targetFreq = FREQ_GetFreqByIndex(frequency).frequency1;
|
||||
//float32_t targetFreq = FREQ_GetFreqByIndex(frequency).frequency1;
|
||||
float32_t targetFreq = sys.driver->frequency->frequency;
|
||||
|
||||
#if 0 //TESTING - Use a specific frequency
|
||||
targetFreq = 384;
|
||||
@@ -573,7 +578,8 @@ static float32_t ScaleHighGainCurrent208023(float32_t input)
|
||||
uint32_t numEntries = sizeof(currentTableHighGain208023) / sizeof(float32_t) / 2;
|
||||
|
||||
//Get target frequency
|
||||
float32_t targetFreq = FREQ_GetFreqByIndex(frequency).frequency1;
|
||||
//float32_t targetFreq = FREQ_GetFreqByIndex(frequency).frequency1;
|
||||
float32_t targetFreq = sys.driver->frequency->frequency;
|
||||
|
||||
#if 0 //TESTING - Use a specific frequency
|
||||
targetFreq = 384;
|
||||
@@ -629,7 +635,8 @@ static float32_t ScaleLowGainVoltage208023(float32_t input)
|
||||
uint32_t numEntries = sizeof(voltageTableLowGain208023) / sizeof(float32_t) / 2;
|
||||
|
||||
//Get target frequency
|
||||
float32_t targetFreq = FREQ_GetFreqByIndex(frequency).frequency1;
|
||||
//float32_t targetFreq = FREQ_GetFreqByIndex(frequency).frequency1;
|
||||
float32_t targetFreq = sys.driver->frequency->frequency;
|
||||
|
||||
#if 0 //TESTING - Use a specific frequency
|
||||
targetFreq = 384;
|
||||
@@ -687,7 +694,8 @@ static float32_t ScaleLowGainCurrent208025(float32_t input)
|
||||
uint32_t numEntries = sizeof(currentTableLowGain208025) / sizeof(float32_t) / 3;
|
||||
|
||||
//Get target frequency
|
||||
float32_t targetFreq = FREQ_GetFreqByIndex(frequency).frequency1;
|
||||
//float32_t targetFreq = FREQ_GetFreqByIndex(frequency).frequency1;
|
||||
float32_t targetFreq = sys.driver->frequency->frequency;
|
||||
|
||||
#if 0 //TESTING - Use a specific frequency
|
||||
targetFreq = 384;
|
||||
@@ -754,7 +762,8 @@ static float32_t ScaleHighGainCurrent208025(float32_t input)
|
||||
uint32_t numEntries = sizeof(currentTableHighGain208025) / sizeof(float32_t) / 3;
|
||||
|
||||
//Get target frequency
|
||||
float32_t targetFreq = FREQ_GetFreqByIndex(frequency).frequency1;
|
||||
//float32_t targetFreq = FREQ_GetFreqByIndex(frequency).frequency1;
|
||||
float32_t targetFreq = sys.driver->frequency->frequency;
|
||||
|
||||
#if 1 //TESTING - Use a specific frequency
|
||||
targetFreq = 5666;
|
||||
|
||||
Reference in New Issue
Block a user