yetangitu/Battery-Emulator
1
0
Fork 0
mirror of https://github.com/dalathegreat/Battery-Emulator.git synced 2025-10-03 17:59:27 +02:00
Code Issues Projects Releases Packages Wiki Activity

Wrap digitalwrite and PWMwrite in own function

Browse source
This commit is contained in:
Daniel Öster 2024-11-15 20:07:19 +02:00
parent 59a58f45c9
commit 7f16ee6fb0
2 changed files with 56 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

105
Software/Software.ino
View file

@ -120,6 +120,16 @@ MyTimer check_pause_2s(INTERVAL_2_S);
enum State { DISCONNECTED, PRECHARGE, NEGATIVE, POSITIVE, PRECHARGE_OFF, COMPLETED, SHUTDOWN_REQUESTED }; enum State { DISCONNECTED, PRECHARGE, NEGATIVE, POSITIVE, PRECHARGE_OFF, COMPLETED, SHUTDOWN_REQUESTED };
State contactorStatus = DISCONNECTED; State contactorStatus = DISCONNECTED;
#define ON 1
#define OFF 0
#ifdef NC_CONTACTORS //Normally closed contactors use inverted logic
#undef ON
#define ON 0
#undef OFF
#define OFF 1
#endif
#define MAX_ALLOWED_FAULT_TICKS 1000 #define MAX_ALLOWED_FAULT_TICKS 1000
/* NOTE: modify the precharge time constant below to account for the resistance and capacitance of the target system. /* NOTE: modify the precharge time constant below to account for the resistance and capacitance of the target system.
* t=3RC at minimum, t=5RC ideally * t=3RC at minimum, t=5RC ideally
@ -127,20 +137,34 @@ State contactorStatus = DISCONNECTED;
#define PRECHARGE_TIME_MS 160 #define PRECHARGE_TIME_MS 160
#define NEGATIVE_CONTACTOR_TIME_MS 1000 #define NEGATIVE_CONTACTOR_TIME_MS 1000
#define POSITIVE_CONTACTOR_TIME_MS 2000 #define POSITIVE_CONTACTOR_TIME_MS 2000
#ifdef PWM_CONTACTOR_CONTROL
#define PWM_Freq 20000 // 20 kHz frequency, beyond audible range #define PWM_Freq 20000 // 20 kHz frequency, beyond audible range
#define PWM_Res 10 // 10 Bit resolution 0 to 1023, maps 'nicely' to 0% 100% #define PWM_Res 10 // 10 Bit resolution 0 to 1023, maps 'nicely' to 0% 100%
#define PWM_Hold_Duty 250 #define PWM_HOLD_DUTY 250
#define PWM_Off_Duty 0 #define PWM_OFF_DUTY 0
#define PWM_On_Duty 1023 #define PWM_ON_DUTY 1023
#define POSITIVE_PWM_Ch 0 #define POSITIVE_PWM_Ch 0
#define NEGATIVE_PWM_Ch 1 #define NEGATIVE_PWM_Ch 1
#endif
unsigned long prechargeStartTime = 0; unsigned long prechargeStartTime = 0;
unsigned long negativeStartTime = 0; unsigned long negativeStartTime = 0;
unsigned long timeSpentInFaultedMode = 0; unsigned long timeSpentInFaultedMode = 0;
#endif #endif
void set(uint8_t pin, bool direction, uint32_t pwm_freq = 0xFFFFFFFFFF){
#ifdef PWM_CONTACTOR_CONTROL
if(pwm_freq != 0xFFFFFFFFFF)
{
ledcWrite(pin, pwm_freq);
return;
}
#endif
if(direction == 1){
digitalWrite(pin, HIGH);
}
else{ // 0
digitalWrite(pin, LOW);
}
}
#ifdef EQUIPMENT_STOP_BUTTON #ifdef EQUIPMENT_STOP_BUTTON
const unsigned long equipment_button_long_press_duration = const unsigned long equipment_button_long_press_duration =
15000; // 15 seconds for long press in case of MOMENTARY_SWITCH 15000; // 15 seconds for long press in case of MOMENTARY_SWITCH
@ -497,27 +521,27 @@ void init_CAN() {
void init_contactors() { void init_contactors() {
// Init contactor pins // Init contactor pins
#ifdef CONTACTOR_CONTROL #ifdef CONTACTOR_CONTROL
#ifndef PWM_CONTACTOR_CONTROL #ifdef PWM_CONTACTOR_CONTROL
pinMode(POSITIVE_CONTACTOR_PIN, OUTPUT);
digitalWrite(POSITIVE_CONTACTOR_PIN, LOW);
pinMode(NEGATIVE_CONTACTOR_PIN, OUTPUT);
digitalWrite(NEGATIVE_CONTACTOR_PIN, LOW);
#else
ledcAttachChannel(POSITIVE_CONTACTOR_PIN, PWM_Freq, PWM_Res, ledcAttachChannel(POSITIVE_CONTACTOR_PIN, PWM_Freq, PWM_Res,
POSITIVE_PWM_Ch); // Setup PWM Channel Frequency and Resolution POSITIVE_PWM_Ch); // Setup PWM Channel Frequency and Resolution
ledcAttachChannel(NEGATIVE_CONTACTOR_PIN, PWM_Freq, PWM_Res, ledcAttachChannel(NEGATIVE_CONTACTOR_PIN, PWM_Freq, PWM_Res,
NEGATIVE_PWM_Ch); // Setup PWM Channel Frequency and Resolution NEGATIVE_PWM_Ch); // Setup PWM Channel Frequency and Resolution
ledcWrite(POSITIVE_CONTACTOR_PIN, PWM_Off_Duty); // Set Positive PWM to 0% ledcWrite(POSITIVE_CONTACTOR_PIN, PWM_OFF_DUTY); // Set Positive PWM to 0%
ledcWrite(NEGATIVE_CONTACTOR_PIN, PWM_Off_Duty); // Set Negative PWM to 0% ledcWrite(NEGATIVE_CONTACTOR_PIN, PWM_OFF_DUTY); // Set Negative PWM to 0%
#else //Normal CONTACTOR_CONTROL
pinMode(POSITIVE_CONTACTOR_PIN, OUTPUT);
set(POSITIVE_CONTACTOR_PIN, OFF);
pinMode(NEGATIVE_CONTACTOR_PIN, OUTPUT);
set(NEGATIVE_CONTACTOR_PIN, OFF);
#endif #endif
pinMode(PRECHARGE_PIN, OUTPUT); pinMode(PRECHARGE_PIN, OUTPUT);
digitalWrite(PRECHARGE_PIN, LOW); set(PRECHARGE_PIN, OFF);
#endif #endif //CONTACTOR_CONTROL
// Init BMS contactor // Init BMS contactor
#ifdef HW_STARK // TODO: Rewrite this so LilyGo can also handle this BMS contactor #ifdef HW_STARK // TODO: Rewrite this so LilyGo can also handle this BMS contactor
pinMode(BMS_POWER, OUTPUT); pinMode(BMS_POWER, OUTPUT);
digitalWrite(BMS_POWER, HIGH); set(BMS_POWER, ON);
#endif #endif //HW_STARK
} }
void init_rs485() { void init_rs485() {
@ -751,14 +775,9 @@ void handle_contactors() {
contactorStatus = DISCONNECTED; contactorStatus = DISCONNECTED;
} }
if (contactorStatus == SHUTDOWN_REQUESTED) { if (contactorStatus == SHUTDOWN_REQUESTED) {
digitalWrite(PRECHARGE_PIN, LOW); set(PRECHARGE_PIN, OFF);
#ifndef PWM_CONTACTOR_CONTROL set(NEGATIVE_CONTACTOR_PIN, OFF, PWM_OFF_DUTY);
digitalWrite(NEGATIVE_CONTACTOR_PIN, LOW); set(POSITIVE_CONTACTOR_PIN, OFF, PWM_OFF_DUTY);
digitalWrite(POSITIVE_CONTACTOR_PIN, LOW);
#else
ledcWrite(NEGATIVE_CONTACTOR_PIN, PWM_Off_Duty);
ledcWrite(POSITIVE_CONTACTOR_PIN, PWM_Off_Duty);
#endif
set_event(EVENT_ERROR_OPEN_CONTACTOR, 0); set_event(EVENT_ERROR_OPEN_CONTACTOR, 0);
datalayer.system.status.contactor_control_closed = false; datalayer.system.status.contactor_control_closed = false;
return; // A fault scenario latches the contactor control. It is not possible to recover without a powercycle (and investigation why fault occured) return; // A fault scenario latches the contactor control. It is not possible to recover without a powercycle (and investigation why fault occured)
@ -766,14 +785,9 @@ void handle_contactors() {
// After that, check if we are OK to start turning on the battery // After that, check if we are OK to start turning on the battery
if (contactorStatus == DISCONNECTED) { if (contactorStatus == DISCONNECTED) {
digitalWrite(PRECHARGE_PIN, LOW); set(PRECHARGE_PIN, OFF);
#ifndef PWM_CONTACTOR_CONTROL set(NEGATIVE_CONTACTOR_PIN, OFF, PWM_OFF_DUTY);
digitalWrite(NEGATIVE_CONTACTOR_PIN, LOW); set(POSITIVE_CONTACTOR_PIN, OFF, PWM_OFF_DUTY);
digitalWrite(POSITIVE_CONTACTOR_PIN, LOW);
#else
ledcWrite(NEGATIVE_CONTACTOR_PIN, PWM_Off_Duty);
ledcWrite(POSITIVE_CONTACTOR_PIN, PWM_Off_Duty);
#endif
if (datalayer.system.status.battery_allows_contactor_closing && if (datalayer.system.status.battery_allows_contactor_closing &&
datalayer.system.status.inverter_allows_contactor_closing) { datalayer.system.status.inverter_allows_contactor_closing) {
@ -783,8 +797,9 @@ void handle_contactors() {
// In case the inverter requests contactors to open, set the state accordingly // In case the inverter requests contactors to open, set the state accordingly
if (contactorStatus == COMPLETED) { if (contactorStatus == COMPLETED) {
if (!datalayer.system.status.inverter_allows_contactor_closing) if (!datalayer.system.status.inverter_allows_contactor_closing){
contactorStatus = DISCONNECTED; contactorStatus = DISCONNECTED;
}
// Skip running the state machine below if it has already completed // Skip running the state machine below if it has already completed
return; return;
} }
@ -793,18 +808,14 @@ void handle_contactors() {
// Handle actual state machine. This first turns on Precharge, then Negative, then Positive, and finally turns OFF precharge // Handle actual state machine. This first turns on Precharge, then Negative, then Positive, and finally turns OFF precharge
switch (contactorStatus) { switch (contactorStatus) {
case PRECHARGE: case PRECHARGE:
digitalWrite(PRECHARGE_PIN, HIGH); set(PRECHARGE_PIN, ON);
prechargeStartTime = currentTime; prechargeStartTime = currentTime;
contactorStatus = NEGATIVE; contactorStatus = NEGATIVE;
break; break;
case NEGATIVE: case NEGATIVE:
if (currentTime - prechargeStartTime >= PRECHARGE_TIME_MS) { if (currentTime - prechargeStartTime >= PRECHARGE_TIME_MS) {
#ifndef PWM_CONTACTOR_CONTROL set(NEGATIVE_CONTACTOR_PIN, ON, PWM_ON_DUTY);
digitalWrite(NEGATIVE_CONTACTOR_PIN, HIGH);
#else
ledcWrite(NEGATIVE_CONTACTOR_PIN, PWM_On_Duty);
#endif
negativeStartTime = currentTime; negativeStartTime = currentTime;
contactorStatus = POSITIVE; contactorStatus = POSITIVE;
} }
@ -812,22 +823,16 @@ void handle_contactors() {
case POSITIVE: case POSITIVE:
if (currentTime - negativeStartTime >= NEGATIVE_CONTACTOR_TIME_MS) { if (currentTime - negativeStartTime >= NEGATIVE_CONTACTOR_TIME_MS) {
#ifndef PWM_CONTACTOR_CONTROL set(POSITIVE_CONTACTOR_PIN, ON, PWM_ON_DUTY);
digitalWrite(POSITIVE_CONTACTOR_PIN, HIGH);
#else
ledcWrite(POSITIVE_CONTACTOR_PIN, PWM_On_Duty);
#endif
contactorStatus = PRECHARGE_OFF; contactorStatus = PRECHARGE_OFF;
} }
break; break;
case PRECHARGE_OFF: case PRECHARGE_OFF:
if (currentTime - negativeStartTime >= POSITIVE_CONTACTOR_TIME_MS) { if (currentTime - negativeStartTime >= POSITIVE_CONTACTOR_TIME_MS) {
digitalWrite(PRECHARGE_PIN, LOW); set(PRECHARGE_PIN, OFF);
#ifdef PWM_CONTACTOR_CONTROL set(NEGATIVE_CONTACTOR_PIN, PWM_HOLD_DUTY);
ledcWrite(NEGATIVE_CONTACTOR_PIN, PWM_Hold_Duty); set(POSITIVE_CONTACTOR_PIN, PWM_HOLD_DUTY);
ledcWrite(POSITIVE_CONTACTOR_PIN, PWM_Hold_Duty);
#endif
contactorStatus = COMPLETED; contactorStatus = COMPLETED;
datalayer.system.status.contactor_control_closed = true; datalayer.system.status.contactor_control_closed = true;
} }

1
Software/USER_SETTINGS.h
View file

@ -59,6 +59,7 @@
//#define INTERLOCK_REQUIRED //Nissan LEAF specific setting, if enabled requires both high voltage conenctors to be seated before starting //#define INTERLOCK_REQUIRED //Nissan LEAF specific setting, if enabled requires both high voltage conenctors to be seated before starting
//#define CONTACTOR_CONTROL //Enable this line to have pins 25,32,33 handle automatic precharge/contactor+/contactor- closing sequence //#define CONTACTOR_CONTROL //Enable this line to have pins 25,32,33 handle automatic precharge/contactor+/contactor- closing sequence
//#define PWM_CONTACTOR_CONTROL //Enable this line to use PWM for CONTACTOR_CONTROL, which lowers power consumption and heat generation. CONTACTOR_CONTROL must be enabled. //#define PWM_CONTACTOR_CONTROL //Enable this line to use PWM for CONTACTOR_CONTROL, which lowers power consumption and heat generation. CONTACTOR_CONTROL must be enabled.
//#define NC_CONTACTORS //Enable this line to control normally closed contactors. CONTACTOR_CONTROL must be enabled for this option. Extremely rare setting!
//#define DUAL_CAN //Enable this line to activate an isolated secondary CAN Bus using add-on MCP2515 chip (Needed for some inverters / double battery) //#define DUAL_CAN //Enable this line to activate an isolated secondary CAN Bus using add-on MCP2515 chip (Needed for some inverters / double battery)
#define CRYSTAL_FREQUENCY_MHZ 8 //DUAL_CAN option, what is your MCP2515 add-on boards crystal frequency? #define CRYSTAL_FREQUENCY_MHZ 8 //DUAL_CAN option, what is your MCP2515 add-on boards crystal frequency?
//#define CAN_FD //Enable this line to activate an isolated secondary CAN-FD bus using add-on MCP2518FD chip / Native CANFD on Stark board //#define CAN_FD //Enable this line to activate an isolated secondary CAN-FD bus using add-on MCP2518FD chip / Native CANFD on Stark board