-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added Spektrum SRXL2 support. (#5791)
This consists of various files/changes brought over from betaflight with modifications to operate in the current state of inav. It also includes files/changes that were not a part of the betaflight SRXL2 merge, as the previous bidi srxl implementation was not yet implemented either, and SRXL2 has some dependencies on the Spektrum telemetry structuring from those files.
- Loading branch information
1 parent
ca97a8e
commit a88bab5
Showing
17 changed files
with
1,957 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,152 @@ | ||
| /* | ||
| * This file is part of Cleanflight and Betaflight. | ||
| * | ||
| * Cleanflight and Betaflight are free software. You can redistribute | ||
| * this software and/or modify this software under the terms of the | ||
| * GNU General Public License as published by the Free Software | ||
| * Foundation, either version 3 of the License, or (at your option) | ||
| * any later version. | ||
| * | ||
| * Cleanflight and Betaflight are distributed in the hope that they | ||
| * will be useful, but WITHOUT ANY WARRANTY; without even the implied | ||
| * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
| * See the GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this software. | ||
| * | ||
| * If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| #include <stdbool.h> | ||
| #include <stdint.h> | ||
| #include <string.h> | ||
|
|
||
| #include "platform.h" | ||
| #if defined (USE_SPEKTRUM_CMS_TELEMETRY) && defined (USE_CMS) && defined(USE_TELEMETRY_SRXL) | ||
|
|
||
| #include "common/utils.h" | ||
|
|
||
| #include "drivers/display.h" | ||
| #include "cms/cms.h" | ||
|
|
||
| #include "telemetry/srxl.h" | ||
|
|
||
| displayPort_t srxlDisplayPort; | ||
|
|
||
| static int srxlDrawScreen(displayPort_t *displayPort) | ||
| { | ||
| UNUSED(displayPort); | ||
| return 0; | ||
| } | ||
|
|
||
| static int srxlScreenSize(const displayPort_t *displayPort) | ||
| { | ||
| return displayPort->rows * displayPort->cols; | ||
| } | ||
|
|
||
| static int srxlWriteChar(displayPort_t *displayPort, uint8_t col, uint8_t row, uint16_t c, textAttributes_t attr) | ||
| { | ||
| return (spektrumTmTextGenPutChar(col, row, c)); | ||
| UNUSED(displayPort); | ||
| UNUSED(attr); | ||
| } | ||
|
|
||
|
|
||
| static int srxlWriteString(displayPort_t *displayPort, uint8_t col, uint8_t row, const char *s, textAttributes_t attr) | ||
| { | ||
| while (*s) { | ||
| srxlWriteChar(displayPort, col++, row, *(s++), attr); | ||
| } | ||
| return 0; | ||
| } | ||
|
|
||
| static int srxlClearScreen(displayPort_t *displayPort) | ||
| { | ||
| textAttributes_t attr = 0; | ||
| for (int row = 0; row < SPEKTRUM_SRXL_TEXTGEN_BUFFER_ROWS; row++) { | ||
| for (int col= 0; col < SPEKTRUM_SRXL_TEXTGEN_BUFFER_COLS; col++) { | ||
| srxlWriteChar(displayPort, col, row, ' ', attr); | ||
| } | ||
| } | ||
| srxlWriteString(displayPort, 1, 0, "INAV", attr); | ||
|
|
||
| if (displayPort->grabCount == 0) { | ||
| srxlWriteString(displayPort, 0, 2, CMS_STARTUP_HELP_TEXT1, attr); | ||
| srxlWriteString(displayPort, 2, 3, CMS_STARTUP_HELP_TEXT2, attr); | ||
| srxlWriteString(displayPort, 2, 4, CMS_STARTUP_HELP_TEXT3, attr); | ||
| } | ||
| return 0; | ||
| } | ||
|
|
||
| static bool srxlIsTransferInProgress(const displayPort_t *displayPort) | ||
| { | ||
| UNUSED(displayPort); | ||
| return false; | ||
| } | ||
|
|
||
| /* | ||
| static bool srxlIsSynced(const displayPort_t *displayPort) | ||
| { | ||
| UNUSED(displayPort); | ||
| return true; | ||
| } | ||
| */ | ||
|
|
||
| static int srxlHeartbeat(displayPort_t *displayPort) | ||
| { | ||
| UNUSED(displayPort); | ||
| return 0; | ||
| } | ||
|
|
||
| static void srxlResync(displayPort_t *displayPort) | ||
| { | ||
| UNUSED(displayPort); | ||
| } | ||
|
|
||
| static uint32_t srxlTxBytesFree(const displayPort_t *displayPort) | ||
| { | ||
| UNUSED(displayPort); | ||
| return UINT32_MAX; | ||
| } | ||
|
|
||
| static int srxlGrab(displayPort_t *displayPort) | ||
| { | ||
| return displayPort->grabCount = 1; | ||
| } | ||
|
|
||
| static int srxlRelease(displayPort_t *displayPort) | ||
| { | ||
| int cnt = displayPort->grabCount = 0; | ||
| srxlClearScreen(displayPort); | ||
| return cnt; | ||
| } | ||
|
|
||
| static const displayPortVTable_t srxlVTable = { | ||
| .grab = srxlGrab, | ||
| .release = srxlRelease, | ||
| .clearScreen = srxlClearScreen, | ||
| .drawScreen = srxlDrawScreen, | ||
| .screenSize = srxlScreenSize, | ||
| .writeString = srxlWriteString, | ||
| .writeChar = srxlWriteChar, | ||
| .isTransferInProgress = srxlIsTransferInProgress, | ||
| .heartbeat = srxlHeartbeat, | ||
| .resync = srxlResync, | ||
| //.isSynced = srxlIsSynced, | ||
| .txBytesFree = srxlTxBytesFree, | ||
| //.layerSupported = NULL, | ||
| //.layerSelect = NULL, | ||
| //.layerCopy = NULL, | ||
| }; | ||
|
|
||
| displayPort_t *displayPortSrxlInit(void) | ||
| { | ||
| srxlDisplayPort.device = NULL; | ||
| displayInit(&srxlDisplayPort, &srxlVTable); | ||
| srxlDisplayPort.rows = SPEKTRUM_SRXL_TEXTGEN_BUFFER_ROWS; | ||
| srxlDisplayPort.cols = SPEKTRUM_SRXL_TEXTGEN_BUFFER_COLS; | ||
| return &srxlDisplayPort; | ||
| } | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| /* | ||
| * This file is part of Cleanflight and Betaflight. | ||
| * | ||
| * Cleanflight and Betaflight are free software. You can redistribute | ||
| * this software and/or modify this software under the terms of the | ||
| * GNU General Public License as published by the Free Software | ||
| * Foundation, either version 3 of the License, or (at your option) | ||
| * any later version. | ||
| * | ||
| * Cleanflight and Betaflight are distributed in the hope that they | ||
| * will be useful, but WITHOUT ANY WARRANTY; without even the implied | ||
| * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
| * See the GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this software. | ||
| * | ||
| * If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| #pragma once | ||
|
|
||
| displayPort_t *displayPortSrxlInit(void); | ||
|
|
||
| extern displayPort_t srxlDisplayPort; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.