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

auto-sync

This commit is contained in:
rusEfi 2015-04-03 23:04:37 -05:00
parent 3f841aead2
commit 120c259573
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/config/engines/dodge_neon.cpp
View File

@ -401,6 +401,9 @@ void setDodgeNeonNGCEngineConfiguration(DECLARE_ENGINE_PARAMETER_F) {
// engineConfiguration->canNbcType = CAN_BUS_MAZDA_RX8; // engineConfiguration->canNbcType = CAN_BUS_MAZDA_RX8;
boardConfiguration->idle.stepperDirectionPin = GPIOE_10;
boardConfiguration->idle.stepperStepPin = GPIOE_12;
engineConfiguration->accelLength = 12; engineConfiguration->accelLength = 12;
} }

3
firmware/controllers/idle_thread.cpp
View File

@ -64,7 +64,8 @@ static void showIdleInfo(void) {
scheduleMsg(logger, "idleMode=%s position=%f isStepper=%s", getIdle_mode_e(engineConfiguration->idleMode), scheduleMsg(logger, "idleMode=%s position=%f isStepper=%s", getIdle_mode_e(engineConfiguration->idleMode),
boardConfiguration->idlePosition, boolToString(boardConfiguration->useStepperIdle)); boardConfiguration->idlePosition, boolToString(boardConfiguration->useStepperIdle));
if (boardConfiguration->useStepperIdle) { if (boardConfiguration->useStepperIdle) {
scheduleMsg(logger, "direction=%s", hwPortname(boardConfiguration->idle.stepperDirectionPin));
scheduleMsg(logger, "step=%s", hwPortname(boardConfiguration->idle.stepperStepPin));
} else { } else {
scheduleMsg(logger, "idle valve freq=%d on %s", boardConfiguration->idle.solenoidFrequency, scheduleMsg(logger, "idle valve freq=%d on %s", boardConfiguration->idle.solenoidFrequency,
hwPortname(boardConfiguration->idle.solenoidPin)); hwPortname(boardConfiguration->idle.solenoidPin));

24
firmware/hw_layer/pin_repository.cpp
View File

@ -23,6 +23,15 @@ static int initialized = FALSE;
static LoggingWithStorage logger("pin repos"); static LoggingWithStorage logger("pin repos");
static int totalPinsUsed = 0; static int totalPinsUsed = 0;
static GPIO_TypeDef* ports[7] = {GPIOA,
GPIOB,
GPIOC,
GPIOD,
GPIOE,
GPIOF,
GPIOH,
};
/** /**
* @deprecated - use hwPortname() instead * @deprecated - use hwPortname() instead
*/ */
@ -58,11 +67,13 @@ static int getPortIndex(GPIO_TypeDef* port) {
#if defined(STM32F4XX) #if defined(STM32F4XX)
if (port == GPIOE) if (port == GPIOE)
return 4; return 4;
if (port == GPIOH) #endif /* defined(STM32F4XX) */
return 6;
#endif
if (port == GPIOF) if (port == GPIOF)
return 5; return 5;
#if defined(STM32F4XX)
if (port == GPIOH)
return 6;
#endif /* defined(STM32F4XX) */
firmwareError("portindex"); firmwareError("portindex");
return -1; return -1;
} }
@ -70,12 +81,15 @@ static int getPortIndex(GPIO_TypeDef* port) {
static void reportPins(void) { static void reportPins(void) {
for (int i = 0; i < PIN_REPO_SIZE; i++) { for (int i = 0; i < PIN_REPO_SIZE; i++) {
const char *name = PIN_USED[i]; const char *name = PIN_USED[i];
int portIndex = i / PORT_SIZE;
int pin = i % PORT_SIZE;
GPIO_TypeDef* port = ports[portIndex];
if (name != NULL) { if (name != NULL) {
print("pin %d: %s\r\n", i, name); scheduleMsg(&logger, "pin %s%d: %s", portname(port), pin, name);
} }
} }
print("Total pins count: %d\r\n", totalPinsUsed); scheduleMsg(&logger, "Total pins count: %d", totalPinsUsed);
} }
static MemoryStream portNameStream; static MemoryStream portNameStream;