Merge pull request #2 from visrealm/dev

v0.3.1
visrealm · Jul 12, 2024 · 8a166de · 8a166de
2 parents 18289ab + db76bb8
commit 8a166de
Show file tree

Hide file tree

Showing 14 changed files with 442 additions and 247 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -3,6 +3,8 @@
     "*.md": "markdown",
     "xtr1common": "c",
     "stdlib.h": "c",
-    "multicore.h": "c"
+    "multicore.h": "c",
+    "stdio.h": "c",
+    "tms9918.pio.h": "c"
   }
 }
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,7 +12,11 @@ set(PROJECT pico9918)
 
 project(${PROJECT} C CXX)
 
-add_definitions(-DPICO_BUILD)
+add_definitions(-DPICO_BUILD=1)
+add_definitions(-DPICO_DISABLE_SHARED_IRQ_HANDLERS=1)
+add_definitions(-DVR_EMU_TMS9918_SINGLE_INSTANCE=1)
+add_definitions(-DPICO_PANIC_FUNCTION=)
+add_definitions(-DPICO_TIME_DEFAULT_ALARM_POOL_DISABLED=1)
 
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_CXX_STANDARD 17)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -4,19 +4,20 @@ set(PROGRAM pico9918)
 
 add_executable(${PROGRAM})
 
-target_sources(${PROGRAM} PRIVATE main.c palette.c clocks.pio.h)
+target_sources(${PROGRAM} PRIVATE main.c palette.c clocks.pio.h tms9918.pio.h)
 
 # generate image array source files from png images
 visrealm_generate_image_source_ram(${PROGRAM} splash res/splash.png )
 
 # generate header file from pio
 pico_generate_pio_header(${PROGRAM} ${CMAKE_CURRENT_LIST_DIR}/clocks.pio)
+pico_generate_pio_header(${PROGRAM} ${CMAKE_CURRENT_LIST_DIR}/tms9918.pio)
 
 pico_add_extra_outputs(${PROGRAM})
 pico_enable_stdio_usb(${PROGRAM} 0)
 pico_enable_stdio_uart(${PROGRAM} 0)
 
-#pico_set_binary_type(${PROGRAM} copy_to_ram)   # TOO SLOW TO BOOT
+pico_set_binary_type(${PROGRAM} copy_to_ram)   # TOO SLOW TO BOOT
 
 target_link_libraries(${PROGRAM} PUBLIC
         pico_stdlib

diff --git a/src/clocks.pio b/src/clocks.pio
@@ -10,26 +10,7 @@
  */
 
 .program clock
-    pull block
 .wrap_target
     set pins, 1
-    mov x, osr
-onDelay:
-    jmp x-- onDelay
     set pins, 0
-    mov x, osr
-offDelay:
-    jmp x-- offDelay
 .wrap
-
-
-% c-sdk {
-
-void clock_program_init(PIO pio, uint sm, uint offset, uint pin) {
-  pio_gpio_init(pio, pin);
-  pio_sm_set_consecutive_pindirs(pio, sm, pin, 1, true);
-  pio_sm_config c = clock_program_get_default_config(offset);
-  sm_config_set_set_pins(&c, pin, 1);
-  pio_sm_init(pio, sm, offset, &c);
-}
-%}