Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-17 21:35:44 +03:00
Code Issues Wiki Activity

bring betaflight up to par with serial1wire-blheli-multiesc

Browse source
This commit is contained in:
nathan 2015-09-02 20:46:51 -07:00
parent d7ad58412c
commit 80be01e530
3 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/main/io/serial_1wire.c
View file

@ -82,6 +82,7 @@ void usb1WireInitialize()
#ifdef STM32F10X
static volatile uint32_t in_cr_mask, out_cr_mask;
static __IO uint32_t *cr;
static void gpio_prep_vars(uint16_t escIndex)
{

2
src/main/io/serial_cli.c
View file

@ -2138,8 +2138,6 @@ static void cliUSB1Wire(char *cmdline)
printf("Invalid motor port, valid range: 1 to %d\r\n", ESC_COUNT);
}
}
UNUSED(cmdline);
StopPwmAllMotors();
// motor 1 => index 0
usb1WirePassthrough(i-1);
}

14
src/main/io/serial_msp.c
View file

@ -1775,17 +1775,18 @@ static bool processInCommand(void)
// 0xFF -> preinitialize the Passthrough
// switch all motor lines HI
usb1WireInitialize();
// and come back rigth afterwards
// rem: App: Wait at least appx. 500 ms for BLHeli to jump into bootloader mode before try to connect any ESC
// and come back right afterwards
// rem: App: Wait at least appx. 500 ms for BLHeli to jump into
// bootloader mode before try to connect any ESC
}
else {
// Check for channel number 0..ESC_COUNT-1
if (i < ESC_COUNT) {
// because we do not come back after calling usb1WirePassthrough
// proceed a success reply first
// proceed with a success reply first
headSerialReply(0);
tailSerialReply();
//wait for all data is send
// wait for all data to send
while (!isSerialTransmitBufferEmpty(mspSerialPort)) {
delay(50);
}
@ -1795,10 +1796,7 @@ static bool processInCommand(void)
// MPS uart is active again
} else {
// ESC channel higher than max. allowed
// rem: BLHelilSuite will not support more than 8
// Client should check active Motors before preinitialize the Passthrough
// with MSP_MOTOR and check each value >0 and later call only active channels
// rem: atm not allowed channel mapping other than 0..x ascending
// rem: BLHeliSuite will not support more than 8
headSerialError(0);
}
// proceed as usual with MSP commands