Merge pull request #23 from psychogenic/v2.0-dev

Clean out cocotb micropython implementation

Author: psychogenic

.github/workflows/release.yml

@@ -24,6 +24,11 @@ jobs:
       with:
         python-version: '3.10'
         cache: 'pip'
+
+    - name: Move ucocotb
+      run: |
+           cp -r $GITHUB_WORKSPACE/sdk/microcotb/src/microcotb $GITHUB_WORKSPACE/sdk/src
+           ls $GITHUB_WORKSPACE/sdk/src
     
     - name: Get shuttle indices
       run: |

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "microcotb"]
+	path = microcotb
+	url = https://github.com/psychogenic/microcotb.git

bin/release.sh

@@ -75,6 +75,8 @@ touch $BUILDDIR/release_v$VERSION
 
 echo "Including SDK from $SRCDIR"
 cp -Ra $SRCDIR/* $BUILDDIR
+echo "Including microcotb"
+cp -Ra $SRCDIR/../microcotb/src/microcotb $BUILDDIR
 for pcd in `find $BUILDDIR -type d -name "__pycache__"`
 do
 	echo "cleaning up $pcd"

microcotb

@@ -8,10 +8,10 @@
 import math
 import gc
 from ttboard.demoboard import DemoBoard
-from ttboard.cocotb.clock import Clock
-from ttboard.cocotb.triggers import RisingEdge, FallingEdge, ClockCycles, Timer
-import ttboard.cocotb as cocotb
-from ttboard.cocotb.utils import get_sim_time
+from microcotb.clock import Clock
+from microcotb.triggers import RisingEdge, FallingEdge, ClockCycles, Timer
+import microcotb as cocotb
+from microcotb.utils import get_sim_time
 
 
 @cocotb.test()

src/examples/tt_um_factory_test/tt_um_factory_test.py

@@ -8,13 +8,9 @@
 import gc
 from ttboard.demoboard import DemoBoard
 gc.collect()
-print(f'mf tb: {gc.mem_free()}')
-from ttboard.cocotb.clock import Clock
-print(f'mf tb: {gc.mem_free()}')
-from ttboard.cocotb.triggers import Timer, ClockCycles # RisingEdge, FallingEdge, Timer, ClockCycles
-
-print(f'mf tb: {gc.mem_free()}')
-import ttboard.cocotb as cocotb
+from microcotb.clock import Clock
+from microcotb.triggers import Timer, ClockCycles # RisingEdge, FallingEdge, Timer, ClockCycles
+import microcotb as cocotb
 
 displayNotes = {
             'NA':     0b00000010, # -

src/examples/tt_um_psychogenic_neptuneproportional/tt_um_psychogenic_neptuneproportional.py

@@ -11,10 +11,10 @@
 @copyright: Copyright (C) 2023 Pat Deegan, https://psychogenic.com
 '''
 
-from ttboard.cocotb.utils import get_sim_time
-import ttboard.cocotb as cocotb
-from ttboard.cocotb.clock import Clock
-from ttboard.cocotb.triggers import ClockCycles # RisingEdge, FallingEdge, Timer, 
+from microcotb.utils import get_sim_time
+import microcotb as cocotb
+from microcotb.clock import Clock
+from microcotb.triggers import ClockCycles # RisingEdge, FallingEdge, Timer, 
 import hashlib
 import random 
 

src/examples/tt_um_psychogenic_shaman/tb.py

@@ -26,9 +26,9 @@
 #   await set_noise(dut, white=True, divider=512)
 #   await write(dut, data=1111_0000)              # write data directly on the data bus of the chip, holds /WE low
 
-import ttboard.cocotb as cocotb 
-from ttboard.cocotb.clock import Clock
-from ttboard.cocotb.triggers import RisingEdge, FallingEdge, Timer, ClockCycles
+import microcotb as cocotb 
+from microcotb.clock import Clock
+from microcotb.triggers import RisingEdge, FallingEdge, Timer, ClockCycles
 
 # MASTER_CLOCK = 3_579_545 # NTSC frequency of SN as used in Sega Master System,    0xFE = 440 Hz
 # MASTER_CLOCK = 3_546_895 # PAL                 ---- // ----

src/examples/tt_um_rejunity_sn76489/tt_um_rejunity_sn76489.py

@@ -21,10 +21,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import ttboard.cocotb as cocotb
-from ttboard.cocotb.clock import Clock
-from ttboard.cocotb.triggers import RisingEdge, FallingEdge, Timer, ClockCycles
-from ttboard.cocotb.utils import get_sim_time
+import microcotb as cocotb
+from microcotb.clock import Clock
+from microcotb.triggers import RisingEdge, FallingEdge, Timer, ClockCycles
+from microcotb.utils import get_sim_time
 
 def time_delta_not(cond:str):
     return f'sim time delta not {cond}'
@@ -169,18 +169,18 @@ async def test_rgbled(dut):
 
 
 from ttboard.demoboard import DemoBoard
-import ttboard.cocotb.dut
-from ttboard.cocotb.dut import Wire
+import ttboard.cocotb.dut as basedut
+from microcotb.dut import Wire
 
-class RGBLED(ttboard.cocotb.dut.DUT):
+class RGBLED(basedut.DUT):
     def __init__(self, data:Wire, data_rdy:Wire):
         super().__init__('RGBLED')
         self.data = data 
         self.data_rdy = data_rdy
         self.led = self.new_slice_attribute(self.tt.uo_out, 0)
         self.nreset = self.rst_n
 
-class TBSPI(ttboard.cocotb.dut.DUT):
+class TBSPI(basedut.DUT):
 
     def __init__(self, data:Wire, data_rdy:Wire):
         super().__init__('SPI')
@@ -191,7 +191,7 @@ def __init__(self, data:Wire, data_rdy:Wire):
         self.sclk = self.new_bit_attribute(self.tt.ui_in, 1)
         self.nsel = self.new_bit_attribute(self.tt.ui_in, 2)
 
-class DUT(ttboard.cocotb.dut.DUT):
+class DUT(basedut.DUT):
     def __init__(self):
         super().__init__('RGBDUT')
         self.data = Wire()

src/examples/tt_um_rgbled_decoder/tt_um_rgbled_decoder.py

@@ -129,6 +129,7 @@ def stopClocking():
 print(tt)
 print()
 
+
 print(f"tt.sdk_version={tt.version}")
 
 # to run tests easily import a module of interest, as below, and then