chage font osd offset x 0~59 y 0~33

byoh5 · Jul 25, 2019 · a0042d4 · a0042d4
1 parent 8b6a14a
commit a0042d4
Show file tree

Hide file tree

Showing 15 changed files with 12 additions and 12 deletions.
diff --git a/cpu0/core/main/msgqpass.c b/cpu0/core/main/msgqpass.c
@@ -439,13 +439,13 @@ ISRT void RuntimeMsg(void)
 				{
 					printf("MSG_CMD_TXTOCD\r\n");
 					txtosd_info arg_txtosd;
-					char buffer[32];
-					int len=0;
+					//char buffer[32];
+					//int len=0;
 					if (MsgTxtOsdGet(&gptMsgTxtOsd, &arg_txtosd) == DEF_OK) {
 
 						printf("%s %d %d\r\n",arg_txtosd.info,arg_txtosd.posX,arg_txtosd.posY);
-						len = sprintf(buffer, "%s",arg_txtosd.info);
-						DispStr(buffer, arg_txtosd.posY, arg_txtosd.posX, len);
+						//len = sprintf(buffer, "%s",arg_txtosd.info);
+						DispStr(arg_txtosd.info, arg_txtosd.posY, arg_txtosd.posX, strlen(arg_txtosd.info));
 
 					}
 				}

diff --git a/cpu0/isp/dev_isp.h b/cpu0/isp/dev_isp.h
@@ -534,7 +534,7 @@ extern void SystemReset(void);
 
 #define ISP_BOX_EA				32				// (fix) number of Box
 
-#define ISP_FONT_EAX			46/*30*/			// number of Horizontal Font		ksh modi
+#define ISP_FONT_EAX			60/*30*/			// number of Horizontal Font		ksh modi
 #define ISP_FONT_ID_EA			2048		// number of Font id
 #define ISP_FONT_ATTR_EA		2048		// number of Font attr
 #define	ISP_FONT_CHAR_EA		341			// number of font character

diff --git a/cpu1/main_app.o b/cpu1/main_app.o
diff --git a/cpu1/task/shell/shell_cmd_common.o b/cpu1/task/shell/shell_cmd_common.o
diff --git a/cpu1/task/task.o b/cpu1/task/task.o
diff --git a/cpu1/task/terminal/term_server.c b/cpu1/task/terminal/term_server.c
@@ -128,7 +128,7 @@ void TermStart(void *arg)
 
 				do {
 					nbytes = lwip_recv(clientfd, buffer, sizeof(buffer), 0);
-
+					printf("lwip recv - %d)\r\n", nbytes);
 					// 사용자가 Terminal을 강제 종료할 때
 					if (nbytes <= 0) {
 						break;

diff --git a/cpu1/task/terminal/term_server.o b/cpu1/task/terminal/term_server.o
diff --git a/dev/dev_isp_app.h b/dev/dev_isp_app.h
@@ -581,7 +581,7 @@ extern BYTE MN_MXSP;
 	#define MN_POS_SIZ_720P_CROP 	{\
 							BOAD_ONw(0x1); BOAD_MODEw(0x1);		\
 							FONT_OFYw(0x20/*0x8a*/); FONT_OFXw(0x70/*0x1c4*/);	\
-							FONT_VBLKw(0x88); FONT_HBLKw(0x88);	\
+							FONT_VBLKw(0x87); FONT_HBLKw(0x8f);	\
 							FONT_VSIZw(0x1); FONT_HSIZw(0x1);}
 
 	#define MN_POS_SIZ_SMALL	{\

diff --git a/dev/user.o b/dev/user.o
diff --git a/output/EN673.bin b/output/EN673.bin
diff --git a/output/module/build.rpt b/output/module/build.rpt
@@ -189,21 +189,21 @@ Idx Name          Size      VMA       LMA       File off  Algn
                   CONTENTS, ALLOC, LOAD, READONLY, CODE
   1 .rodata       0003ada0  08000000  06011000  00004000  2**2
                   CONTENTS, ALLOC, LOAD, READONLY, DATA
-  2 .text         00065560  0803ada0  0604bda0  0003eda0  2**2
+  2 .text         00065440  0803ada0  0604bda0  0003eda0  2**2
                   CONTENTS, ALLOC, LOAD, READONLY, CODE
-  3 .ispm_text    00003860  04001000  060b1300  000a5000  2**2
+  3 .ispm_text    00003860  04001000  060b11e0  000a5000  2**2
                   CONTENTS, ALLOC, LOAD, READONLY, CODE
-  4 .ispm_data    00000e40  04004860  060b4b60  000a8860  2**2
+  4 .ispm_data    00000e40  04004860  060b4a40  000a8860  2**2
                   CONTENTS, ALLOC, LOAD, DATA
   5 .sh0sr_data   00002060  f0000000  f0000000  000ac000  2**2
                   ALLOC
   6 .sh1sr_data   00004fa0  f0010000  f0010000  000ac000  2**2
                   ALLOC
-  7 .data         000010a0  080a0300  060b59a0  000aa300  2**2
+  7 .data         000010a0  080a01e0  060b5880  000aa1e0  2**2
                   CONTENTS, ALLOC, LOAD, DATA
   8 .flag_data    00000010  060bfff0  060bfff0  000abff0  2**0
                   CONTENTS, ALLOC, LOAD, READONLY, CODE
-  9 .bss          000985c0  080a13a0  060b6a40  000ab3a0  2**2
+  9 .bss          000985c0  080a1280  060b6920  000ab280  2**2
                   ALLOC
  10 .stb          00000040  0bc00000  0bc00000  000ac000  2**0
                   CONTENTS

diff --git a/output/module/cpu0.bin b/output/module/cpu0.bin
diff --git a/output/module/cpu0.or32 b/output/module/cpu0.or32
diff --git a/output/module/cpu1.bin b/output/module/cpu1.bin
diff --git a/output/module/cpu1.or32 b/output/module/cpu1.or32