Merge branch 'gain_offset_options' of github.com:mlorenzati/pico-rgb2…

…hdmi into gain_offset_options
mlorenzati · Feb 8, 2024 · 04fe522 · 04fe522
2 parents 6c2761c + 5a8409c
commit 04fe522
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 37 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -17,39 +17,5 @@
         }
     },
     "cmake.buildBeforeRun": true,
-    "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools",
-    "files.associations": {
-        "stdlib.h": "c",
-        "stdio.h": "c",
-        "fastadc.h": "c",
-        "common_configs.h": "c",
-        "nanosystick.h": "c",
-        "wm8213afe.h": "c",
-        "systick.h": "c",
-        "array": "c",
-        "string": "c",
-        "string_view": "c",
-        "ranges": "c",
-        "rgbscan.h": "c",
-        "random": "c",
-        "address_mapped.h": "c",
-        "gpio.h": "c",
-        "pico.h": "c",
-        "config.h": "c",
-        "version.h": "c",
-        "platform.h": "c",
-        "optional": "c",
-        "ostream": "c",
-        "system_error": "c",
-        "functional": "c",
-        "tuple": "c",
-        "type_traits": "c",
-        "utility": "c",
-        "flash.h": "c",
-        "vector": "c",
-        "initializer_list": "c",
-        "retro_logo_128x128_rgb.h": "c",
-        "menuglobals.h": "c"
-    },
-    "cortex-debug.variableUseNaturalFormat": true
-}
+    "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools"
+}
diff --git a/src/overlay/overlay.h b/src/overlay/overlay.h
@@ -31,7 +31,7 @@ inline io_rw_16 video_overlay_get_starty() {
 
 void set_video_overlay(volatile signed int width, volatile signed int height, bool enabled);
 
-inline void video_overlay_scanline_prepare(unsigned int render_line_number) {
+static inline void video_overlay_scanline_prepare(unsigned int render_line_number) {
     unsigned int next_scanlineNumber = (render_line_number + 1);
     if (next_scanlineNumber >= GET_VIDEO_PROPS().height) {
         next_scanlineNumber = 0;