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

auto-sync

This commit is contained in:
rusEfi 2016-04-19 20:03:53 -04:00
parent 71c3f8de6a
commit 26c14a4b4c
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
firmware/config/engines/mazda_miata_1_6.cpp
View File

@ -24,19 +24,20 @@ void setMiataNA_1_6_Configuration(DECLARE_ENGINE_PARAMETER_F) {
commonFrankensoAnalogInputs(engineConfiguration); commonFrankensoAnalogInputs(engineConfiguration);
engineConfiguration->vbattDividerCoeff = 9.75;// ((float) (8.2 + 33)) / 8.2 * 2; engineConfiguration->vbattDividerCoeff = 9.75;// ((float) (8.2 + 33)) / 8.2 * 2;
boardConfiguration->idle.solenoidPin = GPIO_UNASSIGNED;
// warning light // warning light
/** /**
* to test * to test
* set_fsio_setting 0 6200 * set_fsio_setting 0 6200
* set_fsio_setting 1 14 * set_fsio_setting 1 95
* set_fsio_setting 2 95 * set_fsio_setting 3 14
* *
* eval "rpm 0 fsio_setting > coolant 1 fsio_setting > | vbatt 2 fsio_setting > |" * eval "rpm 0 fsio_setting > coolant 1 fsio_setting > | vbatt 2 fsio_setting > |"
*/ */
engineConfiguration->bc.fsio_setting[0] = 2000; // RPM threshold engineConfiguration->bc.fsio_setting[0] = 2000; // RPM threshold
engineConfiguration->bc.fsio_setting[1] = 13; // voltage threshold engineConfiguration->bc.fsio_setting[1] = 40; // CLT threshold
engineConfiguration->bc.fsio_setting[2] = 40; // CLT threshold engineConfiguration->bc.fsio_setting[2] = 13; // voltage threshold
setFsio(0, GPIOC_13, "rpm 0 fsio_setting > coolant 1 fsio_setting > | vbatt 2 fsio_setting > |" PASS_ENGINE_PARAMETER); setFsio(0, GPIOC_13, "rpm 0 fsio_setting > coolant 1 fsio_setting > | vbatt 2 fsio_setting > |" PASS_ENGINE_PARAMETER);

11
firmware/controllers/core/fsio_core.cpp
View File

@ -59,12 +59,17 @@ LENameOrdinalPair::LENameOrdinalPair(le_action_e action, const char *name) {
} }
LEElement::LEElement() { LEElement::LEElement() {
clear();
}
void LEElement::clear() {
action = LE_UNDEFINED; action = LE_UNDEFINED;
next = NULL; next = NULL;
fValue = NAN; fValue = NAN;
iValue = 0; iValue = 0;
} }
//void LEElement::init(le_action_e action, int iValue) { //void LEElement::init(le_action_e action, int iValue) {
// this->action = action; // this->action = action;
// this->iValue = iValue; // this->iValue = iValue;
@ -112,7 +117,7 @@ static bool float2bool(float v) {
float LECalculator::pop(le_action_e action) { float LECalculator::pop(le_action_e action) {
if (stack.size() == 0) { if (stack.size() == 0) {
warning(OBD_PCM_Processor_Fault, "empty stack for %d", action); warning(OBD_PCM_Processor_Fault, "empty stack for action=%d", action);
return NAN; return NAN;
} }
return stack.pop(); return stack.pop();
@ -335,7 +340,9 @@ LEElement *LEElementPool::next() {
firmwareError("LE_ELEMENT_POOL_SIZE overflow"); firmwareError("LE_ELEMENT_POOL_SIZE overflow");
return NULL; return NULL;
} }
return &pool[index++]; LEElement *result = &pool[index++];
result->clear();
return result;
} }
bool isNumeric(const char* line) { bool isNumeric(const char* line) {

1
firmware/controllers/core/fsio_core.h
View File

@ -54,6 +54,7 @@ typedef enum {
class LEElement { class LEElement {
public: public:
LEElement(); LEElement();
void clear();
// void init(le_action_e action, int iValue); // void init(le_action_e action, int iValue);
void init(le_action_e action); void init(le_action_e action);
void init(le_action_e action, float fValue); void init(le_action_e action, float fValue);

2
firmware/rusefi.cpp
View File

@ -298,5 +298,5 @@ int getRusEfiVersion(void) {
return 123; // this is here to make the compiler happy about the unused array return 123; // this is here to make the compiler happy about the unused array
if (UNUSED_CCM_SIZE[0] * 0 != 0) if (UNUSED_CCM_SIZE[0] * 0 != 0)
return 3211; // this is here to make the compiler happy about the unused array return 3211; // this is here to make the compiler happy about the unused array
return 20160415; return 20160419;
} }