Develop

.github/workflows/main.yml

@@ -26,6 +26,7 @@ jobs:
              orix-sdk/**/*
              md2hlp/**/*
              orix-software/**/*
+             oricutron/**/*
           key: ${{ secrets.CACHE_ID }}-orix-sdk_
 
       - name: Checkout cc65
@@ -68,10 +69,18 @@ jobs:
           echo "src/include" >> .git/info/sparse-checkout
           git checkout
 
-      - name: Compile orix-sdk
+      - name: Prepare environment for oricutron
         if: steps.cache-sdk.outputs.cache-hit != 'true'
-        working-directory: orix-sdk
-        run: mkdir -p build/{lib,bin} && CC65_HOME=${GITHUB_WORKSPACE}/cc65 make lib
+        run: |
+          sudo apt-get install -y xvfb libgtk-3-0 libgtk-3-dev libsdl1.2debian libsdl1.2-dev
+          git clone https://github.com/pete-gordon/oricutron.git
+          cd oricutron && make && pwd && cd .. && ls -l && echo ${GITHUB_WORKSPACE}
+          echo Timeout oricutron : $secret.TMOUT_ORICUTRON
+
+      # - name: Compile orix-sdk
+      #   if: steps.cache-sdk.outputs.cache-hit != 'true'
+      #   working-directory: orix-sdk
+      #   run: mkdir -p build/{lib,bin} && CC65_HOME=${GITHUB_WORKSPACE}/cc65 make lib
 
       - name: Display tools
         run: |
@@ -109,6 +118,7 @@ jobs:
              orix-sdk/**/*
              md2hlp/**/*
              orix-software/**/*
+             oricutron/**/*
           key: ${{ secrets.CACHE_ID }}-orix-sdk_
 
       - name: Prepare environment for project
@@ -117,6 +127,21 @@ jobs:
       - name: Compile project
         run: CC65_HOME=${GITHUB_WORKSPACE}/../cc65 make
 
+      - name: Unit-test with oricutron
+        run: |
+          git clone https://github.com/orix-software/docker-unit-test.git
+          cd docker-unit-test && bash install.sh ${GITHUB_WORKSPACE} && cd ..
+          cp build/usr/share/shell/shellsd.rom ${GITHUB_WORKSPACE}/oricutron/roms/shell.rom
+          cat  tests/unit-tests/commands.sub > ${GITHUB_WORKSPACE}/oricutron/sdcard/ETC/AUTOBOOT
+          #cat  tests/unit_test/xrm.sub >> ${GITHUB_WORKSPACE}/oricutron/sdcard/ETC/AUTOBOOT
+          cd ${GITHUB_WORKSPACE}/oricutron
+          timeout --preserve-status 5 ./xvfb.sh || exit 0
+
+      - name: Check unit-test
+        run: |
+          ls -l ${GITHUB_WORKSPACE}/oricutron/sdcard/
+          bash tests/unit-tests/verify.sh ${GITHUB_WORKSPACE}/oricutron/sdcard/
+
       - name: List build directory content
         run: ls -lR build
 

Makefile

@@ -5,7 +5,7 @@ CFLAGS=-ttelestrat
 LDFILES=
 ROM=shell
 
-all : init build after_success
+all : init build after_success docs
 .PHONY : all
 
 SOURCE=src/$(ROM).asm
@@ -40,6 +40,9 @@ build: $(SOURCE)
 	$(AS) $(CFLAGS) $(SOURCE) -DWITH_SDCARD_FOR_ROOT=1 -o $(ROM)sd.ld65 --debug-info
 	$(LD) -vm -m map7banks.txt -DWITH_SDCARD_FOR_ROOT=1 -DWITH_TWILIGHTE_BOARD=1 -Ln memorymap.txt  -tnone $(ROM)sd.ld65 -o $(ROM)tsd.rom libs/lib8/twil.lib libs/lib8/ch376.lib
 
+docs:
+	sh tools/builddocs.sh
+
 after_success:
 	ls -l
 	ls -l ../
@@ -50,7 +53,7 @@ after_success:
 	cp data/USR/SHARE/FONTS/* build/usr/share/fonts/ -adpR
 	cp shellsd.rom build/usr/share/shell/
 	cp shellus.rom build/usr/share/shell/
-	sh tools/builddocs.sh
+
 	cp Makefile build/usr/src/shell/
 	cp README.md build/usr/src/shell/
 	cp src/* build/usr/src/shell/src/ -adpR

README.md

@@ -1,6 +1,8 @@
+# Shell rom source code
+
 Github action : [![build](https://github.com/orix-software/shell/actions/workflows/main.yml/badge.svg?branch=master)](https://github.com/orix-software/shell/actions/workflows/main.yml)
 
-# Build code
+## Build
 
 ./configure
 make
@@ -10,7 +12,7 @@ Maintainers :
 * Jede
 * Assinie
 
-# Shell for Orix (ROM)
+## Shell for Orix (ROM)
 
 How to compile ?
 

VERSION

@@ -1 +1 @@
-2023.3
+2024.1

docs/basic11.md

@@ -1,5 +1,9 @@
 # basic11
 
+## Usage
+
+basic11 [-g] [-l] [-p defaultpath]
+
 ## Introduction
 
 basic11 starts Atmos rom. You can type basic11 or press FUNCT+B to start.
@@ -135,7 +139,7 @@ Fire flash, Scuba Dive, 3D fongus (i,f letters)
 
 ## Some informations to start .tap file
 
-+ Le trésor du pirate : check information on www.oric.org (on "Trésor du pirate" software page), it explains on to proceed when the games is CLOAD'ed
+Le tresor du pirate : check information on www.oric.org (on "Tresor du pirate" software page), it explains on to proceed when the games is CLOAD'ed
 
 ## Joysticks issues
 
@@ -151,6 +155,7 @@ could in the future.
 + basic11
 + basic11 -g
 + basic11 -l
++ basic11 -p path
 + basic11 "MYTAPE
 
 ## DESCRIPTION
@@ -162,11 +167,25 @@ Cload works with .tap file. Multitap files works too.
 Get a tape file, and place it in the root folder of the sdcard.
 
 Starts basic11 :
+
+```bash
 /#basic11
+```
+
 or
+
+```bash
 /#basic11 "DEFENDER"
+```
+
+A path can be specified :
+
+```bash
+/#basic11 -p /home/jede
+```
 
-CLOAD"ZORGONS => it will load zorgons.tap
+In basic rom :
+CLOAD "ZORGONS => it will load zorgons.tap
 
 ## SOURCE
 

docs/loader.md

@@ -0,0 +1,12 @@
+# Loader
+
+Launch Oric-1/Atmos .tap files, Roms
+
+## Features
+
+### Tapes files
+
+Launch basic11 or basic10 binary.
+
+If .tap atmos version is avaiable, loader will launch atmos version (*basic11*).
+If the .tap works with Oric-1 only, it will starts *basic10*

docs/ls.md

@@ -2,7 +2,7 @@
 
 ## Display catalog
 
-List all the file in the current folder. Token are supported (*,?) ex : « ls ?e.tap » will list all files with a ‘e ’ in the
+List all the file in the current folder. Token are supported (*,?) ex : 'ls ?e.tap' will list all files with a 'e' in the
 second letter
 
 ## SYNOPSYS

docs/lscpu.md

@@ -6,7 +6,9 @@ Displays cpu info. It detects : 6502, 65c02 and 65816
 
 ## SYNOPSYS
 
-+ lscpu
+```bash
+lscpu
+```
 
 ## DESCRIPTION
 

docs/lsmem.md

@@ -6,7 +6,9 @@ Displays malloc table
 
 ## SYNOPSYS
 
-+ lsmem
+```bash
+lsmem
+```
 
 ## DESCRIPTION
 

docs/man.md

@@ -1,7 +1,5 @@
 # man
 
-![man](imgs/man.png)
-
 ## Introduction
 
 display manual pages
@@ -27,3 +25,5 @@ Displays manual. All .hlp files are located in /usr/share/man/. It manages multi
 ## SOURCE
 
 https://github.com/orix-software/shell/blob/master/src/commands/man.asm
+
+![man](imgs/man.png)

docs/md2hlp.cfg

@@ -30,6 +30,7 @@ cite = _|,
 
 
 link = ^T,^P
+image = None
 
 ink_black = ^@
 ink_red = ^A
@@ -64,7 +65,7 @@ paper_white = ^W
 ;
 ; Default for Heading 1
 ;
-Head = __^J ^Q_Shell   2023.3 ^P___
+Head = __^J ^Q_Shell   2023.4 ^P___
 
 [Heading3]
 ;

docs/meminfo.md

@@ -18,4 +18,4 @@ Displays memory info
 
 ## SOURCE
 
-https://github.com/orix-software/shell/blob/master/src/commands/meminfo.asm
+https://github.com/orix-software/shell/blob/master/src/commands/meminfo.asm

docs/mkdir.md

@@ -6,7 +6,9 @@ Create a folder
 
 ## SYNOPSYS
 
-+ mkdir PATH
+```bash
+/#mkdir PATH
+```
 
 ## DESCRIPTION
 

docs/mount.md

@@ -1,7 +1,5 @@
 # mount
 
-![mount](imgs/mount.png)
-
 ## Introduction
 
 Displays mounts
@@ -17,3 +15,5 @@ Displays mount (usb key or sdcard)
 ## SOURCE
 
 https://github.com/orix-software/shell/blob/master/src/commands/mount.asm
+
+![mount](imgs/mount.png)

docs/otimer.md

@@ -1,7 +1,5 @@
 # otimer
 
-![otimer](imgs/otimer.png)
-
 ## Introduction
 
 Display timer since the Oric is power on
@@ -17,3 +15,5 @@ Each time Oric reboots, this timer is reset.
 ## SOURCE
 
 https://github.com/orix-software/shell/blob/master/src/commands/otimer.asm
+
+![otimer](imgs/otimer.png)

docs/ps.md

@@ -1,7 +1,5 @@
 # ps
 
-![ps](imgs/ps.png)
-
 ## Introduction
 
 Displays process list
@@ -21,3 +19,5 @@ Displays process list
 ## SOURCE
 
 https://github.com/orix-software/shell/blob/master/src/commands/ps.asm
+
+![ps](imgs/ps.png)

docs/sh.md

@@ -44,6 +44,8 @@ When kernel has finished to initialize at boot time, sh command is started in in
 
 ## Available commands
 
-The command line is limited in characters (37). If you reach this limit, you won’t be able to type the complete command line Known bugs
+The command line is limited in characters (37). If you reach this limit, you won't be able to type the complete command line
 
-* « ./ » can be used to launch a binary since Kernel v2023.2
+## Known bugs
+
+* "./" can be used to launch a binary since Kernel v2023.2