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

auto-sync

This commit is contained in:
rusEfi 2015-01-02 17:05:43 -06:00
parent 6493666d64
commit 6a642e4de5
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/hw_layer/HIP9011.cpp
View File

@ -60,7 +60,7 @@ static Logging logger;
#if HIP_DEBUG
static THD_WORKING_AREA(htThreadStack, UTILITY_THREAD_STACK_SIZE);
#endif
#endif /* HIP_DEBUG */
// SPI_CR1_BR_1 // 5MHz
// SPI_CR1_CPHA Clock Phase
@ -136,6 +136,7 @@ static msg_t ivThread(int param) {
#if defined __GNUC__
return 0;
#endif
}
EXTERN_ENGINE
@ -323,10 +324,7 @@ void initHip9011(void) {
spiStop(driver);
// todo spicfg.end_cb = spiEndCallback;
spiStart(driver, &spicfg);
#endif
#endif /* HIP_DEBUG */
bandIndex = findIndex(bandFreqLookup, BAND_LOOKUP_SIZE,
BAND(engineConfiguration->cylinderBore));

15
firmware/hw_layer/hardware.cpp
View File

@ -58,13 +58,10 @@ static bool isSpiInitialized[5] = { false, false, false, false, false };
static void initSpiModule(SPIDriver *driver, brain_pin_e sck, brain_pin_e miso,
brain_pin_e mosi, int af) {
mySetPadMode("SPI clock", getHwPort(sck), getHwPin(sck),
PAL_MODE_ALTERNATE(af));
mySetPadMode2("SPI clock", sck, PAL_MODE_ALTERNATE(af));
mySetPadMode("SPI master out", getHwPort(mosi), getHwPin(mosi),
PAL_MODE_ALTERNATE(af));
mySetPadMode("SPI master in ", getHwPort(miso), getHwPin(miso),
PAL_MODE_ALTERNATE(af));
mySetPadMode2("SPI master out", mosi, PAL_MODE_ALTERNATE(af));
mySetPadMode2("SPI master in ", miso, PAL_MODE_ALTERNATE(af));
}
/**
@ -90,7 +87,7 @@ void turnOnSpi(spi_device_e device) {
boardConfiguration->spi1misoPin,
boardConfiguration->spi1mosiPin,
EFI_SPI1_AF);
#endif
#endif /* STM32_SPI_USE_SPI1 */
}
if (device == SPI_DEVICE_2) {
#if STM32_SPI_USE_SPI2
@ -99,7 +96,7 @@ void turnOnSpi(spi_device_e device) {
boardConfiguration->spi2misoPin,
boardConfiguration->spi2mosiPin,
EFI_SPI2_AF);
#endif
#endif /* STM32_SPI_USE_SPI2 */
}
if (device == SPI_DEVICE_3) {
#if STM32_SPI_USE_SPI3
@ -108,7 +105,7 @@ void turnOnSpi(spi_device_e device) {
boardConfiguration->spi3misoPin,
boardConfiguration->spi3mosiPin,
EFI_SPI3_AF);
#endif
#endif /* STM32_SPI_USE_SPI3 */
}
}

3
firmware/hw_layer/lcd/lcd_HD44780.c
View File

@ -2,8 +2,7 @@
* @file lcd_HD44780.c
* @brief HD44780 character display driver
*
*
* see http://joshuagalloway.com/lcd.html
* see http://en.wikipedia.org/wiki/Hitachi_HD44780_LCD_controller
* @date 13.12.2013
* @author Andrey Belomutskiy, (c) 2012-2014
*/

2
firmware/hw_layer/stepper.cpp
View File

@ -37,7 +37,7 @@ void StepperMotor::initialize(brain_pin_e stepPin, brain_pin_e directionPin) {
this->stepPin = getHwPin(stepPin);
mySetPadMode("st step", stepPort, this->stepPin, PAL_MODE_OUTPUT_PUSHPULL);
mySetPadMode("st dir", getHwPort(directionPin), getHwPin(directionPin), PAL_MODE_OUTPUT_PUSHPULL);
mySetPadMode2("st dir", directionPin, PAL_MODE_OUTPUT_PUSHPULL);
chThdCreateStatic(stThreadStack, sizeof(stThreadStack), NORMALPRIO, (tfunc_t) stThread, this);
}

18
firmware/iar/ch.ewp
View File

@ -2085,12 +2085,6 @@
</group>
<group>
<name>console_util</name>
<file>
<name>$PROJ_DIR$\..\console_util\datalogging.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\console_util\datalogging.h</name>
</file>
<file>
<name>$PROJ_DIR$\..\console_util\rfiutil.c</name>
</file>
@ -2673,6 +2667,12 @@
<file>
<name>$PROJ_DIR$\..\hw_layer\io_pins.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\hw_layer\joystick.cpp</name>
</file>
<file>
<name>$PROJ_DIR$\..\hw_layer\joystick.h</name>
</file>
<file>
<name>$PROJ_DIR$\..\hw_layer\max31855.cpp</name>
</file>
@ -3177,6 +3177,12 @@
</group>
<group>
<name>util</name>
<file>
<name>$PROJ_DIR$\..\util\datalogging.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\util\datalogging.h</name>
</file>
<file>
<name>$PROJ_DIR$\..\util\cli_registry.c</name>
</file>