From a64eeadd97432f17d369a7386048d422182bb9c8 Mon Sep 17 00:00:00 2001
From: Tolik <85737314+Tolik-Trek@users.noreply.github.com>
Date: Fri, 28 Mar 2025 03:23:22 +1000
Subject: [PATCH] tests

---
 DSS/API/SetVMod.asm         |  3 +--
 DSS/KEYINTER.ASM            | 34 +++++++++++++++++-----------------
 SHELL/Commands/HELP.ASM     | 20 +++++++++++++++++---
 SHELL/Messages/main_txt.asm | 14 +++++++-------
 SHELL/build.txt             |  2 +-
 Shared_Includes             |  2 +-
 6 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/DSS/API/SetVMod.asm b/DSS/API/SetVMod.asm
index 46b49fc..da58ae6 100644
--- a/DSS/API/SetVMod.asm
+++ b/DSS/API/SetVMod.asm
@@ -171,7 +171,6 @@ PIC_320X256_1:
 ; Для буфера экрана исп. 2-я банка расширения ДОС.
 SAVETXT:	PUSH	AF
 		LD	A,(VMODE)
-		;BIT	7,A
 		CP	%1000'0000
 		JR	NC,.NOSAVET
 		SUB	#02
@@ -188,7 +187,7 @@ SAVETXT:	PUSH	AF
 		LD	(BACKTXT.CURS),DE
 		POP	AF
 		LD	IX,#C000
-		LD	HL,#2050	;!FIXIT если текстовое 40x32?
+		LD	HL,#2050
 		OR	A
 		JR	NZ,.SVTEXT1
 		LD	L,#28
diff --git a/DSS/KEYINTER.ASM b/DSS/KEYINTER.ASM
index 934dbf9..c3efc03 100644
--- a/DSS/KEYINTER.ASM
+++ b/DSS/KEYINTER.ASM
@@ -1096,29 +1096,29 @@ K_SND_W:	;DJNZ	K_RESET_BUFFER	;. [ ] 31/03/2024		subfunc 3 
 ; ;
 ;-----------------------------------------------------------------------
 
-
+;!FIXIT есть в биосе
+; DE - частота
+; HL - продолжительность
 BEEP:		LD	A,#10
-		OUT	(ZX_Beeper),A
-		LD	B,D
-		LD	C,E
-.loop1:		DEC	BC
-		LD	A,B
-		OR	C
-		JR	NZ,.loop1
-		XOR	A	;LD	A,#00
-		OUT	(ZX_Beeper),A
-		LD	B,D
-		LD	C,E
-.loop2:		DEC	BC
-		LD	A,B
-		OR	C
-		JR	NZ,.loop2
+		CALL	.beep_loop
+		; A = 0
+		CALL	.beep_loop
+		;
 		DEC	HL
 		LD	A,H
 		OR	L
 		JR	NZ,BEEP
 		RET
-;
+		;
+.beep_loop:	OUT	(ZX_Beeper),A
+		LD	B,D
+		LD	C,E
+		;
+.loop:		DEC	BC
+		LD	A,B
+		OR	C
+		JR	NZ,.loop
+		RET
 	
 KEYBOARD_INIT:	DI
 		; reg 0
diff --git a/SHELL/Commands/HELP.ASM b/SHELL/Commands/HELP.ASM
index 0dbe14e..b6e2535 100644
--- a/SHELL/Commands/HELP.ASM
+++ b/SHELL/Commands/HELP.ASM
@@ -3,6 +3,20 @@
 ; HELP. Вывод экрана помощи
 ;
 ;///////////////////////////////////////////////////
-cmd_help:
-	ld	de,MAIN_MSG.HELP	; индекс "COMMANDS: ..."
-	jp	ECHO_MESSAGE
+cmd_help:	LD	HL,.help_txt
+		LD	A,(color_screen)
+		EX	AF,AF'
+		XOR	A
+		LD	BC,BIOS.LP_PR_LINE_DIR
+		JP	ToBIOS			;!FIXIT тестовый вариант, переделать на DSS
+		;JP	ECHO_MESSAGE
+
+;				  1	    2	      3		4	  5	    6	      7		8
+;			01234567890123456789012345678901234567890123456789012345678901234567890123456789;
+.help_txt:	DB     "COMMANDS:\r\n"
+		DB     "SET  INFO       REN = RENAME    PATH    CLS [ink]\r\n"
+		DB     "CD = CHDIR      DEL = ERASE     HELP    VER = VERSION\r\n"
+		DB     "MD = MKDIR      TIME            ECHO    EXIT\r\n"
+		DZ     "RD = RMDIR      DATE            REBOOT  DIR [path] [/p /f]\r\n\n"
+;		;      ;	;	;	;	;	;	;	;	;	;	;							
+;
\ No newline at end of file
diff --git a/SHELL/Messages/main_txt.asm b/SHELL/Messages/main_txt.asm
index c9c7b0c..a28b21f 100644
--- a/SHELL/Messages/main_txt.asm
+++ b/SHELL/Messages/main_txt.asm
@@ -19,7 +19,7 @@ MAIN_MSG:
 .DIR_2		EQU .DIR_2_
 .DIR_3		EQU .DIR_3_
 .DIR_4		EQU .DIR_4_
-.HELP		EQU .HELP_
+;.HELP		EQU .HELP_
 .CALCULATING	EQU .CALC_
 .CRLF		EQU .CRLF_
 .INFO_1		EQU .INFO_1_
@@ -51,12 +51,12 @@ MAIN_MSG:
 		  DZ   "	%4 Dir(s)\r			   %5 byte(s) capacity\r\n"
  stN .DIR_4_	: DZ   "	Free space	   %5 byte(s)\r\n"
  stN .DIR_3_	: DZ   "%4  %5    %3  %1 %2  	\r\n"				;DATE TIME SIZE FILENAME EXT 
-		;!TODO печатать не через ECHO_MESSAGE
- stN .HELP_	: db   "COMMANDS:\r\n"
-		  db   "SET  INFO       REN = RENAME    PATH    CLS [ink]                               "
-		  db   "CD = CHDIR      DEL = ERASE     HELP    VER = VERSION                           "
-		  db   "MD = MKDIR      TIME            ECHO    EXIT                                    "
-		  DZ   "RD = RMDIR      DATE            REBOOT  DIR [path] [/p /f]                    \r\n\n"
+; 		;!TODO печатать не через ECHO_MESSAGE
+;  stN .HELP_	: db   "COMMANDS:\r\n"
+; 		  db   "SET  INFO       REN = RENAME    PATH    CLS [ink]                               "
+; 		  db   "CD = CHDIR      DEL = ERASE     HELP    VER = VERSION                           "
+; 		  db   "MD = MKDIR      TIME            ECHO    EXIT                                    "
+; 		  DZ   "RD = RMDIR      DATE            REBOOT  DIR [path] [/p /f]                    \r\n\n"
  stN .CALC_	: DZ   "Calculating free space...\r"
  stN .INFO_1_	: DZ   "\r\nDrive	File System	Label		Serial number	Size in bytes\r\n"
  stN .INFO_2_	: DZ   " %9          \r\t %8\r\t\t\t %7\r\t\t\t\t\t %4\r\t\t\t\t\t\t\t %5\r\n"
diff --git a/SHELL/build.txt b/SHELL/build.txt
index a6d80d5..941d0e5 100644
--- a/SHELL/build.txt
+++ b/SHELL/build.txt
@@ -1 +1 @@
-466
\ No newline at end of file
+479
\ No newline at end of file
diff --git a/Shared_Includes b/Shared_Includes
index 7c03abc..9143dcb 160000
--- a/Shared_Includes
+++ b/Shared_Includes
@@ -1 +1 @@
-Subproject commit 7c03abc82040df54cec2bc6701b0f602fa08fd26
+Subproject commit 9143dcb7f8fd9cd3ae0bc179b94fced5efd8667f