Little bit of cleanup

This commit is contained in:
Mitch Lustig 2020-12-15 22:53:48 -08:00
parent 7458fdae10
commit 5b36bc9538
3 changed files with 3 additions and 78 deletions

View File

@ -160,8 +160,8 @@
//#define HW_SOURCE "hw_es19.c" //#define HW_SOURCE "hw_es19.c"
//#define HW_HEADER "hw_es19.h" //#define HW_HEADER "hw_es19.h"
#define HW_SOURCE "hw_Little_FOCer.c" //#define HW_SOURCE "hw_Little_FOCer.c"
#define HW_HEADER "hw_Little_FOCer.h" //#define HW_HEADER "hw_Little_FOCer.h"
#endif #endif
#ifndef HW_SOURCE #ifndef HW_SOURCE

View File

@ -28,8 +28,6 @@
// Variables // Variables
static volatile bool i2c_running = false; static volatile bool i2c_running = false;
//static mutex_t shutdown_mutex;
//static float bt_diff = 0.0;
// I2C configuration // I2C configuration
static const I2CConfig i2cfg = { static const I2CConfig i2cfg = {
@ -38,13 +36,8 @@ static const I2CConfig i2cfg = {
STD_DUTY_CYCLE STD_DUTY_CYCLE
}; };
// Private functions
//static void terminal_shutdown_now(int argc, const char **argv);
//static void terminal_button_test(int argc, const char **argv);
void hw_init_gpio(void) { void hw_init_gpio(void) {
// chMtxObjectInit(&shutdown_mutex);
// GPIO clock enable // GPIO clock enable
RCC_AHB1PeriphClockCmd(RCC_AHB1Periph_GPIOA, ENABLE); RCC_AHB1PeriphClockCmd(RCC_AHB1Periph_GPIOA, ENABLE);
RCC_AHB1PeriphClockCmd(RCC_AHB1Periph_GPIOB, ENABLE); RCC_AHB1PeriphClockCmd(RCC_AHB1Periph_GPIOB, ENABLE);
@ -116,18 +109,6 @@ void hw_init_gpio(void) {
palSetPadMode(GPIOC, 4, PAL_MODE_INPUT_ANALOG); palSetPadMode(GPIOC, 4, PAL_MODE_INPUT_ANALOG);
drv8323s_init(); drv8323s_init();
// terminal_register_command_callback(
// "shutdown",
// "Shutdown VESC now.",
// 0,
// terminal_shutdown_now);
//
// terminal_register_command_callback(
// "test_button",
// "Try sampling the shutdown button",
// 0,
// terminal_button_test);
} }
void hw_setup_adc_channels(void) { void hw_setup_adc_channels(void) {
@ -257,43 +238,3 @@ void hw_try_restore_i2c(void) {
i2cReleaseBus(&HW_I2C_DEV); i2cReleaseBus(&HW_I2C_DEV);
} }
} }
//bool hw_sample_shutdown_button(void) {
// chMtxLock(&shutdown_mutex);
//
// bt_diff = 0.0;
//
// for (int i = 0;i < 3;i++) {
// palSetPadMode(GPIOC, 5, PAL_MODE_INPUT_ANALOG);
// chThdSleep(5);
//float val1 = ADC_VOLTS(ADC_IND_SHUTDOWN);
// chThdSleepMilliseconds(1);
// float val2 = ADC_VOLTS(ADC_IND_SHUTDOWN);
// palSetPadMode(HW_SHUTDOWN_GPIO, HW_SHUTDOWN_PIN, PAL_MODE_OUTPUT_PUSHPULL);
// chThdSleepMilliseconds(1);
// bt_diff += (val1 - val2);
// }
// chMtxUnlock(&shutdown_mutex);
// return (bt_diff > 0.12);
//}
//static void terminal_shutdown_now(int argc, const char **argv) {
//(void)argc;
/////(void)argv;
// DISABLE_GATE();
//HW_SHUTDOWN_HOLD_OFF();
//}
//static void terminal_button_test(int argc, const char **argv) {
// (void)argc;
//(void)argv;
//for (int i = 0;i < 40;i++) {
// commands_printf("BT: %d %.2f", HW_SAMPLE_SHUTDOWN(), (double)bt_diff);
//chThdSleepMilliseconds(100);
//}
//}

View File

@ -48,17 +48,6 @@
#define LED_RED_ON() palSetPad(GPIOB, 1) #define LED_RED_ON() palSetPad(GPIOB, 1)
#define LED_RED_OFF() palClearPad(GPIOB, 1) #define LED_RED_OFF() palClearPad(GPIOB, 1)
// Shutdown pin
//#define HW_SHUTDOWN_GPIO GPIOC
//#define HW_SHUTDOWN_PIN 5
//#define HW_SHUTDOWN_HOLD_ON() palSetPad(HW_SHUTDOWN_GPIO, HW_SHUTDOWN_PIN)
//#define HW_SHUTDOWN_HOLD_OFF() palClearPad(HW_SHUTDOWN_GPIO, HW_SHUTDOWN_PIN)
//#define HW_SAMPLE_SHUTDOWN() hw_sample_shutdown_button()
// Hold shutdown pin early to wake up on short pulses
//#define HW_EARLY_INIT() palSetPadMode(HW_SHUTDOWN_GPIO, HW_SHUTDOWN_PIN, PAL_MODE_OUTPUT_PUSHPULL);
//HW_SHUTDOWN_HOLD_ON();
/* /*
* ADC Vector * ADC Vector
* *
@ -259,8 +248,6 @@
#define READ_HALL2() palReadPad(HW_HALL_ENC_GPIO2, HW_HALL_ENC_PIN2) #define READ_HALL2() palReadPad(HW_HALL_ENC_GPIO2, HW_HALL_ENC_PIN2)
#define READ_HALL3() palReadPad(HW_HALL_ENC_GPIO3, HW_HALL_ENC_PIN3) #define READ_HALL3() palReadPad(HW_HALL_ENC_GPIO3, HW_HALL_ENC_PIN3)
//#define HW_DEAD_TIME_NSEC 1000.0
// Default setting overrides // Default setting overrides
#ifndef MCCONF_L_MIN_VOLTAGE #ifndef MCCONF_L_MIN_VOLTAGE
#define MCCONF_L_MIN_VOLTAGE 18.0 // Minimum input voltage #define MCCONF_L_MIN_VOLTAGE 18.0 // Minimum input voltage
@ -309,7 +296,4 @@
#define HW_LIM_DUTY_MAX 0.0, 0.99 #define HW_LIM_DUTY_MAX 0.0, 0.99
#define HW_LIM_TEMP_FET -40.0, 110.0 #define HW_LIM_TEMP_FET -40.0, 110.0
// Functions #endif /* HW_Little_FOCer_H_ */
//bool hw_sample_shutdown_button(void);
#endif /* HW_UAVC_QCUBE_H_ */