Cleanup unused functions in boards configs (#701)

Move unused functions to separate file unused_funcs.h to make board setup files cleaner
This commit is contained in:
Igor Biletskyy
2021-08-03 10:55:10 -07:00
committed by GitHub
parent ad90646001
commit 04d2fbbe64
7 changed files with 34 additions and 151 deletions

View File

@@ -127,41 +127,11 @@ void black_set_can_mode(uint8_t mode){
}
}
void black_usb_power_mode_tick(uint32_t uptime){
UNUSED(uptime);
// Not applicable
}
bool black_check_ignition(void){
// ignition is checked through harness
return harness_check_ignition();
}
uint32_t black_read_current(void){
// No current sense on black panda
return 0U;
}
void black_set_ir_power(uint8_t percentage){
UNUSED(percentage);
}
void black_set_fan_power(uint8_t percentage){
UNUSED(percentage);
}
void black_set_phone_power(bool enabled){
UNUSED(enabled);
}
void black_set_clock_source_mode(uint8_t mode){
UNUSED(mode);
}
void black_set_siren(bool enabled){
UNUSED(enabled);
}
void black_init(void) {
common_init_gpio();
@@ -244,12 +214,12 @@ const board board_black = {
.set_usb_power_mode = black_set_usb_power_mode,
.set_gps_mode = black_set_gps_mode,
.set_can_mode = black_set_can_mode,
.usb_power_mode_tick = black_usb_power_mode_tick,
.usb_power_mode_tick = unused_usb_power_mode_tick,
.check_ignition = black_check_ignition,
.read_current = black_read_current,
.set_fan_power = black_set_fan_power,
.set_ir_power = black_set_ir_power,
.set_phone_power = black_set_phone_power,
.set_clock_source_mode = black_set_clock_source_mode,
.set_siren = black_set_siren
.read_current = unused_read_current,
.set_fan_power = unused_set_fan_power,
.set_ir_power = unused_set_ir_power,
.set_phone_power = unused_set_phone_power,
.set_clock_source_mode = unused_set_clock_source_mode,
.set_siren = unused_set_siren
};

View File

@@ -49,18 +49,10 @@ void dos_set_led(uint8_t color, bool enabled) {
}
}
void dos_set_gps_load_switch(bool enabled) {
UNUSED(enabled);
}
void dos_set_bootkick(bool enabled){
set_gpio_output(GPIOC, 4, !enabled);
}
void dos_set_phone_power(bool enabled){
UNUSED(enabled);
}
void dos_set_usb_power_mode(uint8_t mode) {
bool valid = false;
switch (mode) {
@@ -81,10 +73,6 @@ void dos_set_usb_power_mode(uint8_t mode) {
}
}
void dos_set_gps_mode(uint8_t mode) {
UNUSED(mode);
}
void dos_set_can_mode(uint8_t mode){
switch (mode) {
case CAN_MODE_NORMAL:
@@ -113,10 +101,6 @@ void dos_set_can_mode(uint8_t mode){
}
}
void dos_usb_power_mode_tick(uint32_t uptime){
UNUSED(uptime);
}
bool dos_check_ignition(void){
// ignition is checked through harness
return harness_check_ignition();
@@ -136,11 +120,6 @@ void dos_set_fan_power(uint8_t percentage){
fan_set_power(percentage);
}
uint32_t dos_read_current(void){
// No current sense on Dos
return 0U;
}
void dos_set_clock_source_mode(uint8_t mode){
clock_source_init(mode);
}
@@ -235,14 +214,14 @@ const board board_dos = {
.enable_can_transceivers = dos_enable_can_transceivers,
.set_led = dos_set_led,
.set_usb_power_mode = dos_set_usb_power_mode,
.set_gps_mode = dos_set_gps_mode,
.set_gps_mode = unused_set_gps_mode,
.set_can_mode = dos_set_can_mode,
.usb_power_mode_tick = dos_usb_power_mode_tick,
.usb_power_mode_tick = unused_usb_power_mode_tick,
.check_ignition = dos_check_ignition,
.read_current = dos_read_current,
.read_current = unused_read_current,
.set_fan_power = dos_set_fan_power,
.set_ir_power = dos_set_ir_power,
.set_phone_power = dos_set_phone_power,
.set_phone_power = unused_set_phone_power,
.set_clock_source_mode = dos_set_clock_source_mode,
.set_siren = dos_set_siren
};

View File

@@ -48,12 +48,12 @@ const board board_grey = {
.set_usb_power_mode = white_set_usb_power_mode,
.set_gps_mode = grey_set_gps_mode,
.set_can_mode = white_set_can_mode,
.usb_power_mode_tick = white_usb_power_mode_tick,
.usb_power_mode_tick = unused_usb_power_mode_tick,
.check_ignition = white_check_ignition,
.read_current = white_read_current,
.set_fan_power = white_set_fan_power,
.set_ir_power = white_set_ir_power,
.set_phone_power = white_set_phone_power,
.set_clock_source_mode = white_set_clock_source_mode,
.set_siren = white_set_siren
.set_fan_power = unused_set_fan_power,
.set_ir_power = unused_set_ir_power,
.set_phone_power = unused_set_phone_power,
.set_clock_source_mode = unused_set_clock_source_mode,
.set_siren = unused_set_siren
};

View File

@@ -50,41 +50,11 @@ void pedal_set_can_mode(uint8_t mode){
}
}
void pedal_usb_power_mode_tick(uint32_t uptime){
UNUSED(uptime);
// Not applicable
}
bool pedal_check_ignition(void){
// not supported on pedal
return false;
}
uint32_t pedal_read_current(void){
// No current sense on pedal
return 0U;
}
void pedal_set_ir_power(uint8_t percentage){
UNUSED(percentage);
}
void pedal_set_fan_power(uint8_t percentage){
UNUSED(percentage);
}
void pedal_set_phone_power(bool enabled){
UNUSED(enabled);
}
void pedal_set_clock_source_mode(uint8_t mode){
UNUSED(mode);
}
void pedal_set_siren(bool enabled){
UNUSED(enabled);
}
void pedal_init(void) {
common_init_gpio();
@@ -121,12 +91,12 @@ const board board_pedal = {
.set_usb_power_mode = pedal_set_usb_power_mode,
.set_gps_mode = pedal_set_gps_mode,
.set_can_mode = pedal_set_can_mode,
.usb_power_mode_tick = pedal_usb_power_mode_tick,
.usb_power_mode_tick = unused_usb_power_mode_tick,
.check_ignition = pedal_check_ignition,
.read_current = pedal_read_current,
.set_fan_power = pedal_set_fan_power,
.set_ir_power = pedal_set_ir_power,
.set_phone_power = pedal_set_phone_power,
.set_clock_source_mode = pedal_set_clock_source_mode,
.set_siren = pedal_set_siren
.read_current = unused_read_current,
.set_fan_power = unused_set_fan_power,
.set_ir_power = unused_set_ir_power,
.set_phone_power = unused_set_phone_power,
.set_clock_source_mode = unused_set_clock_source_mode,
.set_siren = unused_set_siren
};

View File

@@ -173,19 +173,6 @@ void uno_set_fan_power(uint8_t percentage){
fan_set_power(percentage);
}
uint32_t uno_read_current(void){
// No current sense on Uno
return 0U;
}
void uno_set_clock_source_mode(uint8_t mode){
UNUSED(mode);
}
void uno_set_siren(bool enabled){
UNUSED(enabled);
}
void uno_init(void) {
common_init_gpio();
@@ -292,10 +279,10 @@ const board board_uno = {
.set_can_mode = uno_set_can_mode,
.usb_power_mode_tick = uno_usb_power_mode_tick,
.check_ignition = uno_check_ignition,
.read_current = uno_read_current,
.read_current = unused_read_current,
.set_fan_power = uno_set_fan_power,
.set_ir_power = uno_set_ir_power,
.set_phone_power = uno_set_phone_power,
.set_clock_source_mode = uno_set_clock_source_mode,
.set_siren = uno_set_siren
.set_clock_source_mode = unused_set_clock_source_mode,
.set_siren = unused_set_siren
};

View File

@@ -151,35 +151,11 @@ uint32_t white_read_current(void){
return adc_get(ADCCHAN_CURRENT);
}
void white_usb_power_mode_tick(uint32_t uptime){
UNUSED(uptime);
}
void white_set_ir_power(uint8_t percentage){
UNUSED(percentage);
}
void white_set_fan_power(uint8_t percentage){
UNUSED(percentage);
}
bool white_check_ignition(void){
// ignition is on PA1
return !get_gpio_input(GPIOA, 1);
}
void white_set_phone_power(bool enabled){
UNUSED(enabled);
}
void white_set_clock_source_mode(uint8_t mode){
UNUSED(mode);
}
void white_set_siren(bool enabled){
UNUSED(enabled);
}
void white_grey_common_init(void) {
common_init_gpio();
@@ -277,12 +253,12 @@ const board board_white = {
.set_usb_power_mode = white_set_usb_power_mode,
.set_gps_mode = white_set_gps_mode,
.set_can_mode = white_set_can_mode,
.usb_power_mode_tick = white_usb_power_mode_tick,
.usb_power_mode_tick = unused_usb_power_mode_tick,
.check_ignition = white_check_ignition,
.read_current = white_read_current,
.set_fan_power = white_set_fan_power,
.set_ir_power = white_set_ir_power,
.set_phone_power = white_set_phone_power,
.set_clock_source_mode = white_set_clock_source_mode,
.set_siren = white_set_siren
.set_fan_power = unused_set_fan_power,
.set_ir_power = unused_set_ir_power,
.set_phone_power = unused_set_phone_power,
.set_clock_source_mode = unused_set_clock_source_mode,
.set_siren = unused_set_siren
};

View File

@@ -2,6 +2,7 @@
// Hardware abstraction layer for all different supported boards //
// ///////////////////////////////////////////////////////////// //
#include "boards/board_declarations.h"
#include "boards/unused_funcs.h"
// ///// Board definition and detection ///// //
#include "drivers/harness.h"