Skip to content

Commit

Permalink
Fix for file manager and more
Browse files Browse the repository at this point in the history
 - Changed sounds used by the sound command and error sound of TrashVIm to depper sounds.
 - Fixed VgaGotoPos not behaving correctly.
 - Updated READMEs images.
 - Fixed file manager writing error string outside of the screen.
  • Loading branch information
leo007er1 committed Jul 31, 2023
1 parent 5672ce5 commit 1522d82
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 11 deletions.
4 changes: 3 additions & 1 deletion Kernel/Screen/VGA.asm
Original file line number Diff line number Diff line change
Expand Up @@ -351,9 +351,11 @@ VgaGotoPos:
; (bh * VgaColumns + bl) * 2
xor ax, ax
xchg al, bh
mov dx, VgaColumns * 2
mov dx, VgaColumns
mul dx
add ax, bx
mov cl, 1
shl ax, cl

mov word [cs:CursorPos], ax
call VgaSetCursor
Expand Down
15 changes: 6 additions & 9 deletions Kernel/ShellCommands.asm
Original file line number Diff line number Diff line change
Expand Up @@ -258,13 +258,8 @@ TimeCmd:


SoundCmd:
mov bx, word 500
call PlaySound

mov cx, 0x1
mov dx, 0x3000
mov ah, 0x86
int 0x15
lea si, SoundPlayTrack
call PlayTrack

jmp GetCommand.AddNewLine

Expand Down Expand Up @@ -416,6 +411,8 @@ HelpText: db " clear = clears the terminal", NewLine, " ls = list all files",
" standby = put system in standby", NewLine, " fetch = show system info", NewLine, " colour = change screen colours", NewLine, " sound = test the pc speaker playing a sound", NewLine, " himom = ???", 0
HimomText: db "Mom: No one cares about you, honey", NewLine, "Thanks mom :(", 0

SoundPlayTrack: dw 6000, 6800, 6300, 5900, 5000, 0

TimeString: times 16 db 32
db 0

Expand All @@ -426,8 +423,8 @@ FetchLabel1: db "os ", 0
FetchLabel2: db "ver ", 0
FetchLabel3: db "ram ", 0
FetchText1: db "MascOS", 0
FetchText2: db "0.2.1", 0
FetchText3: db "21.86KB / " ; I'm a genious, I removed the 0 here so it prints FetchTextRam too
FetchText2: db "0.2.2", 0
FetchText3: db "19.41KB / " ; I'm a genious, I removed the 0 here so it prints FetchTextRam too
FetchTextRam: times 6 db 0
FetchLogo0: db " _ ,/| ", 0
FetchLogo1: db " '\`o.O' _", 0
Expand Down
3 changes: 3 additions & 0 deletions Programs/FileManager.asm
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ Start:


.CheckFile:
jmp .UnknownFile
lea di, TextFileExtension
; cl already set
call CheckFileExtension
Expand Down Expand Up @@ -153,8 +154,10 @@ Start:

.UnknownFile:
push bx
mov ah, 9
mov bx, word 0x1808
int 0x23
xor ah, ah
mov al, byte [AccentColour]
and al, 0xfc ; Red
Expand Down
2 changes: 1 addition & 1 deletion Programs/TrashVim.asm
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ ModeSelector:
int 0x23

xor ah, ah
mov bx, 600
mov bx, 3000
int 0x24

mov ah, byte 3
Expand Down
Binary file modified Showcase/MascOSShell.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 1522d82

Please sign in to comment.