rusefi
/
wideband
mirror of https://github.com/rusefi/wideband.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

0701 rev2 2 (#91) 

* Rev 2: VM_RESISTOR_VALUE

(cherry picked from commit 84ae91fc67cf6764afd5b00210edbc3cfe4444a5)

* Rev 2: default settings for LSU4.9

(cherry picked from commit 5a1fe84bc1ec8d7ee6e0a5f2906a1b18d2ff8a8e)

* Per-board VM_RESISTOR_VALUE

(cherry picked from commit 0bdd19e058db579bed13488066df1176ea9addb2)

* Rev2: ID correct pins

(cherry picked from commit 59e4b36ad9bc7c166c3dae7e25b6317caf562056)

* Rev2: LSU 4.2 and ADV ESR drive pins

(cherry picked from commit 2f2b4399431136951fe2fa6819f44ba28c3cda17)

* Rev2: aux pwm pins: no need to be 50MHz fast

(cherry picked from commit b0af5c07c391438ca561118174df498207255f3b)

Co-authored-by: Andrey Gusakov <dron0gus@gmail.com>
This commit is contained in:
rusefillc 2022-07-01 18:57:05 -04:00 committed by GitHub
parent 076406e4b0
commit 2fa9549d83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
firmware/boards/f0_module/wideband_board_config.h
View File

@ -11,4 +11,9 @@
// *******************************
#define NERNST_INPUT_GAIN (1 / 2.7f)
#define AFR_CHANNELS 1
#define AFR_CHANNELS 1
// *******************************
// Nernst voltage & ESR sense
// *******************************
#define VM_RESISTOR_VALUE (10)

5
firmware/boards/f1_dave/wideband_board_config.h
View File

@ -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)

12
firmware/boards/f1_rev2/board.h
View File

@ -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
/*

23
firmware/boards/f1_rev2/io/io_pins.h
View File

@ -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
#define ID_SEL2_PORT GPIOC
#define ID_SEL2_PIN 14

5
firmware/boards/f1_rev2/wideband_board_config.h
View File

@ -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)

1
firmware/wideband_config.h
View File

@ -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)