Bmag incl gps rettelse
Dependencies: mbed WDT MODSERIAL BME280
Diff: ErrorHandler/ErrorHandler.cpp
- Revision:
- 23:2e914b705b99
- Parent:
- 22:9f5955f051f5
- Child:
- 24:099df3fa2b13
diff -r 9f5955f051f5 -r 2e914b705b99 ErrorHandler/ErrorHandler.cpp --- a/ErrorHandler/ErrorHandler.cpp Mon May 15 12:46:50 2017 +0000 +++ b/ErrorHandler/ErrorHandler.cpp Tue May 16 09:33:12 2017 +0000 @@ -93,8 +93,13 @@ memset(tmparr,'\0',15); sprintf(tmparr, "%s", gpsPtr->getCurrentTime().c_str()); errorStr1.assign("!MagData"); - errorStr2.assign(tmparr); - + + if(*fixptr){ + errorStr2.assign(tmparr); + } + if(!(*fixptr)){ + errorStr2.assign("!NoFix "); + } break; case(DISPLAY_VBAT_FIX): @@ -126,6 +131,10 @@ errorStr2.assign("Low! "); break; + case(GPS_OVERRIDE_NEEDED): + errorStr1.assign("Override"); + errorStr2.assign("GPS! "); + break; default: break;