Skip to content

Commit

Permalink
gain_offset: fixes for new compiler
Browse files Browse the repository at this point in the history
  • Loading branch information
mlorenzatiglb committed Feb 7, 2024
1 parent 7197d42 commit 5a8409c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 39 deletions.
38 changes: 2 additions & 36 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ pico_sdk_init()
# Comment this if you don't care about binary security
find_program(SHA1SUM NAMES sha1sum)
if (NOT SHA1SUM)
message(FATAL_ERROR "sha1sum was not found")
message(STATUS "sha1sum was not found")
endif()

find_program(STR2HEX NAMES xxd)
if (NOT STR2HEX)
message(FATAL_ERROR "xxd was not found")
message(STATUS "xxd was not found")
endif()

set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DRGB2HDMI_DEBUG")
Expand Down
2 changes: 1 addition & 1 deletion src/overlay/overlay.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 5a8409c

Please sign in to comment.