Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Dependencies: BufferedSerial FatFileSystemCpp mbed
Revision 54:3d7b480b8e1e, committed 2021-08-31
- Comitter:
- JamieB
- Date:
- Tue Aug 31 11:29:28 2021 +0000
- Parent:
- 53:b790ed7b838f
- Child:
- 56:0d9684c7df36
- Commit message:
- Merging all changes to base platform... Hopefully.
Changed in this revision
| main.cpp | Show annotated file Show diff for this revision Revisions of this file |
--- a/main.cpp Wed Aug 25 17:20:10 2021 +0000
+++ b/main.cpp Tue Aug 31 11:29:28 2021 +0000
@@ -625,8 +625,6 @@
UserSettings.FilterYaw = false;
UserSettings.AutoHyperSmooth = true;
UserSettings.FlexibleVIPSOut = false;
-<<<<<<< working copy
-=======
UserSettings.SerialTxDelayMS = 0;
UserSettings.UDPTxDelayMS = 0;
UserSettings.SerialTxDelayFrame = 0;
@@ -636,8 +634,6 @@
UserSettings.InvertYaw = false;
UserSettings.bypassBaud = 0;
->>>>>>> merge rev
-
LocalFileSystem localFS("local");
FILE *LSFile= fopen("/local/settings.txt","r");
char lineBuffer[64];