demo new haven display
Dependencies: LCD Menu ButtonCtrl TimeManagement EventLog AddressMap emic2
ESCM 2000 Control and Display application provides interface for the LPC1768 processor boards with the ECSM 2000 system.
This application implements SW interface : - RX 485 Receive from physical system - RX 485 Interface to send toECOM / ESCM board - CAN Interface to send to ECOM / ESCM board - 4x40 LCD with menu controls - RTC configuration -EMIC2 Sound Card - GPIO Extender to push buttons etc
Revision 10:f221dd1ef77b, committed 2020-03-17
- Comitter:
- foxbrianr
- Date:
- Tue Mar 17 17:24:16 2020 +0000
- Parent:
- 9:bec64ebc98da
- Commit message:
- fix up code for barry
Changed in this revision
diff -r bec64ebc98da -r f221dd1ef77b ESCMControlApp.cpp --- a/ESCMControlApp.cpp Fri Sep 27 13:42:19 2019 +0000 +++ b/ESCMControlApp.cpp Tue Mar 17 17:24:16 2020 +0000 @@ -132,10 +132,16 @@ if(escmRs485_Input.readable() ) { //rx485Message(); - while (msgCount < 10 && (value = escmRs485_Input.getc())) { + while (msgCount < 4 && (value = escmRs485_Input.getc())) { //printf("%02x ",value); dataRxBuffer[nChar++]=value; if(nChar==4) { // read 4 characters + + printf("%02x ",dataRxBuffer[0]); + printf("%02x ",dataRxBuffer[1]); + printf("%02x ",dataRxBuffer[2]); + printf("%02x ",dataRxBuffer[3]); + if (dataRxBuffer[2] == 0xd && dataRxBuffer[3] == 0xa) { new_address = 10*(dataRxBuffer[0] -0x30) + (dataRxBuffer[1] -0x30); printf("RX: %d\n\n",new_address); @@ -165,7 +171,7 @@ for (int i=0;i<4;i++) printf( "%0x ", dataRxBuffer[i]); - error("ERROR: INVALID_ADDR=[%d] [%d]\n", + printf("ERROR: INVALID_ADDR=[%d] [%d]\n", cur_address, new_address); @@ -208,7 +214,7 @@ va_list args; va_start(args, format); vsprintf(buffer,format,args); - printf("\nINFO:%s"); + printf("\nINFO:%s",buffer); va_end(args); } /*************************************************************************/ @@ -219,7 +225,7 @@ va_list args; va_start(args, format); vsprintf(buffer,format,args); - printf("\nWARNING:%s"); + printf("\nWARNING:%s",buffer); va_end(args); } /*************************************************************************/ @@ -230,8 +236,7 @@ va_start(args, format); vsprintf(buffer,format,args); - printf("\n---------------------------------------------------"); - printf("\nERROR:%s"); + printf("\nERROR:%s",buffer); va_end(args); } @@ -374,7 +379,7 @@ } else { - error("relay: INVALID_ADDR=%d\n", address); + printf("ERROR: relayMessage INVALID_ADDR=%0x\n", address); } } /*************************************************************************
diff -r bec64ebc98da -r f221dd1ef77b EventLog.lib --- a/EventLog.lib Fri Sep 27 13:42:19 2019 +0000 +++ b/EventLog.lib Tue Mar 17 17:24:16 2020 +0000 @@ -1,1 +1,1 @@ -https://os.mbed.com/teams/E3-Designers/code/EventLog/#486d068deff9 +https://os.mbed.com/teams/E3-Designers/code/EventLog/#2b760f267603
diff -r bec64ebc98da -r f221dd1ef77b Menu.lib --- a/Menu.lib Fri Sep 27 13:42:19 2019 +0000 +++ b/Menu.lib Tue Mar 17 17:24:16 2020 +0000 @@ -1,1 +1,1 @@ -https://os.mbed.com/teams/E3-Designers/code/Menu/#d8673bb9fb6f +https://os.mbed.com/teams/E3-Designers/code/Menu/#9d4e684d8eb8
diff -r bec64ebc98da -r f221dd1ef77b main.cpp --- a/main.cpp Fri Sep 27 13:42:19 2019 +0000 +++ b/main.cpp Tue Mar 17 17:24:16 2020 +0000 @@ -49,7 +49,7 @@ /*------------------------------------------------------------------- * define displays *-------------------------------------------------------------------*/ -Serial pc(USBTX, USBRX); // tx, rx +Serial pc(USBTX, USBRX, 115200); // tx, rx #define MAX_THREADS 6 Thread * threads [MAX_THREADS]; @@ -277,6 +277,9 @@ #if DEBUG UpdatePerfDataStop(&g_perfData.task[3]); #endif + + escmEventLog.save(); + Thread::wait(200); } }