diff --git a/bin/flash/admflash.binary b/bin/flash/admflash.binary index af8bdf5..88d900b 100644 Binary files a/bin/flash/admflash.binary and b/bin/flash/admflash.binary differ diff --git a/bin/flash/regflash.binary b/bin/flash/regflash.binary index efaaac1..4d9a85c 100644 Binary files a/bin/flash/regflash.binary and b/bin/flash/regflash.binary differ diff --git a/bin/sdcard/bel.sys b/bin/sdcard/bel.sys deleted file mode 100644 index dd797e3..0000000 Binary files a/bin/sdcard/bel.sys and /dev/null differ diff --git a/bin/sdcard/reg.sys b/bin/sdcard/reg.sys index d0a8791..27748fa 100644 Binary files a/bin/sdcard/reg.sys and b/bin/sdcard/reg.sys differ diff --git a/bin/sdcard/system/GREEN.COL b/bin/sdcard/system/GREEN.COL new file mode 100644 index 0000000..30cd71d Binary files /dev/null and b/bin/sdcard/system/GREEN.COL differ diff --git a/bin/sdcard/system/admay.adm b/bin/sdcard/system/admay.adm index 493cb6a..be2f862 100644 Binary files a/bin/sdcard/system/admay.adm and b/bin/sdcard/system/admay.adm differ diff --git a/bin/sdcard/system/admsys.adm b/bin/sdcard/system/admsys.adm index af8bdf5..88d900b 100644 Binary files a/bin/sdcard/system/admsys.adm and b/bin/sdcard/system/admsys.adm differ diff --git a/bin/sdcard/system/admtest.bin b/bin/sdcard/system/admtest.bin index 9fcb730..6a06f8c 100644 Binary files a/bin/sdcard/system/admtest.bin and b/bin/sdcard/system/admtest.bin differ diff --git a/bin/sdcard/system/basic.bin b/bin/sdcard/system/basic.bin deleted file mode 100644 index addf3ab..0000000 Binary files a/bin/sdcard/system/basic.bin and /dev/null differ diff --git a/bin/sdcard/system/bel.lib b/bin/sdcard/system/bel.lib index 5f090da..fd8181c 100644 --- a/bin/sdcard/system/bel.lib +++ b/bin/sdcard/system/bel.lib @@ -4,11 +4,10 @@ hex ifnot: lib:bel : lib:bel ; -ifnot: [b.w!] -: [b.w!] \ ( 16b -- ) - word an bellatrix senden - dup 8 rshift [b!] - [b!] ; - +ifnot: [b.w!] +: [b.w!] \ ( 16b -- ) - word an bellatrix senden + dup 8 rshift [b!] [b!] ; + \ kommandoformate ifnot: bel:fkt! \ ( fkt -- ) @@ -80,78 +79,3 @@ ifnot: bel:load \ ( cstr -- ) - bellatrix-code laden -hex - -ifnot: lib:bel -: lib:bel ; - -\ kommandoformate - -ifnot: bel:fkt! \ ( fkt -- ) -: bel:fkt! b[ 0 [b!] [b!] ]b ; - -ifnot: bel:fkt!b! \ ( b fkt -- ) -: bel:fkt!b! b[ 0 [b!] [b!] [b!] ]b ; - -ifnot: bel:fkt!b!l@ \ ( b fkt -- l ) -: bel:fkt!b!l@ b[ 0 [b!] [b!] [b!] [b.l@] ]b ; - -ifnot: bel:fkt!b!l! \ ( l b fkt -- ) -: bel:fkt!b!l! b[ 0 [b!] [b!] [b!] [b.l!] ]b ; - -ifnot: bel:fkt!l@ \ ( fkt -- l ) -: bel:fkt!l@ b[ 0 [b!] [b!] [b.l@] ]b ; - -ifnot: bel:fkt!b@ \ ( fkt -- b ) -: bel:fkt!b@ b[ 0 [b!] [b!] [b@] ]b ; - -\ chipmanagment-funktionen - -ifnot: bel:wscr \ ( scrnr -- ) - schreibscreen setzen -: bel:wscr 58 bel:fkt!b! ; - -ifnot: bel:dscr \ ( scrnr -- ) - displayscreen setzen -: bel:dscr 59 bel:fkt!b! ; - -ifnot: bel:getcol \ ( colnr -- col ) - farbe abfragen -: bel:getcol 5A bel:fkt!b!l@ ; - -ifnot: bel:setcol \ ( col colnr -- ) - farbe setzen -: bel:setcol 5B bel:fkt!b!l! ; - -ifnot: bel:getresx \ ( -- resx ) - abfrage x-auflösung -: bel:getresx 5C bel:fkt!l@ ; - -ifnot: bel:getresy \ ( -- resy ) - abfrage y-auflösung -: bel:getresy 5D bel:fkt!l@ ; - -ifnot: bel:getcols \ ( -- cols ) - abfrage textspalten -: bel:getcols 5E bel:fkt!b@ ; - -ifnot: bel:getrows \ ( -- rows ) - abfrage textzeilen -: bel:getrows 5F bel:fkt!b@ ; - -ifnot: bel:getcogs \ ( -- cogs ) - abfrage belegte cogs -: bel:getcogs 60 bel:fkt!b@ ; - -ifnot: bel:getspec \ ( -- spec ) - abfrage codespezifikation -: bel:getspec 61 bel:fkt!l@ ; - -ifnot: bel:getver \ ( -- ver ) - abfrage codeversion -: bel:getver 62 bel:fkt!l@ ; - -ifnot: bel:load \ ( cstr -- ) - bellatrix-code laden -: bel:load - 52 adm:open .err \ datei öffnen - b[ - 0 [b!] 57 [b!] \ bella-loader starten - 10 0 do 06 [a!] [a@] [b!] loop \ header einlesen - 0A [a!] 0 [a.l!] \ 0 adm:seek - [b@] <8 [b@] or \ dateilänge empfangen - 0 do 06 [a!] [a@] [b!] loop \ datei senden - ]b - adm:close .err \ datei schließen -; - - - diff --git a/bin/sdcard/system/beltest.bin b/bin/sdcard/system/beltest.bin index 97ab502..47e6385 100644 Binary files a/bin/sdcard/system/beltest.bin and b/bin/sdcard/system/beltest.bin differ diff --git a/bin/sdcard/system/charmap.bin b/bin/sdcard/system/charmap.bin index 534733e..229fac1 100644 Binary files a/bin/sdcard/system/charmap.bin and b/bin/sdcard/system/charmap.bin differ diff --git a/bin/sdcard/system/eram.bin b/bin/sdcard/system/eram.bin index e7bc9ab..d96425f 100644 Binary files a/bin/sdcard/system/eram.bin and b/bin/sdcard/system/eram.bin differ diff --git a/system/regnatix/eram.txt b/bin/sdcard/system/eram.man similarity index 100% rename from system/regnatix/eram.txt rename to bin/sdcard/system/eram.man diff --git a/bin/sdcard/system/flash.bin b/bin/sdcard/system/flash.bin index 3adea41..6b50bcb 100644 Binary files a/bin/sdcard/system/flash.bin and b/bin/sdcard/system/flash.bin differ diff --git a/system/regnatix/flash.txt b/bin/sdcard/system/flash.man similarity index 100% rename from system/regnatix/flash.txt rename to bin/sdcard/system/flash.man diff --git a/bin/sdcard/system/fterm.bin b/bin/sdcard/system/fterm.bin index cfd4114..96ab3dd 100644 Binary files a/bin/sdcard/system/fterm.bin and b/bin/sdcard/system/fterm.bin differ diff --git a/bin/sdcard/system/g0.lib b/bin/sdcard/system/g0.lib new file mode 100644 index 0000000..7a3893b --- /dev/null +++ b/bin/sdcard/system/g0.lib @@ -0,0 +1,59 @@ +\ require ari.lib + +ifnot: lib:g0 +: lib:g0 ; + +hex + +10 constant g0:xtiles +0C constant g0:ytiles +5000 constant g0:disp_base + +decimal + +ifnot: g0:load +: g0:load + c" g0key.bel" bel:load ; + +ifnot: g0:reboot +: g0:reboot 99 b[ [b!] ]b ; + +hex + +ifnot: g0:setcolortab +: g0:setcolortab \ ( addr -- ) + 5D b[ [b!] + 40 0 do dup L@ [b.l!] 4 + loop + ]b drop ; + +ifnot: g0:settilescreen +: g0:settilescreen \ ( addr -- ) + 5E b[ [b!] + g0:ytiles 0 do + g0:xtiles 0 do dup W@ [b.w!] 2 + loop + loop ]b drop ; + +decimal + +\ ifnot: g0:setscreen +: g0:setscreen \ ( addr addr -- ) + g0:setcolortab g0:settilescreen ; + +ifnot: g0:static +: g0:static 98 b[ [b!] ]b ; + +ifnot: g0:dynamic +: g0:dynamic 97 b[ [b!] ]b ; + +ifnot: g0:clear \ ( -- ) - bildschirm loeschen +: g0:clear 10 b[ [b!] ]b ; + +ifnot: g0:color \ ( color -- ) - zeichenfarbe setzen +: g0:color 12 b[ [b!] [b!] ]b ; + +ifnot: g0:width \ ( x -- ) - punktgroesse setzen +: g0:width 13 b[ [b!] [b!] ]b ; + +ifnot: g0:plot \ ( y x -- ) - punkt setzen +: g0:plot 15 b[ [b!] [b!] [b!] ]b ] ; + diff --git a/bin/sdcard/system/g0test.bin b/bin/sdcard/system/g0test.bin index 82d10b2..06517b8 100644 Binary files a/bin/sdcard/system/g0test.bin and b/bin/sdcard/system/g0test.bin differ diff --git a/bin/sdcard/system/hplay.bin b/bin/sdcard/system/hplay.bin index a43a9e0..86f3fad 100644 Binary files a/bin/sdcard/system/hplay.bin and b/bin/sdcard/system/hplay.bin differ diff --git a/system/regnatix/hplay.txt b/bin/sdcard/system/hplay.man similarity index 100% rename from system/regnatix/hplay.txt rename to bin/sdcard/system/hplay.man diff --git a/bin/sdcard/system/keycode.bin b/bin/sdcard/system/keycode.bin index d264811..d86abb6 100644 Binary files a/bin/sdcard/system/keycode.bin and b/bin/sdcard/system/keycode.bin differ diff --git a/bin/sdcard/system/man.bin b/bin/sdcard/system/man.bin new file mode 100644 index 0000000..a7fabc7 Binary files /dev/null and b/bin/sdcard/system/man.bin differ diff --git a/bin/sdcard/system/perplex.bin b/bin/sdcard/system/perplex.bin deleted file mode 100644 index e300fc0..0000000 Binary files a/bin/sdcard/system/perplex.bin and /dev/null differ diff --git a/bin/sdcard/system/ramtest.bin b/bin/sdcard/system/ramtest.bin index a3332b9..97b6f38 100644 Binary files a/bin/sdcard/system/ramtest.bin and b/bin/sdcard/system/ramtest.bin differ diff --git a/bin/sdcard/system/regime.bin b/bin/sdcard/system/regime.bin index d0a8791..27748fa 100644 Binary files a/bin/sdcard/system/regime.bin and b/bin/sdcard/system/regime.bin differ diff --git a/system/regnatix/regime.txt b/bin/sdcard/system/regime.man similarity index 89% rename from system/regnatix/regime.txt rename to bin/sdcard/system/regime.man index 49e8fbf..7861b22 100644 --- a/system/regnatix/regime.txt +++ b/bin/sdcard/system/regime.man @@ -51,7 +51,7 @@ hplay - hss-player wplay - wav-player sfxtool - hss-soundeffekte erstellen -vga.bin - vga 1024 x 768 pixel, 64 x 24 zeichen -htext.bin - vga 1024 x 768 pixel, 128 x 48 zeichen -tv.bin - tv-textmodus 40 x 13 zeichen +vga.bel - vga 1024 x 768 pixel, 64 x 24 zeichen +htext.bel - vga 1024 x 768 pixel, 128 x 48 zeichen +tv.bel - tv-textmodus 40 x 13 zeichen diff --git a/bin/sdcard/system/rom.bin b/bin/sdcard/system/rom.bin index 0275d7d..3a8c35d 100644 Binary files a/bin/sdcard/system/rom.bin and b/bin/sdcard/system/rom.bin differ diff --git a/bin/sdcard/system/sfxtool.bin b/bin/sdcard/system/sfxtool.bin index 8d4cd83..9ce74a6 100644 Binary files a/bin/sdcard/system/sfxtool.bin and b/bin/sdcard/system/sfxtool.bin differ diff --git a/bin/sdcard/system/splay.bin b/bin/sdcard/system/splay.bin index 828f956..172e2a6 100644 Binary files a/bin/sdcard/system/splay.bin and b/bin/sdcard/system/splay.bin differ diff --git a/system/regnatix/splay.txt b/bin/sdcard/system/splay.man similarity index 100% rename from system/regnatix/splay.txt rename to bin/sdcard/system/splay.man diff --git a/bin/sdcard/system/sysconf.bin b/bin/sdcard/system/sysconf.bin index 7903e20..f364f10 100644 Binary files a/bin/sdcard/system/sysconf.bin and b/bin/sdcard/system/sysconf.bin differ diff --git a/system/regnatix/sysconf.txt b/bin/sdcard/system/sysconf.man similarity index 100% rename from system/regnatix/sysconf.txt rename to bin/sdcard/system/sysconf.man diff --git a/bin/sdcard/system/time.bin b/bin/sdcard/system/time.bin index b203dc2..bfc62f3 100644 Binary files a/bin/sdcard/system/time.bin and b/bin/sdcard/system/time.bin differ diff --git a/bin/sdcard/system/tpix.f b/bin/sdcard/system/tpix.f new file mode 100644 index 0000000..51ed898 --- /dev/null +++ b/bin/sdcard/system/tpix.f @@ -0,0 +1,48 @@ +\ requires bel.lib +\ requires g0.lib +\ requires ari.lib + +hex + +: it ; \ fuer forget + +variable colortab 40 4* 4 - allot +variable tiletab g0:xtiles g0:ytiles * 2* 4 - allot + +: fillcolortab + colortab + 40 0 do + i dup + 4 + 0F and 00001010 * 0D060D02 + + over L! 4+ + loop drop +; + +: filltilescreen + tiletab g0:disp_base 6 rshift + g0:ytiles 0 do + g0:xtiles 0 do + swap 2dup W! 2+ swap g0:ytiles + + loop 341 + + loop 2drop ; + +decimal + +: setscreen + fillcolortab filltilescreen + tiletab colortab g0:setscreen +; + +: tpix + g0:load setscreen g0:static + g0:clear 14 g0:width 1 g0:color + g0:xtiles 0 do i 16 * 8 + + g0:ytiles 0 do i 16 * 8 + over g0:plot loop drop + loop + key g0:clear + 2000 0 do + rnd 31 and g0:width rnd 3 and g0:color + rnd rnd g0:plot + loop + key g0:reboot + cr ." erledigt" cr +; diff --git a/bin/sdcard/system/win.lib b/bin/sdcard/system/win.lib new file mode 100644 index 0000000..e3d521b --- /dev/null +++ b/bin/sdcard/system/win.lib @@ -0,0 +1,49 @@ + +hex + +ifnot: lib:win +: lib:win ; + +\ kommandoformate + +ifnot: bel:char \ ( b -- ) +: bel:char b[ [b!] ]b ; +ifnot: bel:fkt! \ ( fkt -- ) +: bel:fkt! b[ 0 [b!] [b!] ]b ; +ifnot: bel:fkt!b! \ ( b fkt -- ) +: bel:fkt!b! b[ 0 [b!] [b!] [b!] ]b ; +ifnot: bel:fkt!b@ \ ( fkt -- b ) +: bel:fkt!b@ b[ 0 [b!] [b!] [b@] ]b ; +ifnot: bel:fkt!b!b! \ ( b b fkt -- ) +: bel:fkt!b!b! b[ 0 [b!] [b!] [b!] [b!] ]b ; +ifnot: bel:fkt!5b! \ ( b b b b b fkt -- ) +: bel:fkt!5b! b[ 0 [b!] [b!] [b!] [b!] [b!] [b!] [b!] ]b ; +ifnot: bel:ctrl! \ ( ctrl -- ) +: bel:ctrl! b[ 0 [b!] 3 [b!] [b!] ]b ; +ifnot: bel:ctrl!b! \ ( b ctrl -- ) +: bel:ctrl!b! b[ 0 [b!] 3 [b!] [b!] [b!] ]b ; +ifnot: bel:ctrl!b@ \ ( ctrl -- b@ ) +: bel:ctrl!b@ b[ 0 [b!] 3 [b!] [b!] [b@] ]b ; +ifnot: bel:ctrl!b!b! \ ( b b ctrl -- ) +: bel:ctrl!b!b! b[ 0 [b!] 3 [b!] [b!] [b!] [b!] [b!] ]b ; + + +\ fensterfunktionen + +ifnot: win:define \ ( yn xn y0 x0 w ) - fenster definieren +: win:define + 50 bel:fkt!5b! ; + +ifnot: win:set \ ( w -- ) - fenster auswählen +: win:set 52 bel:fkt!b! ; + +ifnot: win:getcols \ ( -- cols ) - anzahl spalten im fenster abfragen +: win:getcols 54 bel:fkt!b@ ; + +ifnot: win:getrows \ ( -- rows ) - anzahl zeilen im fenster abfragen +: win:getrows 55 bel:fkt!b@ ; + +ifnot: win:oframe \ ( -- ) - rahmen um fenster zeichnen +: win:oframe 56 bel:fkt! ; + + diff --git a/bin/sdcard/system/wplay.bin b/bin/sdcard/system/wplay.bin index 69b48b5..f6caa6f 100644 Binary files a/bin/sdcard/system/wplay.bin and b/bin/sdcard/system/wplay.bin differ diff --git a/system/regnatix/wplay.txt b/bin/sdcard/system/wplay.man similarity index 100% rename from system/regnatix/wplay.txt rename to bin/sdcard/system/wplay.man diff --git a/bin/sdcard/system/yplay.bin b/bin/sdcard/system/yplay.bin index 5d01fbe..09170de 100644 Binary files a/bin/sdcard/system/yplay.bin and b/bin/sdcard/system/yplay.bin differ diff --git a/system/regnatix/yplay.txt b/bin/sdcard/system/yplay.man similarity index 100% rename from system/regnatix/yplay.txt rename to bin/sdcard/system/yplay.man diff --git a/flash/administra/admflash.spin b/flash/administra/admflash.spin index edb27df..20300f5 100644 Binary files a/flash/administra/admflash.spin and b/flash/administra/admflash.spin differ diff --git a/flash/regnatix/regflash.spin b/flash/regnatix/regflash.spin index a263ea8..24089db 100644 Binary files a/flash/regnatix/regflash.spin and b/flash/regnatix/regflash.spin differ diff --git a/forth/bel.lib b/forth/bel.lib index 5f090da..fd8181c 100644 --- a/forth/bel.lib +++ b/forth/bel.lib @@ -4,11 +4,10 @@ hex ifnot: lib:bel : lib:bel ; -ifnot: [b.w!] -: [b.w!] \ ( 16b -- ) - word an bellatrix senden - dup 8 rshift [b!] - [b!] ; - +ifnot: [b.w!] +: [b.w!] \ ( 16b -- ) - word an bellatrix senden + dup 8 rshift [b!] [b!] ; + \ kommandoformate ifnot: bel:fkt! \ ( fkt -- ) @@ -80,78 +79,3 @@ ifnot: bel:load \ ( cstr -- ) - bellatrix-code laden -hex - -ifnot: lib:bel -: lib:bel ; - -\ kommandoformate - -ifnot: bel:fkt! \ ( fkt -- ) -: bel:fkt! b[ 0 [b!] [b!] ]b ; - -ifnot: bel:fkt!b! \ ( b fkt -- ) -: bel:fkt!b! b[ 0 [b!] [b!] [b!] ]b ; - -ifnot: bel:fkt!b!l@ \ ( b fkt -- l ) -: bel:fkt!b!l@ b[ 0 [b!] [b!] [b!] [b.l@] ]b ; - -ifnot: bel:fkt!b!l! \ ( l b fkt -- ) -: bel:fkt!b!l! b[ 0 [b!] [b!] [b!] [b.l!] ]b ; - -ifnot: bel:fkt!l@ \ ( fkt -- l ) -: bel:fkt!l@ b[ 0 [b!] [b!] [b.l@] ]b ; - -ifnot: bel:fkt!b@ \ ( fkt -- b ) -: bel:fkt!b@ b[ 0 [b!] [b!] [b@] ]b ; - -\ chipmanagment-funktionen - -ifnot: bel:wscr \ ( scrnr -- ) - schreibscreen setzen -: bel:wscr 58 bel:fkt!b! ; - -ifnot: bel:dscr \ ( scrnr -- ) - displayscreen setzen -: bel:dscr 59 bel:fkt!b! ; - -ifnot: bel:getcol \ ( colnr -- col ) - farbe abfragen -: bel:getcol 5A bel:fkt!b!l@ ; - -ifnot: bel:setcol \ ( col colnr -- ) - farbe setzen -: bel:setcol 5B bel:fkt!b!l! ; - -ifnot: bel:getresx \ ( -- resx ) - abfrage x-auflösung -: bel:getresx 5C bel:fkt!l@ ; - -ifnot: bel:getresy \ ( -- resy ) - abfrage y-auflösung -: bel:getresy 5D bel:fkt!l@ ; - -ifnot: bel:getcols \ ( -- cols ) - abfrage textspalten -: bel:getcols 5E bel:fkt!b@ ; - -ifnot: bel:getrows \ ( -- rows ) - abfrage textzeilen -: bel:getrows 5F bel:fkt!b@ ; - -ifnot: bel:getcogs \ ( -- cogs ) - abfrage belegte cogs -: bel:getcogs 60 bel:fkt!b@ ; - -ifnot: bel:getspec \ ( -- spec ) - abfrage codespezifikation -: bel:getspec 61 bel:fkt!l@ ; - -ifnot: bel:getver \ ( -- ver ) - abfrage codeversion -: bel:getver 62 bel:fkt!l@ ; - -ifnot: bel:load \ ( cstr -- ) - bellatrix-code laden -: bel:load - 52 adm:open .err \ datei öffnen - b[ - 0 [b!] 57 [b!] \ bella-loader starten - 10 0 do 06 [a!] [a@] [b!] loop \ header einlesen - 0A [a!] 0 [a.l!] \ 0 adm:seek - [b@] <8 [b@] or \ dateilänge empfangen - 0 do 06 [a!] [a@] [b!] loop \ datei senden - ]b - adm:close .err \ datei schließen -; - - - diff --git a/forth/work/bload.f b/forth/work/bload.f deleted file mode 100644 index 8eee6eb..0000000 --- a/forth/work/bload.f +++ /dev/null @@ -1,23 +0,0 @@ - -fl - -hex - -\ metafunktionen - -: (bload) \ ( cstr -- ) - belatrix-code laden - - 52 adm:open .err \ datei öffnen - b[ - 0 [b!] 63 [b!] \ bella-loader starten - 10 0 do 06 [a!] [a@] [b!] loop \ header einlesen - 0A [a!] 0 [a.l!] \ 0 adm:seek - [b@] <8 [b@] or \ dateilänge empfangen - 0 do 06 [a!] [a@] [b!] loop \ datei senden - ]b - adm:close .err \ datei schließen -; - -: bload \ name ( -- ) - bellatrix-code laden - parsenw (bload) ; - diff --git a/lib/adm-com.spin b/lib/adm-com.spin new file mode 100644 index 0000000..f6165e0 --- /dev/null +++ b/lib/adm-com.spin @@ -0,0 +1,334 @@ +'' Singleton version of: +'' +''******************************************** +''* Full-Duplex Serial Driver v1.2 * +''* Author: Chip Gracey, Jeff Martin * +''* Copyright (c) 2006-2009 Parallax, Inc. * +''* See end of file for terms of use. * +''******************************************** + +{-----------------REVISION HISTORY----------------- + v1.2 - 5/7/2009 fixed bug in dec method causing largest negative value (-2,147,483,648) to be output as -0. + v1.1 - 3/1/2006 first official release. +} +CON EOL = $a +CON CR = $d + +VAR + + long cog 'cog flag/id + +DAT + + rx_head long 0 '9 contiguous longs + rx_tail long 0 + tx_head long 0 + tx_tail long 0 + rx_pin long 0 + tx_pin long 0 + rxtx_mode long 0 + bit_ticks long 0 + buffer_ptr long 0 + + rx_buffer byte 0 [16] 'transmit and receive buffers + tx_buffer byte 0 [16] + + +PUB start(rxpin, txpin, mode, baudrate) : okay + +'' Start serial driver - starts a cog +'' returns false if no cog available +'' +'' mode bit 0 = invert rx +'' mode bit 1 = invert tx +'' mode bit 2 = open-drain/source tx +'' mode bit 3 = ignore tx echo on rx + + stop + longfill(@rx_head, 0, 4) + longmove(@rx_pin, @rxpin, 3) + bit_ticks := clkfreq / baudrate + buffer_ptr := @rx_buffer + okay := cog := cognew(@entry, @rx_head) + 1 + + +PUB stop + +'' Stop serial driver - frees a cog + + if cog + cogstop(cog~ - 1) + longfill(@rx_head, 0, 9) + + +PUB rxflush + +'' Flush receive buffer + + repeat while rxcheck => 0 + +PUB rxready + return rx_tail <> rx_head + +PUB rxcheck : rxbyte + +'' Check if byte received (never waits) +'' returns -1 if no byte received, $00..$FF if byte + + rxbyte-- + if rx_tail <> rx_head + rxbyte := rx_buffer[rx_tail] + rx_tail := (rx_tail + 1) & $F + + +PUB rxtime(ms) : rxbyte | t + +'' Wait ms milliseconds for a byte to be received +'' returns -1 if no byte received, $00..$FF if byte + + t := cnt + repeat until (rxbyte := rxcheck) => 0 or (cnt - t) / (clkfreq / 1000) > ms + + +PUB rx : rxbyte + +'' Receive byte (may wait for byte) +'' returns $00..$FF + + repeat while (rxbyte := rxcheck) < 0 + +PUB out(txbyte) + tx(txbyte) + +PUB tx(txbyte) + + if txbyte == EOL + tx(CR) + +'' Send byte (may wait for room in buffer) + + repeat until (tx_tail <> (tx_head + 1) & $F) + tx_buffer[tx_head] := txbyte + tx_head := (tx_head + 1) & $F + + if rxtx_mode & %1000 + rx + + +PUB str(stringptr) + +'' Send string + + repeat while byte[stringptr] + tx(byte[stringptr++]) + + +PUB dec(value) | i, x + +'' Print a decimal number + + x := value == NEGX 'Check for max negative + if value < 0 + value := ||(value+x) 'If negative, make positive; adjust for max negative + tx("-") 'and output sign + + i := 1_000_000_000 'Initialize divisor + + repeat 10 'Loop for 10 digits + if value => i + tx(value / i + "0" + x*(i == 1)) 'If non-zero digit, output digit; adjust for max negative + value //= i 'and digit from value + result~~ 'flag non-zero found + elseif result or i == 1 + tx("0") 'If zero digit (or only digit) output it + i /= 10 'Update divisor + + +PUB hex(value, digits) + +'' Print a hexadecimal number + + value <<= (8 - digits) << 2 + repeat digits + tx(lookupz((value <-= 4) & $F : "0".."9", "A".."F")) + + +PUB bin(value, digits) + +'' Print a binary number + + value <<= 32 - digits + repeat digits + tx((value <-= 1) & 1 + "0") + + +DAT + +'*********************************** +'* Assembly language serial driver * +'*********************************** + + org +' +' +' Entry +' +entry mov t1,par 'get structure address + add t1,#4 << 2 'skip past heads and tails + + rdlong t2,t1 'get rx_pin + mov rxmask,#1 + shl rxmask,t2 + + add t1,#4 'get tx_pin + rdlong t2,t1 + mov txmask,#1 + shl txmask,t2 + + add t1,#4 'get rxtx_mode + rdlong rxtxmode,t1 + + add t1,#4 'get bit_ticks + rdlong bitticks,t1 + + add t1,#4 'get buffer_ptr + rdlong rxbuff,t1 + mov txbuff,rxbuff + add txbuff,#16 + + test rxtxmode,#%100 wz 'init tx pin according to mode + test rxtxmode,#%010 wc + if_z_ne_c or outa,txmask + if_z or dira,txmask + + mov txcode,#transmit 'initialize ping-pong multitasking +' +' +' Receive +' +receive jmpret rxcode,txcode 'run a chunk of transmit code, then return + + test rxtxmode,#%001 wz 'wait for start bit on rx pin + test rxmask,ina wc + if_z_eq_c jmp #receive + + mov rxbits,#9 'ready to receive byte + mov rxcnt,bitticks + shr rxcnt,#1 + add rxcnt,cnt + +:bit add rxcnt,bitticks 'ready next bit period + +:wait jmpret rxcode,txcode 'run a chuck of transmit code, then return + + mov t1,rxcnt 'check if bit receive period done + sub t1,cnt + cmps t1,#0 wc + if_nc jmp #:wait + + test rxmask,ina wc 'receive bit on rx pin + rcr rxdata,#1 + djnz rxbits,#:bit + + shr rxdata,#32-9 'justify and trim received byte + and rxdata,#$FF + test rxtxmode,#%001 wz 'if rx inverted, invert byte + if_nz xor rxdata,#$FF + + rdlong t2,par 'save received byte and inc head + add t2,rxbuff + wrbyte rxdata,t2 + sub t2,rxbuff + add t2,#1 + and t2,#$0F + wrlong t2,par + + jmp #receive 'byte done, receive next byte +' +' +' Transmit +' +transmit jmpret txcode,rxcode 'run a chunk of receive code, then return + + mov t1,par 'check for head <> tail + add t1,#2 << 2 + rdlong t2,t1 + add t1,#1 << 2 + rdlong t3,t1 + cmp t2,t3 wz + if_z jmp #transmit + + add t3,txbuff 'get byte and inc tail + rdbyte txdata,t3 + sub t3,txbuff + add t3,#1 + and t3,#$0F + wrlong t3,t1 + + or txdata,#$100 'ready byte to transmit + shl txdata,#2 + or txdata,#1 + mov txbits,#11 + mov txcnt,cnt + +:bit test rxtxmode,#%100 wz 'output bit on tx pin according to mode + test rxtxmode,#%010 wc + if_z_and_c xor txdata,#1 + shr txdata,#1 wc + if_z muxc outa,txmask + if_nz muxnc dira,txmask + add txcnt,bitticks 'ready next cnt + +:wait jmpret txcode,rxcode 'run a chunk of receive code, then return + + mov t1,txcnt 'check if bit transmit period done + sub t1,cnt + cmps t1,#0 wc + if_nc jmp #:wait + + djnz txbits,#:bit 'another bit to transmit? + + jmp #transmit 'byte done, transmit next byte +' +' +' Uninitialized data +' +t1 res 1 +t2 res 1 +t3 res 1 + +rxtxmode res 1 +bitticks res 1 + +rxmask res 1 +rxbuff res 1 +rxdata res 1 +rxbits res 1 +rxcnt res 1 +rxcode res 1 + +txmask res 1 +txbuff res 1 +txdata res 1 +txbits res 1 +txcnt res 1 +txcode res 1 + +{{ + ++------------------------------------------------------------------------------------------------------------------------------+ +¦ TERMS OF USE: MIT License ¦ ++------------------------------------------------------------------------------------------------------------------------------¦ +¦Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation ¦ +¦files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, ¦ +¦modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software¦ +¦is furnished to do so, subject to the following conditions: ¦ +¦ ¦ +¦The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.¦ +¦ ¦ +¦THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE ¦ +¦WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR ¦ +¦COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ¦ +¦ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ¦ ++------------------------------------------------------------------------------------------------------------------------------+ +}} diff --git a/lib/reg-ios.spin b/lib/reg-ios.spin index df944a7..36ccd1d 100644 Binary files a/lib/reg-ios.spin and b/lib/reg-ios.spin differ diff --git a/logbuch.txt b/logbuch.txt index 9978c03..0511379 100644 --- a/logbuch.txt +++ b/logbuch.txt @@ -1,6 +1,34 @@ -20.02.2013 dr235/u-held +r54 - 15-04-2013-dr235: -r53: +flash\admflash.spin +- grundlegende com-funktionen eingefügt + +lib\reg-ios.spin +- com-funktionen +- ios.screeninit: kein logo im v-modus + +system\administra\admay\admay.spin +- sd_dmput eingefügt +- sd_eof eingefügt + +system\regnatix\admtest.spin +- korrektur bei fehlerhaftem screeninit + +system\regnatix\beltest.spin +- menü eingefügt um einzelnen tests auszuführen +- anpassung an tv-modus +- neuer test für fensterfunktionen + +system\regnatix +- tool man eingefügt +- umstrukturierung aller tool-hilfen an man +- anpassung der meisten tools an tv-modus + +system\sonstiges +- man-hilfetexte eingefügt + + +r53 - 20.02.2013 dr235/u-held: flash\admflash.spin - scr-funktionen ausgefügt diff --git a/make.bat b/make.bat index e428253..00c3a6e 100644 --- a/make.bat +++ b/make.bat @@ -38,19 +38,14 @@ move tv.bel %sd-sys% move regflash.binary %flash% REM ---------------------------------------------------------------- -REM Startdateien erzeugen +REM Startdateie erzeugen REM reg.sys (Regime) -REM bel.sys (VGA) REM --> \bin\sdcard\ %BSTC% -L %libpath% -b -O a .\system\regnatix\regime.spin rename regime.binary reg.sys move reg.sys %sd% -REM %BSTC% -L %libpath% -b -O a .\flash\bellatrix\belflash.spin -REM rename belflash.binary bel.sys -REM move bel.sys %sd% -copy %flash%\belflash.binary %sd%\bel.sys REM ---------------------------------------------------------------- REM Slave-Dateien erzeugen diff --git a/make.log b/make.log index 742b50c..e8801f7 100644 --- a/make.log +++ b/make.log @@ -1,9 +1,9 @@ H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>date /T -20.02.2013 +14.04.2013 H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>time /T -19:07 +19:47 H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>REM Pfade @@ -42,9 +42,10 @@ Loading Object adm-rtc.spin Loading Object adm-hss Loading Object adm-wav Loading Object adm-rtc -Program size is 12732 longs +Loading Object adm-com +Program size is 13392 longs 2 Constants folded -Compiled 2491 Lines of Code in 0,237 Seconds +Compiled 2690 Lines of Code in 0,363 Seconds H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>copy admflash.binary ".\bin\flash" 1 Datei(en) kopiert. @@ -64,7 +65,7 @@ Loading Object bel-keyb Loading Object bel-bus Program size is 7612 longs 25 Constants folded -Compiled 1328 Lines of Code in 0,141 Seconds +Compiled 1328 Lines of Code in 0,244 Seconds H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>copy belflash.binary ".\bin\flash" 1 Datei(en) kopiert. @@ -84,7 +85,7 @@ Loading Object bel-keyb Loading Object bel-bus Program size is 7656 longs 27 Constants folded -Compiled 1383 Lines of Code in 0,112 Seconds +Compiled 1383 Lines of Code in 0,181 Seconds H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>rename belflash.binary tv.bel @@ -96,19 +97,17 @@ Brads Spin Tool Compiler v0.15.3 - Copyright 2008,2009 All rights reserved Compiled for i386 Win32 at 08:17:48 on 2009/07/20 Loading Object regflash Program size is 32580 longs -Compiled 694 Lines of Code in 0,198 Seconds +Compiled 695 Lines of Code in 0,204 Seconds H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>move regflash.binary ".\bin\flash" 1 Datei(en) verschoben. H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>REM ---------------------------------------------------------------- -H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>REM Startdateien erzeugen +H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>REM Startdateie erzeugen H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>REM reg.sys (Regime) -H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>REM bel.sys (VGA) - H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>REM --> \bin\sdcard\ H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>bstc.exe -L ".\lib" -b -O a .\system\regnatix\regime.spin @@ -118,24 +117,15 @@ Loading Object regime Loading Object reg-ios Loading Object glob-con Loading Object glob-string -Program size is 9372 longs +Program size is 9576 longs 2 Constants folded -Compiled 2594 Lines of Code in 0,189 Seconds +Compiled 2590 Lines of Code in 0,186 Seconds H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>rename regime.binary reg.sys H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>move reg.sys ".\bin\sdcard" 1 Datei(en) verschoben. -H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>REM bstc.exe -L ".\lib" -b -O a .\flash\bellatrix\belflash.spin - -H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>REM rename belflash.binary bel.sys - -H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>REM move bel.sys ".\bin\sdcard" - -H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>copy ".\bin\flash"\belflash.binary ".\bin\sdcard"\bel.sys - 1 Datei(en) kopiert. - H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>REM ---------------------------------------------------------------- H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>REM Slave-Dateien erzeugen @@ -152,7 +142,7 @@ Loading Object adm-fat Loading Object adm-rtc.spin Loading Object adm-sid Program size is 12104 longs -Compiled 2222 Lines of Code in 0,172 Seconds +Compiled 2222 Lines of Code in 0,256 Seconds H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>bstc.exe -L ".\lib" -b -O a .\system\administra\admay\admay.spin Brads Spin Tool Compiler v0.15.3 - Copyright 2008,2009 All rights reserved @@ -161,8 +151,8 @@ Loading Object admay Loading Object adm-fat Loading Object adm-rtc.spin Loading Object adm-ay -Program size is 8304 longs -Compiled 1705 Lines of Code in 0,099 Seconds +Program size is 8336 longs +Compiled 1711 Lines of Code in 0,139 Seconds H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>rename *.binary *.adm @@ -174,7 +164,7 @@ Loading Object bel-htext Loading Object bel-keyb Program size is 6656 longs 12 Constants folded -Compiled 958 Lines of Code in 0,099 Seconds +Compiled 958 Lines of Code in 0,168 Seconds H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>REM (siehe oben) bstc.exe -L ".\lib" -b -O a .\system\bellatrix\bel-tv\tv.spin @@ -185,7 +175,7 @@ Loading Object g0key Loading Object bel-tv Program size is 7148 longs 1 Constants folded -Compiled 1870 Lines of Code in 0,097 Seconds +Compiled 1870 Lines of Code in 0,163 Seconds H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>rename *.binary *.bel @@ -218,9 +208,9 @@ Loading Object admtest Loading Object reg-ios Loading Object glob-con Loading Object glob-string -Program size is 8224 longs +Program size is 8216 longs 1 Constants folded -Compiled 2466 Lines of Code in 0,122 Seconds +Compiled 2430 Lines of Code in 0,161 Seconds H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>bstc.exe -L ".\lib" -b -O a .\system\regnatix\beltest.spin Brads Spin Tool Compiler v0.15.3 - Copyright 2008,2009 All rights reserved @@ -228,9 +218,10 @@ Compiled for i386 Win32 at 08:17:48 on 2009/07/20 Loading Object beltest Loading Object reg-ios Loading Object glob-con -Program size is 4812 longs -3 Constants folded -Compiled 2081 Lines of Code in 0,086 Seconds +Loading Object glob-string +Program size is 6404 longs +5 Constants folded +Compiled 2313 Lines of Code in 0,164 Seconds H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>bstc.exe -L ".\lib" -b -O a .\system\regnatix\charmap.spin Brads Spin Tool Compiler v0.15.3 - Copyright 2008,2009 All rights reserved @@ -238,9 +229,9 @@ Compiled for i386 Win32 at 08:17:48 on 2009/07/20 Loading Object charmap Loading Object reg-ios Loading Object glob-con -Program size is 2272 longs +Program size is 2256 longs 1 Constants folded -Compiled 1779 Lines of Code in 0,06 Seconds +Compiled 1743 Lines of Code in 0,089 Seconds H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>bstc.exe -L ".\lib" -b -O a .\system\regnatix\eram.spin Brads Spin Tool Compiler v0.15.3 - Copyright 2008,2009 All rights reserved @@ -249,9 +240,9 @@ Loading Object eram Loading Object glob-numbers Loading Object reg-ios Loading Object glob-con -Program size is 8744 longs +Program size is 7352 longs 2 Constants folded -Compiled 2743 Lines of Code in 0,168 Seconds +Compiled 2705 Lines of Code in 0,157 Seconds H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>bstc.exe -L ".\lib" -b -O a .\system\regnatix\flash.spin Brads Spin Tool Compiler v0.15.3 - Copyright 2008,2009 All rights reserved @@ -261,9 +252,9 @@ Loading Object reg-ios Loading Object glob-con Loading Object glob-sdspi Loading Object glob-numbers -Program size is 7444 longs +Program size is 7148 longs 7 Constants folded -Compiled 3157 Lines of Code in 0,157 Seconds +Compiled 3118 Lines of Code in 0,186 Seconds H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>bstc.exe -L ".\lib" -b -O a .\system\regnatix\fterm.spin Brads Spin Tool Compiler v0.15.3 - Copyright 2008,2009 All rights reserved @@ -272,9 +263,9 @@ Loading Object fterm Loading Object reg-ios Loading Object glob-con Loading Object glob-fds -Program size is 2676 longs +Program size is 2660 longs 1 Constants folded -Compiled 1959 Lines of Code in 0,076 Seconds +Compiled 1923 Lines of Code in 0,113 Seconds H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>bstc.exe -L ".\lib" -b -O a .\system\regnatix\g0test.spin Brads Spin Tool Compiler v0.15.3 - Copyright 2008,2009 All rights reserved @@ -282,9 +273,9 @@ Compiled for i386 Win32 at 08:17:48 on 2009/07/20 Loading Object g0test Loading Object reg-ios Loading Object glob-con -Program size is 6004 longs +Program size is 5988 longs 39 Constants folded -Compiled 2268 Lines of Code in 0,093 Seconds +Compiled 2232 Lines of Code in 0,137 Seconds H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>bstc.exe -L ".\lib" -b -O a .\system\regnatix\hplay.spin Brads Spin Tool Compiler v0.15.3 - Copyright 2008,2009 All rights reserved @@ -292,9 +283,9 @@ Compiled for i386 Win32 at 08:17:48 on 2009/07/20 Loading Object hplay Loading Object reg-ios Loading Object glob-con -Program size is 4248 longs +Program size is 3996 longs 9 Constants folded -Compiled 2022 Lines of Code in 0,102 Seconds +Compiled 1984 Lines of Code in 0,078 Seconds H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>bstc.exe -L ".\lib" -b -O a .\system\regnatix\keycode.spin Brads Spin Tool Compiler v0.15.3 - Copyright 2008,2009 All rights reserved @@ -302,9 +293,20 @@ Compiled for i386 Win32 at 08:17:48 on 2009/07/20 Loading Object keycode Loading Object reg-ios Loading Object glob-con -Program size is 2200 longs +Program size is 2184 longs 1 Constants folded -Compiled 1782 Lines of Code in 0,059 Seconds +Compiled 1746 Lines of Code in 0,08 Seconds + +H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>bstc.exe -L ".\lib" -b -O a .\system\regnatix\man.spin +Brads Spin Tool Compiler v0.15.3 - Copyright 2008,2009 All rights reserved +Compiled for i386 Win32 at 08:17:48 on 2009/07/20 +Loading Object man +Loading Object reg-ios +Loading Object glob-con +Loading Object glob-string +Program size is 2720 longs +1 Constants folded +Compiled 1927 Lines of Code in 0,072 Seconds H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>bstc.exe -L ".\lib" -b -O a .\system\regnatix\ramtest.spin Brads Spin Tool Compiler v0.15.3 - Copyright 2008,2009 All rights reserved @@ -312,9 +314,9 @@ Compiled for i386 Win32 at 08:17:48 on 2009/07/20 Loading Object ramtest Loading Object reg-ios Loading Object glob-con -Program size is 4292 longs +Program size is 4276 longs 35 Constants folded -Compiled 2035 Lines of Code in 0,082 Seconds +Compiled 1999 Lines of Code in 0,079 Seconds H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>bstc.exe -L ".\lib" -b -O a .\system\regnatix\regime.spin Brads Spin Tool Compiler v0.15.3 - Copyright 2008,2009 All rights reserved @@ -323,9 +325,9 @@ Loading Object regime Loading Object reg-ios Loading Object glob-con Loading Object glob-string -Program size is 9372 longs +Program size is 9576 longs 2 Constants folded -Compiled 2594 Lines of Code in 0,124 Seconds +Compiled 2590 Lines of Code in 0,123 Seconds H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>bstc.exe -L ".\lib" -b -O a .\system\regnatix\rom.spin Brads Spin Tool Compiler v0.15.3 - Copyright 2008,2009 All rights reserved @@ -334,9 +336,9 @@ Loading Object rom Loading Object reg-ios Loading Object glob-con Loading Object glob-sdspi -Program size is 4384 longs +Program size is 4368 longs 4 Constants folded -Compiled 2395 Lines of Code in 0,098 Seconds +Compiled 2359 Lines of Code in 0,102 Seconds H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>bstc.exe -L ".\lib" -b -O a .\system\regnatix\sfxtool.spin Brads Spin Tool Compiler v0.15.3 - Copyright 2008,2009 All rights reserved @@ -345,9 +347,9 @@ Loading Object sfxtool Loading Object reg-ios Loading Object glob-con Loading Object glob-numbers -Program size is 6352 longs +Program size is 6344 longs 1 Constants folded -Compiled 2568 Lines of Code in 0,108 Seconds +Compiled 2532 Lines of Code in 0,112 Seconds H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>bstc.exe -L ".\lib" -b -O a .\system\regnatix\splay.spin Brads Spin Tool Compiler v0.15.3 - Copyright 2008,2009 All rights reserved @@ -355,9 +357,9 @@ Compiled for i386 Win32 at 08:17:48 on 2009/07/20 Loading Object splay Loading Object reg-ios Loading Object glob-con -Program size is 3308 longs +Program size is 3068 longs 1 Constants folded -Compiled 1893 Lines of Code in 0,09 Seconds +Compiled 1855 Lines of Code in 0,067 Seconds H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>bstc.exe -L ".\lib" -b -O a .\system\regnatix\sysconf.spin Brads Spin Tool Compiler v0.15.3 - Copyright 2008,2009 All rights reserved @@ -365,9 +367,9 @@ Compiled for i386 Win32 at 08:17:48 on 2009/07/20 Loading Object sysconf Loading Object reg-ios Loading Object glob-con -Program size is 4700 longs +Program size is 4232 longs 2 Constants folded -Compiled 1997 Lines of Code in 0,098 Seconds +Compiled 1976 Lines of Code in 0,075 Seconds H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>bstc.exe -L ".\lib" -b -O a .\system\regnatix\time.spin Brads Spin Tool Compiler v0.15.3 - Copyright 2008,2009 All rights reserved @@ -377,9 +379,9 @@ Loading Object reg-ios Loading Object glob-con Loading Object glob-string Loading Object glob-numbers -Program size is 5824 longs +Program size is 5808 longs 1 Constants folded -Compiled 2557 Lines of Code in 0,114 Seconds +Compiled 2521 Lines of Code in 0,15 Seconds H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>bstc.exe -L ".\lib" -b -O a .\system\regnatix\wplay.spin Brads Spin Tool Compiler v0.15.3 - Copyright 2008,2009 All rights reserved @@ -387,9 +389,9 @@ Compiled for i386 Win32 at 08:17:48 on 2009/07/20 Loading Object wplay Loading Object reg-ios Loading Object glob-con -Program size is 3604 longs +Program size is 3340 longs 1 Constants folded -Compiled 1914 Lines of Code in 0,097 Seconds +Compiled 1876 Lines of Code in 0,072 Seconds H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>bstc.exe -L ".\lib" -b -O a .\system\regnatix\yplay.spin Brads Spin Tool Compiler v0.15.3 - Copyright 2008,2009 All rights reserved @@ -397,9 +399,9 @@ Compiled for i386 Win32 at 08:17:48 on 2009/07/20 Loading Object yplay Loading Object reg-ios Loading Object glob-con -Program size is 3560 longs +Program size is 3348 longs 1 Constants folded -Compiled 1963 Lines of Code in 0,093 Seconds +Compiled 1925 Lines of Code in 0,071 Seconds H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>rename *.binary *.bin @@ -413,6 +415,7 @@ H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios\fterm.bin H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios\g0test.bin H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios\hplay.bin H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios\keycode.bin +H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios\man.bin H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios\ramtest.bin H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios\regime.bin H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios\rom.bin @@ -422,7 +425,7 @@ H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios\sysconf.bin H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios\time.bin H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios\wplay.bin H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios\yplay.bin - 18 Datei(en) verschoben. + 19 Datei(en) verschoben. H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>copy .\forth\*.* ".\bin\sdcard\system" .\forth\adm.lib @@ -456,11 +459,19 @@ H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>copy .\system\son .\system\sonstiges\BW.COL .\system\sonstiges\BWHALF.COL .\system\sonstiges\CHESS.COL +.\system\sonstiges\eram.man +.\system\sonstiges\flash.man .\system\sonstiges\GREEN.COL +.\system\sonstiges\hplay.man .\system\sonstiges\PAR.COL +.\system\sonstiges\regime.man .\system\sonstiges\regime.txt +.\system\sonstiges\splay.man +.\system\sonstiges\sysconf.man .\system\sonstiges\test1.txt .\system\sonstiges\test2.txt - 9 Datei(en) kopiert. +.\system\sonstiges\wplay.man +.\system\sonstiges\yplay.man + 17 Datei(en) kopiert. H:\Projekte\Technik\hive 1\software\TriOS\TriOS-SVN\hive-trios>echo off diff --git a/system/administra/admay/admay.spin b/system/administra/admay/admay.spin index 48784a6..b0edc0a 100644 Binary files a/system/administra/admay/admay.spin and b/system/administra/admay/admay.spin differ diff --git a/system/regnatix/admtest.spin b/system/regnatix/admtest.spin index feb07ce..13c6939 100644 Binary files a/system/regnatix/admtest.spin and b/system/regnatix/admtest.spin differ diff --git a/system/regnatix/beltest.spin b/system/regnatix/beltest.spin index 8937375..3d68ae0 100644 Binary files a/system/regnatix/beltest.spin and b/system/regnatix/beltest.spin differ diff --git a/system/regnatix/eram.spin b/system/regnatix/eram.spin index 1876216..ced0e31 100644 Binary files a/system/regnatix/eram.spin and b/system/regnatix/eram.spin differ diff --git a/system/regnatix/flash.spin b/system/regnatix/flash.spin index 9dc2aa9..c999e72 100644 Binary files a/system/regnatix/flash.spin and b/system/regnatix/flash.spin differ diff --git a/system/regnatix/hplay.spin b/system/regnatix/hplay.spin index 1a2433d..189c03f 100644 Binary files a/system/regnatix/hplay.spin and b/system/regnatix/hplay.spin differ diff --git a/system/regnatix/man.spin b/system/regnatix/man.spin new file mode 100644 index 0000000..753cd7e Binary files /dev/null and b/system/regnatix/man.spin differ diff --git a/system/regnatix/regime.spin b/system/regnatix/regime.spin index 1624a92..654895a 100644 Binary files a/system/regnatix/regime.spin and b/system/regnatix/regime.spin differ diff --git a/system/regnatix/splay.spin b/system/regnatix/splay.spin index 51485c9..8e0757e 100644 Binary files a/system/regnatix/splay.spin and b/system/regnatix/splay.spin differ diff --git a/system/regnatix/sysconf.spin b/system/regnatix/sysconf.spin index d228674..fe98f8b 100644 Binary files a/system/regnatix/sysconf.spin and b/system/regnatix/sysconf.spin differ diff --git a/system/regnatix/wplay.spin b/system/regnatix/wplay.spin index f8daa73..29f6f43 100644 Binary files a/system/regnatix/wplay.spin and b/system/regnatix/wplay.spin differ diff --git a/system/regnatix/yplay.spin b/system/regnatix/yplay.spin index 0c2828a..73fe8c8 100644 Binary files a/system/regnatix/yplay.spin and b/system/regnatix/yplay.spin differ diff --git a/system/sonstiges/eram.man b/system/sonstiges/eram.man new file mode 100644 index 0000000..e9ae3b1 --- /dev/null +++ b/system/sonstiges/eram.man @@ -0,0 +1,34 @@ + +cls - bildschirm löschen +bye - player beenden +d - anzeige eram +n - anzeige fortsetzen +s - sucht wert +m ... - ram modifizieren (byte) +l ... - ram modifizieren (long) +load - ladei datei in eram +sysvar - anzeige systemvariablen +rbas - basisadresse setzen +info - speicheraufteilung anzeigen +f - speicherbereich füllen (sysmod) +fu - speicherbereich füllen (usermod) +xinit - rdisk initialisieren +xnew - neue datei anlegen +xhead - header anzeigen +xdir - dir anzeigen +xdel - datei löschen +xren - datei umbenennen +xftab - ftab anzeigen +xopen - datei öffnen +xseek - zeiger positionieren +xput - zeichen in datei schreiben +xget - zeichenh aus datei lesen +xwrite - wert schreiben +xread - wert lesen +xload - datei in rd laden +xsave - datei fn1 auf sd fn2 speichern + +bas - basisadresse +end - endadresse (startsysvar) +sys - start systemvariablen +rd: - daten datei diff --git a/system/sonstiges/flash.man b/system/sonstiges/flash.man new file mode 100644 index 0000000..cd9f657 --- /dev/null +++ b/system/sonstiges/flash.man @@ -0,0 +1,10 @@ +/? : Hilfe +/fh : Datei in HI-ROM flashen +/fl : Datei in LO-ROM flashen +/dh : Dump HI-ROM +/dl : Dump LO-ROM +/vh : Vergleich Datei <--> HI-ROM +/ch : HI-ROM löschen +/cl : LO-ROM löschen +/sh : HI-ROM speichern +/sl : LO-ROM speichern diff --git a/system/sonstiges/hplay.man b/system/sonstiges/hplay.man new file mode 100644 index 0000000..78a0da2 --- /dev/null +++ b/system/sonstiges/hplay.man @@ -0,0 +1,7 @@ +/? : hilfetext +/p name.wav : hss-datei abspielen +/d : verzeichnis abspielen +/s : wiedergabe stoppen +/t : anzeige trackerliste +/r : anzeige engine-register +/i : anzeige interface-register diff --git a/system/sonstiges/regime.man b/system/sonstiges/regime.man new file mode 100644 index 0000000..7861b22 --- /dev/null +++ b/system/sonstiges/regime.man @@ -0,0 +1,57 @@ +help - diese hilfe + - bin/adm/bel-datei wird gestartet +mount - sd-card mounten +unmount - sd-card abmelden +dir wh - verzeichnis anzeigen +type - anzeige einer textdatei +aload - administra-code laden +bload - bellatrix-treiber laden +rload - regnatix-code laden +del - datei löschen +cls - bildschirm löschen +free - freier speicher auf sd-card +attrib ashr - attribute ändern +cd - verzeichnis wechseln +mkdir - verzeichnis erstellen +rename - datei/verzeichnis umbenennen +format - sd-card formatieren +reboot - hive neu starten +sysinfo - systeminformationen +color <0..7> - farbe wählen +cogs - belegung der cogs anzeigen +dmlist - anzeige der verzeichnis-marker +dm - in das entsprechende marker- + verzeichnis wechseln +dmset - setzt den entsprechenden marker + auf das aktuelle verzeichnis +dmclr - marker löschen +forth - forth starten + +marker: +r - root-verzeichnis +s - system-verzeichnis +u - user-verzeichnis +a/b/c - benutzerdefinierte verzeichnismarker +r, s, u-marker werden vom system automatisch gesetzt und +intern verwendet. + +RAMDISK: + +xload - datei in ram laden +xsave - datei aus ram speichern +xdir - verzeichnis im ram anzeigen +xrename - datei im ram umbenennen +xdel - datei im ram löschen +xtype - text im ram anzeigen + +EXTERNE KOMMANDOS: + +sysconf - systemeinstellungen +hplay - hss-player +wplay - wav-player +sfxtool - hss-soundeffekte erstellen + +vga.bel - vga 1024 x 768 pixel, 64 x 24 zeichen +htext.bel - vga 1024 x 768 pixel, 128 x 48 zeichen +tv.bel - tv-textmodus 40 x 13 zeichen + diff --git a/system/sonstiges/splay.man b/system/sonstiges/splay.man new file mode 100644 index 0000000..5f2eb23 --- /dev/null +++ b/system/sonstiges/splay.man @@ -0,0 +1,8 @@ +/? : Hilfetext +/m name.dmp : DMP-Datei mono auf SID2 abspielen +/s name.dmp : DMP-Datei stereo auf beiden SIDs abspielen +/d : Verzeichnis wiedergeben + q - quit + n - next + p - pause + diff --git a/system/sonstiges/sysconf.man b/system/sonstiges/sysconf.man new file mode 100644 index 0000000..484e2f7 --- /dev/null +++ b/system/sonstiges/sysconf.man @@ -0,0 +1,18 @@ +/? : Hilfe +/l : Konfiguration anzeigen +----------- Administra-Funktionen +/ah 0|1 : hss ab-/anschalten +/aw 0|1 : wav ab-/anschalten +/as 0|1 : systemklänge ab-/anschalten +/al 0..100 : wav-lautstärke links +/ar 0..100 : wav-lautstärke rechts +/ah 0..15 : hss-lautstärke +/af : administra reset, flash booten +/at : transfergeschwindigkeit messen +----------- Bellatrix-Funktionen +/ci : farbtabelle anzeigen +/cs datei : farbtabelle speichern +/cl datei : farbtabelle laden +----------- Port-Funktionen +/po nr anz : Impulse an port ausgeben +/pi : Status der Port abfragen \ No newline at end of file diff --git a/system/sonstiges/wplay.man b/system/sonstiges/wplay.man new file mode 100644 index 0000000..d2301d9 --- /dev/null +++ b/system/sonstiges/wplay.man @@ -0,0 +1,9 @@ +/? : Hilfetext +/p name.wav : WAV-Datei abspielen +/d : Verzeichnis wiedergeben + q - quit + n - next + p - pause +/l 0..100 : Lautstärke links +/r 0..100 : Lautstärke rechts +/i name.wav : Info zur Datei anzeigen diff --git a/system/sonstiges/yplay.man b/system/sonstiges/yplay.man new file mode 100644 index 0000000..03f0d0d --- /dev/null +++ b/system/sonstiges/yplay.man @@ -0,0 +1,8 @@ +Wiedergabe von YM-Dateien mittels AY-3-891X / YM2149 emulator + +/? : Hilfetext +/p name.YM : YM-Datei abspielen +/d : Verzeichnis wiedergeben + q - quit + n - next + p - pause