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 26:7f66ac76cd5d, committed 2021-07-08
- Comitter:
- JamieB
- Date:
- Thu Jul 08 17:31:11 2021 +0000
- Parent:
- 25:7002be632308
- Child:
- 27:498cce52fe5f
- Commit message:
- Fixed FizPort Configuration always defaulting to Preston
Changed in this revision
FIZ_readers/FIZDigiPowerActive.cpp | Show annotated file Show diff for this revision Revisions of this file |
main.cpp | Show annotated file Show diff for this revision Revisions of this file |
--- a/FIZ_readers/FIZDigiPowerActive.cpp Wed Jul 07 16:27:24 2021 +0000 +++ b/FIZ_readers/FIZDigiPowerActive.cpp Thu Jul 08 17:31:11 2021 +0000 @@ -37,6 +37,7 @@ void FIZDigiPowerActive::OnRx(void) { uint8_t dIn = _port.getc(); +// pc.printf("R"); inputBuffer[inputPtr] = dIn; if (inputPtr==0) { if (dIn == 0x07) { // correct length
--- a/main.cpp Wed Jul 07 16:27:24 2021 +0000 +++ b/main.cpp Thu Jul 08 17:31:11 2021 +0000 @@ -608,7 +608,7 @@ int main() { pc.baud(115200); - pc.printf("\r\n\r\nStartup - v0.5\r\n"); + pc.printf("\r\n\r\nStartup - v0.7\r\n"); UserSettings.FIZmode = formatPreston; UserSettings.SerialOutMode = mode_VIPS; @@ -622,13 +622,21 @@ switch(UserSettings.FIZmode) { case formatPreston : FIZPort = new FIZDisney(p9, p10); + pc.printf("Set Preston"); + break; case formatFujiPassive : FIZPort = new FIZDigiPower(p9, p10); + pc.printf("Set FujiPassive"); + break; case formatFujiActive : FIZPort = new FIZDigiPowerActive(p9, p10); + pc.printf("Set FujiActive\r\n"); + break; default: FIZPort = new FIZDisney(p9, p10); //preston + pc.printf("Set Default - Preston"); } +// FIZPort = new FIZDigiPowerActive(p9, p10); COM1.baud(115200); // VIPS port if (UserSettings.UDPPort) { @@ -671,8 +679,8 @@ inputTimer.reset(); inputTimer.start(); - GreenLED = LED_OFF; - RedLED = LED_ON; + GreenLED = LED_ON; + RedLED = LED_OFF; BlueLED = LED_OFF; prepPacketOut();