minor scanvideo demo cleanup

raspberrypi · Feb 9, 2023 · 9a106f8 · 9a106f8
1 parent eb6658e
commit 9a106f8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/scanvideo/demo1/demo1.c b/scanvideo/demo1/demo1.c
@@ -393,7 +393,7 @@ volatile uint32_t scanline_color = 0;
 
 int vga_main(void) {
     mutex_init(&frame_logic_mutex);
-    gpio_debug_pins_init();
+//    gpio_debug_pins_init();
 
     gpio_init(24);
     gpio_init(22);
@@ -597,7 +597,6 @@ bool render_scanline_test_pattern(struct scanvideo_scanline_buffer *dest, int co
     return true;
 }
 
-//#include "hardware/structs/vreg_and_chip_reset.h"
 int main(void) {
 
     gpio_put(27, 0);

diff --git a/scanvideo/mandelbrot/CMakeLists.txt b/scanvideo/mandelbrot/CMakeLists.txt
@@ -5,7 +5,7 @@ if (TARGET pico_scanvideo_dpi)
 
     target_compile_definitions(mandelbrot PRIVATE
             PICO_SCANVIDEO_PLANE1_VARIABLE_FRAGMENT_DMA=1
-            #TURBO_BOOST
+            #TURBO_BOOST=1
             )
     target_link_libraries(mandelbrot PRIVATE
             pico_stdlib

diff --git a/scanvideo/mandelbrot/mandelbrot.c b/scanvideo/mandelbrot/mandelbrot.c
@@ -274,7 +274,7 @@ int main(void) {
     base_freq = 50000;
 #endif
 #if PICO_ON_DEVICE
-#ifdef TURBO_BOOST
+#if TURBO_BOOST
     vreg_set_voltage(VREG_VOLTAGE_1_30);
     sleep_ms(10);
     set_sys_clock_khz(base_freq*6, true);

diff --git a/scanvideo/sprite_demo/sprite_demo.c b/scanvideo/sprite_demo/sprite_demo.c
@@ -21,12 +21,12 @@
 #include "raspberry_128x128_bgar5515.h"
 #include "raspberry_128x128_bgar5515_flip.h"
 
-#include "hardware/structs/vreg_and_chip_reset.h"
+#include "hardware/vreg.h"
 
 //#define VGA_MODE vga_mode_320x240_60
 #define VGA_MODE vga_mode_640x480_60
 #define DUAL_CORE_RENDER
-// #define TURBO_BOOST
+// #define TURBO_BOOST 1
 #define N_BERRIES 45
 
 CU_REGISTER_DEBUG_PINS(generation)
@@ -171,8 +171,8 @@ void __time_critical_func(frame_update_logic)() {
 }
 
 int main(void) {
-#ifdef TURBO_BOOST
-    hw_set_bits(&mm_vreg_and_chip_reset->vreg, VREG_AND_CHIP_RESET_VREG_VSEL_BITS);
+#if TURBO_BOOST
+    vreg_set_voltage(VREG_VOLTAGE_MAX);
     sleep_ms(10);
     set_sys_clock_khz(400000, true);
 #else