I messed up the merge, so pushing it over to another repo so I don't lose it. Will tidy up and remove later
Dependencies: BufferedSerial FatFileSystemCpp mbed
Revision 64:e2b454ed9940, committed 2021-11-11
- Comitter:
- JamieB
- Date:
- Thu Nov 11 21:11:08 2021 +0000
- Parent:
- 63:11ee40ec32bd
- Child:
- 65:8ee40ed9295b
- Child:
- 66:066b16c6c34f
- Commit message:
- v20 - Fixed Flexible Message Beacons Used length fix;
Changed in this revision
main.cpp | Show annotated file Show diff for this revision Revisions of this file |
--- a/main.cpp Thu Nov 11 20:18:17 2021 +0000 +++ b/main.cpp Thu Nov 11 21:11:08 2021 +0000 @@ -1,4 +1,4 @@ -#define APP_VERSION 0.19 +#define APP_VERSION 0.20 /* Settings file options @@ -433,7 +433,7 @@ FIZPort->getMostRecent((uint32_t*)(FlexibleVIPSOut + byteCount), (uint16_t*)(FlexibleVIPSOut + byteCount+4), (uint16_t*)(FlexibleVIPSOut + byteCount+6)); byteCount+=8; - if (mask | 0x1000) { // pos must be valid for this to be set + if (mask & 0x1000) { // pos must be valid for this to be set memcpy(FlexibleVIPSOut + byteCount,posPtr->UsedBeacons,12); byteCount+=12; }