Merge branch 'betaflight' of https://github.com/borisbstyle/betaflight into betaflight

This commit is contained in:
borisbstyle 2016-02-14 22:22:37 +01:00
commit 13783da391
3 changed files with 33 additions and 3 deletions

View File

@ -320,7 +320,7 @@ bool bstSlaveWrite(uint8_t* data) {
uint32_t bstMasterWriteTimeout = 0;
void bstMasterWriteLoop(void)
{
if(bstWriteDataLen != 0) {
while(bstWriteDataLen) {
if(bufferPointer == 0) {
bool scl_set = false;
if(BSTx == I2C1)

View File

@ -1794,6 +1794,36 @@ static void cliDump(char *cmdline)
cliPrint("\r\n\r\n# color\r\n");
cliColor("");
#endif
cliPrint("\r\n# aux\r\n");
cliAux("");
cliPrint("\r\n# adjrange\r\n");
cliAdjustmentRange("");
cliPrintf("\r\n# rxrange\r\n");
cliRxRange("");
#ifdef USE_SERVOS
cliPrint("\r\n# servo\r\n");
cliServo("");
// print servo directions
unsigned int channel;
for (i = 0; i < MAX_SUPPORTED_SERVOS; i++) {
for (channel = 0; channel < INPUT_SOURCE_COUNT; channel++) {
if (servoDirection(i, channel) < 0) {
cliPrintf("smix reverse %d %d r\r\n", i , channel);
}
}
}
#endif
printSectionBreak();
dumpValues(MASTER_VALUE);

View File

@ -211,8 +211,8 @@ static cfTask_t cfTasks[TASK_COUNT] = {
[TASK_BST_READ_WRITE] = {
.taskName = "BST_MASTER_WRITE",
.taskFunc = taskBstReadWrite,
.desiredPeriod = 1000000 / 500, // 500 Hz
.staticPriority = TASK_PRIORITY_HIGH,
.desiredPeriod = 1000000 / 100, // 100 Hz
.staticPriority = TASK_PRIORITY_IDLE,
},
[TASK_BST_MASTER_PROCESS] = {