Skip to content

Commit fb8b9c4

Browse files
jpliewjpliew
committed
added debug messages for doCmd()
1 parent e6045dc commit fb8b9c4

File tree

2 files changed

+191
-20
lines changed

2 files changed

+191
-20
lines changed

‎MicroView.cpp

+187-19
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#undef PROGMEM
77
#define PROGMEM __attribute__((section(".progmem.data")))
88

9-
// Add header of the fonts here. Remove as many as possible to get conserve FLASH memory.
9+
// Add header of the fonts here. Remove as many as possible to conserve FLASH memory.
1010
#include <font5x7.h>
1111
#include <font8x16.h>
1212
#include <fontlargenumber.h>
@@ -15,6 +15,8 @@
1515
#include <space02.h>
1616
#include <space03.h>
1717

18+
19+
1820
// Change the total fonts included
1921
#define TOTALFONTS 7
2022
#define recvLEN 100
@@ -688,113 +690,232 @@ void MicroView::doCmd(uint8_t cmdCount) {
688690
// decode command
689691
switch (serCmd[0]) {
690692
case CMD_CLEAR: {
691-
Serial.println("clear");
692693
if (cmdCount==1) {
694+
Serial.print("clear ");
695+
Serial.println(serCmd[1]);
693696
clear(serCmd[1]);
694697
} else if (cmdCount==2) {
698+
Serial.print("clear ");
699+
Serial.print(serCmd[1]);
700+
Serial.print(" ");
701+
Serial.println(serCmd[2]);
695702
clear(serCmd[1], serCmd[2]);
696703
}
697704
break;
698705
}
699706

700707
case CMD_INVERT: {
701-
Serial.println("invert");
708+
702709
if (cmdCount==1) {
710+
Serial.print("invert ");
711+
Serial.println(serCmd[1]);
703712
invert(serCmd[1]);
704713
}
705714
break;
706715
}
707716

708717
case CMD_CONTRAST: {
709-
Serial.println("contrast");
718+
710719
if (cmdCount==1) {
720+
Serial.print("contrast ");
721+
Serial.println(serCmd[1]);
711722
contrast(serCmd[1]);
712723
}
713724
break;
714725
}
715726

716727
case CMD_DISPLAY: {
717-
Serial.println("display");
728+
718729
if (cmdCount==0) {
730+
Serial.println("display");
719731
display();
720732
}
721733
break;
722734
}
723735

724736
case CMD_SETCURSOR: {
725-
Serial.println("setCursor");
737+
726738
if (cmdCount==2) {
739+
Serial.print("setCursor ");
740+
Serial.print(serCmd[1]);
741+
Serial.print(" ");
742+
Serial.println(serCmd[2]);
727743
setCursor(serCmd[1], serCmd[2]);
728744
}
729745
break;
730746
}
731747

732748
case CMD_PIXEL: {
733-
Serial.println("pixel");
749+
734750
if (cmdCount==2) {
751+
Serial.print("pixel ");
752+
Serial.print(serCmd[1]);
753+
Serial.print(" ");
754+
Serial.println(serCmd[2]);
735755
pixel(serCmd[1],serCmd[2]);
736756
display();
737757
} else if (cmdCount=4) {
758+
Serial.print("pixel ");
759+
Serial.print(serCmd[1]);
760+
Serial.print(" ");
761+
Serial.println(serCmd[2]);
762+
Serial.print(" ");
763+
Serial.print(serCmd[3]);
764+
Serial.print(" ");
765+
Serial.println(serCmd[4]);
766+
738767
pixel(serCmd[1],serCmd[2],serCmd[3],serCmd[4]);
739768
display();
740769
}
741770
break;
742771
}
743772

744773
case CMD_LINE: {
745-
Serial.println("line");
746774
if (cmdCount==4) {
775+
Serial.print("line ");
776+
Serial.print(serCmd[1]);
777+
Serial.print(" ");
778+
Serial.print(serCmd[2]);
779+
Serial.print(" ");
780+
Serial.print(serCmd[3]);
781+
Serial.print(" ");
782+
Serial.println(serCmd[4]);
783+
747784
line(serCmd[1],serCmd[2],serCmd[3],serCmd[4]);
748785
display();
749786
} else if (cmdCount==6) {
787+
Serial.print("line ");
788+
Serial.print(serCmd[1]);
789+
Serial.print(" ");
790+
Serial.print(serCmd[2]);
791+
Serial.print(" ");
792+
Serial.print(serCmd[3]);
793+
Serial.print(" ");
794+
Serial.print(serCmd[4]);
795+
Serial.print(" ");
796+
Serial.print(serCmd[5]);
797+
Serial.print(" ");
798+
Serial.println(serCmd[6]);
799+
750800
line(serCmd[1],serCmd[2],serCmd[3],serCmd[4],serCmd[5],serCmd[6]);
751801
display();
752802
}
753803
break;
754804
}
755805

756806
case CMD_LINEH: {
757-
Serial.println("lineH");
758807
if (cmdCount==3) {
808+
Serial.print("lineH ");
809+
Serial.print(serCmd[1]);
810+
Serial.print(" ");
811+
Serial.print(serCmd[2]);
812+
Serial.print(" ");
813+
Serial.println(serCmd[3]);
814+
759815
lineH(serCmd[1], serCmd[2], serCmd[3]);
760816
display();
761817
} else if (cmdCount==5) {
818+
Serial.print("lineH ");
819+
Serial.print(serCmd[1]);
820+
Serial.print(" ");
821+
Serial.print(serCmd[2]);
822+
Serial.print(" ");
823+
Serial.print(serCmd[3]);
824+
Serial.print(" ");
825+
Serial.print(serCmd[4]);
826+
Serial.print(" ");
827+
Serial.println(serCmd[5]);
828+
762829
lineH(serCmd[1], serCmd[2], serCmd[3], serCmd[4], serCmd[5]);
763830
display();
764831
}
765832
break;
766833
}
767834

768835
case CMD_LINEV: {
769-
Serial.println("lineV");
770836
if (cmdCount==3) {
837+
Serial.print("lineH ");
838+
Serial.print(serCmd[1]);
839+
Serial.print(" ");
840+
Serial.print(serCmd[2]);
841+
Serial.print(" ");
842+
Serial.println(serCmd[3]);
843+
771844
lineV(serCmd[1], serCmd[2], serCmd[3]);
772845
display();
773846
} else if (cmdCount==5) {
847+
Serial.print("lineH ");
848+
Serial.print(serCmd[1]);
849+
Serial.print(" ");
850+
Serial.print(serCmd[2]);
851+
Serial.print(" ");
852+
Serial.print(serCmd[3]);
853+
Serial.print(" ");
854+
Serial.print(serCmd[4]);
855+
Serial.print(" ");
856+
Serial.println(serCmd[5]);
774857
lineV(serCmd[1], serCmd[2], serCmd[3], serCmd[4], serCmd[5]);
775858
display();
776859
}
777860
break;
778861
}
779862

780863
case CMD_RECT: {
781-
Serial.println("rect");
782864
if (cmdCount==4) {
865+
Serial.print("rect ");
866+
Serial.print(serCmd[1]);
867+
Serial.print(" ");
868+
Serial.print(serCmd[2]);
869+
Serial.print(" ");
870+
Serial.print(serCmd[3]);
871+
Serial.print(" ");
872+
Serial.println(serCmd[4]);
783873
rect(serCmd[1], serCmd[2], serCmd[3], serCmd[4]);
784874
display();
785875
} else if (cmdCount==6) {
876+
Serial.print("rect ");
877+
Serial.print(serCmd[1]);
878+
Serial.print(" ");
879+
Serial.print(serCmd[2]);
880+
Serial.print(" ");
881+
Serial.print(serCmd[3]);
882+
Serial.print(" ");
883+
Serial.print(serCmd[4]);
884+
Serial.print(" ");
885+
Serial.print(serCmd[5]);
886+
Serial.print(" ");
887+
Serial.println(serCmd[6]);
786888
rect(serCmd[1], serCmd[2], serCmd[3], serCmd[4], serCmd[5], serCmd[6]);
787889
display();
788890
}
789891
break;
790892
}
791893

792894
case CMD_RECTFILL: {
793-
Serial.println("rectFill");
794895
if (cmdCount==4) {
896+
Serial.print("rectFill ");
897+
Serial.print(serCmd[1]);
898+
Serial.print(" ");
899+
Serial.print(serCmd[2]);
900+
Serial.print(" ");
901+
Serial.print(serCmd[3]);
902+
Serial.print(" ");
903+
Serial.println(serCmd[4]);
795904
rectFill(serCmd[1], serCmd[2], serCmd[3], serCmd[4]);
796905
display();
797906
} else if (cmdCount==6) {
907+
Serial.print("rectFill ");
908+
Serial.print(serCmd[1]);
909+
Serial.print(" ");
910+
Serial.print(serCmd[2]);
911+
Serial.print(" ");
912+
Serial.print(serCmd[3]);
913+
Serial.print(" ");
914+
Serial.print(serCmd[4]);
915+
Serial.print(" ");
916+
Serial.print(serCmd[5]);
917+
Serial.print(" ");
918+
Serial.println(serCmd[6]);
798919
rectFill(serCmd[1], serCmd[2], serCmd[3], serCmd[4], serCmd[5], serCmd[6]);
799920
display();
800921
}
@@ -803,36 +924,81 @@ void MicroView::doCmd(uint8_t cmdCount) {
803924
}
804925

805926
case CMD_CIRCLE: {
806-
Serial.println("circle");
807927
if (cmdCount==3) {
928+
Serial.print("circle ");
929+
Serial.print(serCmd[1]);
930+
Serial.print(" ");
931+
Serial.print(serCmd[2]);
932+
Serial.print(" ");
933+
Serial.println(serCmd[3]);
808934
circle(serCmd[1], serCmd[2], serCmd[3]);
809935
display();
810936
} else if (cmdCount==5) {
937+
Serial.print("circle ");
938+
Serial.print(serCmd[1]);
939+
Serial.print(" ");
940+
Serial.print(serCmd[2]);
941+
Serial.print(" ");
942+
Serial.print(serCmd[3]);
943+
Serial.print(" ");
944+
Serial.print(serCmd[4]);
945+
Serial.print(" ");
946+
Serial.println(serCmd[5]);
811947
circle(serCmd[1], serCmd[2], serCmd[3], serCmd[4], serCmd[5]);
812948
display();
813949
}
814950
break;
815951
}
816952

817953
case CMD_CIRCLEFILL: {
818-
Serial.println("circleFill");
819954

820955
if (cmdCount==3) {
956+
Serial.print("circle ");
957+
Serial.print(serCmd[1]);
958+
Serial.print(" ");
959+
Serial.print(serCmd[2]);
960+
Serial.print(" ");
961+
Serial.println(serCmd[3]);
821962
circleFill(serCmd[1], serCmd[2], serCmd[3]);
822963
display();
823964
} else if (cmdCount==5) {
965+
Serial.print("circle ");
966+
Serial.print(serCmd[1]);
967+
Serial.print(" ");
968+
Serial.print(serCmd[2]);
969+
Serial.print(" ");
970+
Serial.print(serCmd[3]);
971+
Serial.print(" ");
972+
Serial.print(serCmd[4]);
973+
Serial.print(" ");
974+
Serial.println(serCmd[5]);
824975
circleFill(serCmd[1], serCmd[2], serCmd[3], serCmd[4], serCmd[5]);
825976
display();
826977
}
827978
break;
828979
}
829980

830981
case CMD_DRAWCHAR: {
831-
Serial.println("drawChar");
832982
if (cmdCount==3) {
983+
Serial.print("drawChar ");
984+
Serial.print(serCmd[1]);
985+
Serial.print(" ");
986+
Serial.print(serCmd[2]);
987+
Serial.print(" ");
988+
Serial.println(serCmd[3]);
833989
drawChar(serCmd[1], serCmd[2], serCmd[3]);
834990
display();
835991
} else if (cmdCount==5) {
992+
Serial.print("drawChar ");
993+
Serial.print(serCmd[1]);
994+
Serial.print(" ");
995+
Serial.print(serCmd[2]);
996+
Serial.print(" ");
997+
Serial.print(serCmd[3]);
998+
Serial.print(" ");
999+
Serial.print(serCmd[4]);
1000+
Serial.print(" ");
1001+
Serial.println(serCmd[5]);
8361002
drawChar(serCmd[1], serCmd[2], serCmd[3], serCmd[4], serCmd[5]);
8371003
display();
8381004
}
@@ -846,33 +1012,35 @@ void MicroView::doCmd(uint8_t cmdCount) {
8461012
}
8471013

8481014
case CMD_GETLCDWIDTH: {
849-
Serial.println("getLCDWidth");
8501015

8511016
if (cmdCount==0) {
1017+
Serial.print("LCDWidth=");
8521018
Serial.println(getLCDWidth());
8531019
}
8541020
break;
8551021
}
8561022

8571023
case CMD_GETLCDHEIGHT: {
858-
Serial.println("getLCDHeight");
8591024
if (cmdCount==0) {
1025+
Serial.print("LCDHeight=");
8601026
Serial.println(getLCDHeight());
8611027
}
8621028
break;
8631029
}
8641030

8651031
case CMD_SETCOLOR: {
866-
Serial.println("setColor");
8671032
if (cmdCount==1) {
1033+
Serial.print("setColor ");
1034+
Serial.println(serCmd[1]);
8681035
setColor(serCmd[1]);
8691036
}
8701037
break;
8711038
}
8721039

8731040
case CMD_SETDRAWMODE: {
874-
Serial.println("drawMode");
8751041
if (cmdCount==1) {
1042+
Serial.print("drawMode ");
1043+
Serial.println(serCmd[1]);
8761044
setDrawMode(serCmd[1]);
8771045
}
8781046
break;

0 commit comments

Comments
 (0)