Dual CANbus monitor and instrumentation cluster
Dependencies: SPI_TFTx2 TFT_fonts TOUCH_TFTx2 beep mbed
Fork of CANary by
Diff: displayModes.cpp
- Revision:
- 24:6cf76ed8c432
- Parent:
- 23:cd03f9c3395e
- Child:
- 25:ddf0ec209f03
diff -r cd03f9c3395e -r 6cf76ed8c432 displayModes.cpp --- a/displayModes.cpp Thu Mar 14 04:41:11 2013 +0000 +++ b/displayModes.cpp Thu Mar 14 05:02:15 2013 +0000 @@ -1,7 +1,8 @@ //displayModes.cpp #include "displayModes.h" -char sTemp[16]; +char sTemp1[16]; +char sTemp2[16]; void printLast (bool force){ CANMessage msg; @@ -248,18 +249,22 @@ tt.foreground(Yellow); tt.background(DarkCyan); tt.set_font((unsigned char*) Arial12x12); - sprintf(sTemp,"Calibrate"); - showButton(0,0,sTemp,3,3); - sprintf(sTemp,"Reset"); - showButton(1,0,sTemp,3,3); - sprintf(sTemp,"Save"); - showButton(2,0,sTemp,3,3); + sprintf(sTemp1," Calibrate"); + sprintf(sTemp2," Touch"); + showButton(0,0,sTemp1,sTemp2,3,3); + sprintf(sTemp1," Reset"); + sprintf(sTemp2,""); + showButton(1,0,sTemp1,sTemp2,3,3); + sprintf(sTemp1," Save"); + sprintf(sTemp2," Config"); + showButton(2,0,sTemp1,sTemp2,3,3); if (logEn) { - sprintf(sTemp,"Disable"); + sprintf(sTemp1," Disable"); } else { - sprintf(sTemp,"Enable"); + sprintf(sTemp1," Enable"); } - showButton(0,1,sTemp,3,3); + sprintf(sTemp2," Logging"); + showButton(0,1,sTemp1,sTemp2,3,3); } void updateDisplay(char display){ @@ -285,13 +290,14 @@ tt.foreground(Yellow); tt.background(DarkCyan); tt.set_font((unsigned char*) Arial12x12); - sprintf(sTemp,"<up>"); - showButton(0,0,sTemp,3,3); + sprintf(sTemp1,"<up>"); + sprintf(sTemp2,""); + showButton(0,0,sTemp1,sTemp2,3,3); tt.foreground(Yellow); tt.background(DarkCyan); tt.set_font((unsigned char*) Arial12x12); - sprintf(sTemp,"<down>"); - showButton(2,0,sTemp,3,3); + sprintf(sTemp1,"<down>"); + showButton(2,0,sTemp1,sTemp2,3,3); } break; case changedScreen: @@ -303,8 +309,9 @@ tt.foreground(Yellow); tt.background(DarkCyan); tt.set_font((unsigned char*) Arial12x12); - sprintf(sTemp,"Request"); - showButton(1,0,sTemp,3,3); + sprintf(sTemp1,"Request"); + sprintf(sTemp2,"CP data"); + showButton(1,0,sTemp1,sTemp2,3,3); } break; case configScreen: @@ -322,43 +329,45 @@ tt.foreground(Yellow); tt.background(DarkCyan); tt.set_font((unsigned char*) Arial12x12); - sprintf(sTemp,"<-Prev"); - showButton(0,2,sTemp,3,3); - sprintf(sTemp," Select %d",dMode[display]); - showButton(1,2,sTemp,3,3); - sprintf(sTemp," Next->"); - showButton(2,2,sTemp,3,3); + sprintf(sTemp1,"<-Prev"); + sprintf(sTemp2,""); + showButton(0,2,sTemp1,sTemp2,3,3); + sprintf(sTemp1," Select %d",dMode[display]); + showButton(1,2,sTemp1,sTemp2,3,3); + sprintf(sTemp1," Next->"); + showButton(2,2,sTemp1,sTemp2,3,3); break; case 2: // numpad + sprintf(sTemp2,""); tt.foreground(Yellow); tt.background(DarkCyan); tt.set_font((unsigned char*) Arial24x23); - sprintf(sTemp," 1"); - showButton(0,0,sTemp,4,4); - sprintf(sTemp," 2"); - showButton(1,0,sTemp,4,4); - sprintf(sTemp," 3"); - showButton(2,0,sTemp,4,4); - sprintf(sTemp," 4"); - showButton(0,1,sTemp,4,4); - sprintf(sTemp," 5"); - showButton(1,1,sTemp,4,4); - sprintf(sTemp," 6"); - showButton(2,1,sTemp,4,4); - sprintf(sTemp," 7"); - showButton(0,2,sTemp,4,4); - sprintf(sTemp," 8"); - showButton(1,2,sTemp,4,4); - sprintf(sTemp," 9"); - showButton(2,2,sTemp,4,4); - sprintf(sTemp," 0"); - showButton(1,3,sTemp,4,4); - sprintf(sTemp,"<--"); - showButton(0,3,sTemp,4,4); - sprintf(sTemp,"-->"); - showButton(2,3,sTemp,4,4); - sprintf(sTemp,"rtn"); - showButton(3,3,sTemp,4,4); + sprintf(sTemp1," 1"); + showButton(0,0,sTemp1,sTemp2,4,4); + sprintf(sTemp1," 2"); + showButton(1,0,sTemp1,sTemp2,4,4); + sprintf(sTemp1," 3"); + showButton(2,0,sTemp1,sTemp2,4,4); + sprintf(sTemp1," 4"); + showButton(0,1,sTemp1,sTemp2,4,4); + sprintf(sTemp1," 5"); + showButton(1,1,sTemp1,sTemp2,4,4); + sprintf(sTemp1," 6"); + showButton(2,1,sTemp1,sTemp2,4,4); + sprintf(sTemp1," 7"); + showButton(0,2,sTemp1,sTemp2,4,4); + sprintf(sTemp1," 8"); + showButton(1,2,sTemp1,sTemp2,4,4); + sprintf(sTemp1," 9"); + showButton(2,2,sTemp1,sTemp2,4,4); + sprintf(sTemp1," 0"); + showButton(1,3,sTemp1,sTemp2,4,4); + sprintf(sTemp1,"<--"); + showButton(0,3,sTemp1,sTemp2,4,4); + sprintf(sTemp1,"-->"); + showButton(2,3,sTemp1,sTemp2,4,4); + sprintf(sTemp1,"return"); + showButton(3,3,sTemp1,sTemp2,4,4); case 3: break; default: @@ -366,7 +375,7 @@ } } -void showButton(unsigned char column, unsigned char row, char * text, unsigned char columns, unsigned char rows){ +void showButton(unsigned char column, unsigned char row, char * text1, char * text2, unsigned char columns, unsigned char rows){ unsigned short x1,x2,y1,y2; x1=column*(320/columns)+btnGap/2; x2=(column+1)*(320/columns)-btnGap/2; @@ -374,6 +383,8 @@ y2=(row+1)*(240/rows)-btnGap/2; tt.fillrect(x1,y1,x2,y2,DarkCyan); tt.locate(x1+btnGap,y1+btnGap); - printf("%s\n",text); + printf("%s\n",text1); + tt.locate(x1+btnGap,y1+btnGap+30); + printf("%s\n",text2); }