From 3c01534f68fec378cec443fca3e61e84816f08d5 Mon Sep 17 00:00:00 2001 From: MEMEcatv Date: Thu, 2 Jan 2025 17:16:12 +0200 Subject: [PATCH 1/8] Update kernel.c New command prm --- kernel.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 48 insertions(+), 4 deletions(-) diff --git a/kernel.c b/kernel.c index ffd92a7..31ff4b4 100644 --- a/kernel.c +++ b/kernel.c @@ -89,7 +89,8 @@ enum Commands { REBOOT, - CLEAR + CLEAR, + TEST } Commands; void EverySecond(void) { @@ -400,7 +401,7 @@ void main(uint32 magic, struct multibootInfo* bootInfoArg) { uint32 (*program) (uint32, uint32) = (void*)(address); // Program definition - UGSMASCIIputString("Random OS --> "); + UGSMASCIIputString("RandomOS --> "); swap(); @@ -508,6 +509,7 @@ void main(uint32 magic, struct multibootInfo* bootInfoArg) { UGSMASCIIputString("\treboot --> Restarts the computer\n"); UGSMASCIIputString("\tclear --> Clears the console\n"); + UGSMASCIIputString("\tPRM --> print sysInfo\n"); } else if (command == ECHO) { @@ -603,8 +605,50 @@ void main(uint32 magic, struct multibootInfo* bootInfoArg) { reboot(); } + else if (command == PRM) + UGSMASCIIputString("0.0.9 global version \n"); + if (RAMSize.gigabytes != 0) { + foregroundColor = 0xffff00; + + putUX16Integer(RAMSize.gigabytes); + + foregroundColor = 0x00ff00; + + UGSMASCIIputString(" gigabytes\n"); + } + + if (RAMSize.megabytes != 0) { + foregroundColor = 0xffff00; + + putUX16Integer(RAMSize.megabytes); + + foregroundColor = 0x00ff00; + + UGSMASCIIputString(" megabytes\n"); + } + + if (RAMSize.kilobytes != 0) { + foregroundColor = 0xffff00; + + putUX16Integer(RAMSize.kilobytes); + + foregroundColor = 0x00ff00; + + UGSMASCIIputString(" kilobytes\n"); + } + + if (RAMSize.bytes != 0) { + foregroundColor = 0xffff00; + + putUX16Integer(RAMSize.bytes); + + foregroundColor = 0x00ff00; - else if (command == CLEAR) { + UGSMASCIIputString(" bytes\n"); + } + + } + else if (command == CLEAR) { clear(backgroundColor); EverySecond(); @@ -699,4 +743,4 @@ void main(uint32 magic, struct multibootInfo* bootInfoArg) { } for (;;); -} \ No newline at end of file +} From e5c0b68d920b8e3f01bb930ba7356a53b6fe560a Mon Sep 17 00:00:00 2001 From: MEMEcatv Date: Thu, 2 Jan 2025 17:52:49 +0200 Subject: [PATCH 2/8] Create Sysinfo.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Пустой H файл который будет использоваться для конфигурирования --- headers/Sysinfo.h | 1 + 1 file changed, 1 insertion(+) create mode 100644 headers/Sysinfo.h diff --git a/headers/Sysinfo.h b/headers/Sysinfo.h new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/headers/Sysinfo.h @@ -0,0 +1 @@ + From 5012dc97a321799b2029610fa60c6c4e20b0280f Mon Sep 17 00:00:00 2001 From: MEMEcatv Date: Thu, 2 Jan 2025 18:16:42 +0200 Subject: [PATCH 3/8] Update kernel.c --- kernel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel.c b/kernel.c index 31ff4b4..bf9ba3b 100644 --- a/kernel.c +++ b/kernel.c @@ -90,7 +90,7 @@ enum Commands { REBOOT, CLEAR, - TEST + SYSINFO } Commands; void EverySecond(void) { @@ -605,7 +605,7 @@ void main(uint32 magic, struct multibootInfo* bootInfoArg) { reboot(); } - else if (command == PRM) + else if (command == SYSINFO) UGSMASCIIputString("0.0.9 global version \n"); if (RAMSize.gigabytes != 0) { foregroundColor = 0xffff00; From b6c7092c75d312d983fcb2ecffe99f8ffdaadaad Mon Sep 17 00:00:00 2001 From: MEMEcatv Date: Thu, 2 Jan 2025 18:41:24 +0200 Subject: [PATCH 4/8] Create Config.ini --- Config.ini | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Config.ini diff --git a/Config.ini b/Config.ini new file mode 100644 index 0000000..0870286 --- /dev/null +++ b/Config.ini @@ -0,0 +1,2 @@ +defeat_console_textcolor = white +defeat_console_color = black From 760cecec2b289a38fc91a28d2261a442ff411659 Mon Sep 17 00:00:00 2001 From: MEMEcatv Date: Thu, 2 Jan 2025 18:49:03 +0200 Subject: [PATCH 5/8] Create Sysinfo.dat --- Sysinfo.dat | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 Sysinfo.dat diff --git a/Sysinfo.dat b/Sysinfo.dat new file mode 100644 index 0000000..efc1c7f --- /dev/null +++ b/Sysinfo.dat @@ -0,0 +1,9 @@ +#include kernel.c + #include filessystem.c +RAM -kernelinfo + sysdisc -filesystem + while true ( +if kernel edit sysinfo.dat + update + ) + From 4e8897ca628a61e4e3943a2dd06e2c9eb987c52d Mon Sep 17 00:00:00 2001 From: MEMEcatv Date: Thu, 2 Jan 2025 19:04:46 +0200 Subject: [PATCH 6/8] Update Sysinfo.dat --- Sysinfo.dat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Sysinfo.dat b/Sysinfo.dat index efc1c7f..42a78dd 100644 --- a/Sysinfo.dat +++ b/Sysinfo.dat @@ -2,8 +2,8 @@ #include filessystem.c RAM -kernelinfo sysdisc -filesystem - while true ( -if kernel edit sysinfo.dat + section .service + move data to void update - ) + From f25a86cbfb8caf12b6e6687d9f99f951ec4154d1 Mon Sep 17 00:00:00 2001 From: MEMEcatv Date: Thu, 2 Jan 2025 19:16:15 +0200 Subject: [PATCH 7/8] Create Service.RL --- Service.RL | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Service.RL diff --git a/Service.RL b/Service.RL new file mode 100644 index 0000000..d98f298 --- /dev/null +++ b/Service.RL @@ -0,0 +1,5 @@ +void main(){ +set service +if d2 service send ab0 + send to d2 "Code 07" + From 68f1f4df423c07844f0776728c807964386813db Mon Sep 17 00:00:00 2001 From: MEMEcatv Date: Thu, 2 Jan 2025 19:18:43 +0200 Subject: [PATCH 8/8] Create README.md --- README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..d5582c1 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +это изменённая версия операционной системы randomOS добавлены множество новых файлов