diff --git a/firmware/boards/f0_module/wideband_board_config.h b/firmware/boards/f0_module/wideband_board_config.h index 15454b8..6a7e71c 100644 --- a/firmware/boards/f0_module/wideband_board_config.h +++ b/firmware/boards/f0_module/wideband_board_config.h @@ -11,4 +11,9 @@ // ******************************* #define NERNST_INPUT_GAIN (1 / 2.7f) -#define AFR_CHANNELS 1 \ No newline at end of file +#define AFR_CHANNELS 1 + +// ******************************* +// Nernst voltage & ESR sense +// ******************************* +#define VM_RESISTOR_VALUE (10) diff --git a/firmware/boards/f1_dave/wideband_board_config.h b/firmware/boards/f1_dave/wideband_board_config.h index 3cdba09..415f9bc 100644 --- a/firmware/boards/f1_dave/wideband_board_config.h +++ b/firmware/boards/f1_dave/wideband_board_config.h @@ -18,3 +18,8 @@ #define BATTERY_INPUT_DIVIDER (10.0 / (10.0 + 39.0)) #define AFR_CHANNELS 1 + +// ******************************* +// Nernst voltage & ESR sense +// ******************************* +#define VM_RESISTOR_VALUE (10) diff --git a/firmware/boards/f1_rev2/board.h b/firmware/boards/f1_rev2/board.h index d3bce29..fcedb1b 100644 --- a/firmware/boards/f1_rev2/board.h +++ b/firmware/boards/f1_rev2/board.h @@ -99,20 +99,20 @@ * Port B setup. * PB0 - Vbatt_sense (analog in). * PB1 - Heater_sense (analog in). - * PB2 - Nernsr_4.9_bias (digital input, no pull) - keep high-Z after power on + * PB2 - Nernsr_4.9_bias (digital output, 2 Mhz) * PB3 - SWO (digital input) * PB4..PB5 - DISP1..DISP2 - unused * PB6 - heater_pwm (output pushpull, alternate, 2 MHz). * PB7..PB9 - DISP4..DISP6 - unused * PB10 - Nernsr_ADV_esr_drive (digital input, no pull) - keep high-Z after power on - * PB11 - Nernsr_4.9_esr_drive (digital input, no pull) - keep high-Z after power on + * PB11 - Nernsr_4.9_esr_drive (output pushpull, 50 Mhz) * PB12 - Nernsr_4.2_esr_drive (digital input, no pull) - keep high-Z after power on * PB13 - Blue LED (output pushpull, 2 MHz) - * PB14 - PWMout2 (output pushpull, alternate, 50 Mhz). - * PB15 - PWMout1 (output pushpull, alternate, 50 Mhz). + * PB14 - PWMout2 (output pushpull, alternate, 2 Mhz). + * PB15 - PWMout1 (output pushpull, alternate, 2 Mhz). */ -#define VAL_GPIOBCRL 0x8A888400 /* PB7...PB0 */ -#define VAL_GPIOBCRH 0xBB244488 /* PB15...PB8 */ +#define VAL_GPIOBCRL 0x8A888200 /* PB7...PB0 */ +#define VAL_GPIOBCRH 0xAA243488 /* PB15...PB8 */ #define VAL_GPIOBODR 0x0000FFFF /* diff --git a/firmware/boards/f1_rev2/io/io_pins.h b/firmware/boards/f1_rev2/io/io_pins.h index f151062..ad6afee 100644 --- a/firmware/boards/f1_rev2/io/io_pins.h +++ b/firmware/boards/f1_rev2/io/io_pins.h @@ -6,11 +6,18 @@ #define LED_GREEN_PORT GPIOA #define LED_GREEN_PIN 8 -#define NERNST_ESR_DRIVER_PORT GPIOB -#define NERNST_ESR_DRIVER_PIN 12 +// LSU 4.2 - 6.8K +#define NERNST_42_ESR_DRIVER_PORT GPIOB +#define NERNST_42_ESR_DRIVER_PIN 12 + +// LSU 4.9 - 22K +#define NERNST_ESR_DRIVER_PORT GPIOB +#define NERNST_ESR_DRIVER_PIN 11 + +// LSU ADV - 47K +#define NERNST_ADV_ESR_DRIVER_PORT GPIOB +#define NERNST_ADV_ESR_DRIVER_PIN 10 -// PC13 on rev 0.1 -// exploring jumper wire from PB6 DISP3 to HEATER // PB6 TIM4_CH1 #define HEATER_PWM_DEVICE PWMD4 #define HEATER_PWM_CHANNEL 0 @@ -19,8 +26,8 @@ #define PUMP_DAC_PWM_DEVICE PWMD2 #define PUMP_DAC_PWM_CHANNEL 1 -#define ID_SEL1_PORT GPIOB -#define ID_SEL1_PIN 0 +#define ID_SEL1_PORT GPIOC +#define ID_SEL1_PIN 13 -#define ID_SEL2_PORT GPIOB -#define ID_SEL2_PIN 1 \ No newline at end of file +#define ID_SEL2_PORT GPIOC +#define ID_SEL2_PIN 14 diff --git a/firmware/boards/f1_rev2/wideband_board_config.h b/firmware/boards/f1_rev2/wideband_board_config.h index a6815f6..de916dd 100644 --- a/firmware/boards/f1_rev2/wideband_board_config.h +++ b/firmware/boards/f1_rev2/wideband_board_config.h @@ -30,3 +30,8 @@ #define VM_INPUT_DIVIDER (10.0 / (10.0 + 100.0)) #define AFR_CHANNELS 1 + +// ******************************* +// Nernst voltage & ESR sense +// ******************************* +#define VM_RESISTOR_VALUE (0) diff --git a/firmware/wideband_config.h b/firmware/wideband_config.h index c94d5b7..3040a81 100644 --- a/firmware/wideband_config.h +++ b/firmware/wideband_config.h @@ -9,7 +9,6 @@ // Nernst AC injection resistor value #define ESR_SUPPLY_R (22000) -#define VM_RESISTOR_VALUE (10) // Heater low pass filter #define ESR_SENSE_ALPHA (0.002f)