RP2350 and SDK 2.0.0 changes

raspberrypi · Aug 8, 2024 · 2267457 · 2267457
1 parent 09c64d5
commit 2267457
Show file tree

Hide file tree

Showing 9 changed files with 529 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,8 +5,8 @@ if (NOT TARGET _pico_extras_inclusion_marker)
 
     # Pull in PICO SDK (must be before project)
     include(pico_sdk_import.cmake)
-    if (PICO_SDK_VERSION_STRING VERSION_LESS "1.2.0")
-        message(FATAL_ERROR "Require at least Raspberry Pi Pico SDK version 1.2.0")
+    if (PICO_SDK_VERSION_STRING VERSION_LESS "2.0.0")
+        message(FATAL_ERROR "Require at least Raspberry Pi Pico SDK version 2.0.0")
     endif()
 
     project(pico_extras C CXX)

diff --git a/src/common/pico_audio/CMakeLists.txt b/src/common/pico_audio/CMakeLists.txt
@@ -9,8 +9,12 @@ if (NOT TARGET pico_audio)
 
     target_sources(pico_audio INTERFACE
             ${CMAKE_CURRENT_LIST_DIR}/audio.cpp
-            $<$<NOT:$<BOOL:${PICO_NO_HARDWARE}>>:${CMAKE_CURRENT_LIST_DIR}/audio_utils.S>
     )
+    if (NOT PICO_NO_HARDWARE AND NOT PICO_RISCV)
+        target_sources(pico_audio INTERFACE
+                ${CMAKE_CURRENT_LIST_DIR}/audio_utils.S
+        )
+    endif()
 
     target_link_libraries(pico_audio INTERFACE pico_audio_headers pico_sync)
 endif()
diff --git a/src/common/pico_scanvideo/include/pico/scanvideo/scanvideo_base.h b/src/common/pico_scanvideo/include/pico/scanvideo/scanvideo_base.h
@@ -287,6 +287,7 @@ extern const scanvideo_mode_t vga_mode_1024x768_60;
 extern const scanvideo_mode_t vga_mode_1280x1024_60;
 extern const scanvideo_mode_t vga_mode_720p_60;
 extern const scanvideo_mode_t vga_mode_1080p_60;
+extern const scanvideo_mode_t vga_mode_1440p_60;
 
 extern const scanvideo_mode_t vga_mode_tft_800x480_50;
 extern const scanvideo_mode_t vga_mode_tft_400x240_50;

diff --git a/src/common/pico_scanvideo/vga_modes.c b/src/common/pico_scanvideo/vga_modes.c
@@ -610,3 +610,36 @@ const scanvideo_mode_t vga_mode_1280x1024_60 =
                 .xscale = 1,
                 .yscale = 1,
         };
+
+const scanvideo_timing_t vga_timing_1920x1440_60_default =
+        {
+                .clock_freq = 234000000,
+
+                .h_active = 1920,
+                .v_active = 1440,
+
+                .h_front_porch = 128,
+                .h_pulse = 208,
+                .h_total = 2600,
+                .h_sync_polarity = 1,
+
+                .v_front_porch = 1,
+                .v_pulse = 3,
+                .v_total = 1500,
+                .v_sync_polarity = 0,
+
+                .enable_clock = 0,
+                .clock_polarity = 0,
+
+                .enable_den = 0
+        };
+
+const scanvideo_mode_t vga_mode_1440p_60 =
+        {
+                .default_timing = &vga_timing_1920x1440_60_default,
+                .pio_program = &video_24mhz_composable,
+                .width = 1920,
+                .height = 1440,
+                .xscale = 1,
+                .yscale = 1,
+        };
diff --git a/src/common/platypus/CMakeLists.txt b/src/common/platypus/CMakeLists.txt
@@ -2,7 +2,8 @@ add_library(platypus INTERFACE)
 
 target_sources(platypus INTERFACE
         ${CMAKE_CURRENT_LIST_DIR}/platypus.c
-        $<$<BOOL:${PICO_ON_DEVICE}>:${CMAKE_CURRENT_LIST_DIR}/decompress_row.S>
+        $<$<BOOL:${PICO_RP2040}>:${CMAKE_CURRENT_LIST_DIR}/decompress_row.S>
+        $<$<BOOL:${PICO_RP2350}>:${CMAKE_CURRENT_LIST_DIR}/decompress_row_33.S>
         )
 
 target_include_directories(platypus INTERFACE ${CMAKE_CURRENT_LIST_DIR})