From fc3d0d11a54169c326ba5e03934d2b4f2af2cc0b Mon Sep 17 00:00:00 2001 From: jake Date: Sun, 23 Feb 2025 10:03:21 -0800 Subject: [PATCH] removed now uneeded functions. --- mocks/MockADC/MockADC.c | 6 ------ mocks/MockADC/MockADC.h | 1 - src/ADC/ADC.c | 7 ------- src/ADC/ADC.h | 7 +------ tests/ADC/test_ADC.cpp | 22 ---------------------- 5 files changed, 1 insertion(+), 42 deletions(-) diff --git a/mocks/MockADC/MockADC.c b/mocks/MockADC/MockADC.c index b659746..7673ccd 100644 --- a/mocks/MockADC/MockADC.c +++ b/mocks/MockADC/MockADC.c @@ -16,12 +16,6 @@ int fake_index = 0; static bool is_setup = false; - -void ADC_SetPin(uint8_t adc_chan) -{ - return; -} - void ADC_Setup(void) { is_setup = true; diff --git a/mocks/MockADC/MockADC.h b/mocks/MockADC/MockADC.h index 587daac..c6c4480 100644 --- a/mocks/MockADC/MockADC.h +++ b/mocks/MockADC/MockADC.h @@ -15,7 +15,6 @@ void ADC_Setup(void); -void ADC_SetPin(uint8_t adc_chan); void ADC_Init(uint8_t adc_chan); void ADC_Enable(void); void ADC_Disable(void); diff --git a/src/ADC/ADC.c b/src/ADC/ADC.c index 529498c..7cfc8d3 100644 --- a/src/ADC/ADC.c +++ b/src/ADC/ADC.c @@ -85,13 +85,6 @@ void ADC_Disable() { RegEdit_ClearBit((void *)&ADCSRA, ADEN); } -void ADC_SetPin(uint8_t adc_chan) { - if (IsInvalidChannel(adc_chan)) { - return; - } - // RegEdit_ClearRegister((void *)&ADC0.MUXPOS); - // RegEdit_SetNum((void *)&ADC0.MUXPOS, adc_chan); -} uint16_t ADC_ReadValue_Impl(uint8_t adc_chan) { // RegEdit_SetNum((void *)&ADC0.COMMAND, ADC_STCONV_bm); diff --git a/src/ADC/ADC.h b/src/ADC/ADC.h index 33c6026..7eb0f4e 100644 --- a/src/ADC/ADC.h +++ b/src/ADC/ADC.h @@ -27,6 +27,7 @@ */ void ADC_Init(uint8_t adc_chan); + /** * @brief Returns the pin number for the adc channel or 255 on an error. * @param The ADC channel. @@ -64,11 +65,5 @@ extern uint16_t (*ADC_ReadValue)(uint8_t adc_chan); */ void ADC_Setup(void); -/** - * @brief Sets the pin used in the MUX for ADC0. - * - * @param adc_chan The number of the pin in Port A. - */ -void ADC_SetPin(uint8_t adc_chan); #endif // ADC_H diff --git a/tests/ADC/test_ADC.cpp b/tests/ADC/test_ADC.cpp index cdc7a97..6e6047c 100644 --- a/tests/ADC/test_ADC.cpp +++ b/tests/ADC/test_ADC.cpp @@ -141,28 +141,6 @@ TEST(test_ADC, ADC_DisablePasses) } -TEST(test_ADC, ADC_SetPinSetsRightRegisters) -{ - /* - //It clears existing MUXPOS register values. - mock().expectOneCall("RegEdit_ClearRegister") - .withPointerParameter("reg", (void *) &ADC0.MUXPOS); - - //It Correctly sets the pin number. - mock().expectOneCall("RegEdit_SetNum") - .withPointerParameter("reg", (void *) &ADC0.MUXPOS) - .withUnsignedIntParameter("num", 4); - */ - //ADC_SetPin(4); -} - - -TEST(test_ADC, ADC_SetPinFailsOnInvalidPin) -{ - //ADC_SetPin(8); -} - - static uint16_t ADC_ReadValueFake(uint8_t pin_num) { return 512;