From 675106ece4106db71212b28946e0b66b25258b60 Mon Sep 17 00:00:00 2001 From: Phil Howard Date: Mon, 22 Mar 2021 20:43:23 +0000 Subject: [PATCH] Patch or suppress warnings The upstream MicroPython rp2 port has re-enabled -Werror so we need to either fix warnings or, in the case of those generated by C++/C MicroPython binding weirdness, suppress them. --- libraries/pico_graphics/pico_graphics.cpp | 8 ++++---- micropython/modules/pico_display/usermod.cmake | 8 +++++++- micropython/modules/pico_explorer/usermod.cmake | 8 +++++++- micropython/modules/pico_rgb_keypad/usermod.cmake | 8 +++++++- micropython/modules/pico_scroll/usermod.cmake | 8 +++++++- micropython/modules/pico_unicorn/usermod.cmake | 8 +++++++- 6 files changed, 39 insertions(+), 9 deletions(-) diff --git a/libraries/pico_graphics/pico_graphics.cpp b/libraries/pico_graphics/pico_graphics.cpp index 3b9997cf..ed822f42 100644 --- a/libraries/pico_graphics/pico_graphics.cpp +++ b/libraries/pico_graphics/pico_graphics.cpp @@ -67,7 +67,7 @@ namespace pimoroni { Pen *dest = ptr(clipped); while(clipped.h--) { // draw span of pixels for this row - for(uint32_t i = 0; i < clipped.w; i++) { + for(int32_t i = 0; i < clipped.w; i++) { *dest++ = pen; } @@ -141,7 +141,7 @@ namespace pimoroni { // if this word would exceed the wrap limit then // move to the next line - if(co != 0 && co + word_width > wrap) { + if(co != 0 && co + word_width > (uint32_t)wrap) { co = 0; lo += 7 * scale; } @@ -203,13 +203,13 @@ namespace pimoroni { int32_t w1row = orient2d(p3, p1, tl) + bias1; int32_t w2row = orient2d(p1, p2, tl) + bias2; - for (uint32_t y = 0; y < triangle_bounds.h; y++) { + for (int32_t y = 0; y < triangle_bounds.h; y++) { int32_t w0 = w0row; int32_t w1 = w1row; int32_t w2 = w2row; Pen *dest = ptr(triangle_bounds.x, triangle_bounds.y + y); - for (uint32_t x = 0; x < triangle_bounds.w; x++) { + for (int32_t x = 0; x < triangle_bounds.w; x++) { if ((w0 | w1 | w2) >= 0) { *dest = pen; } diff --git a/micropython/modules/pico_display/usermod.cmake b/micropython/modules/pico_display/usermod.cmake index f3e7d813..0ec4990a 100644 --- a/micropython/modules/pico_display/usermod.cmake +++ b/micropython/modules/pico_display/usermod.cmake @@ -18,4 +18,10 @@ target_compile_definitions(usermod_pico_display INTERFACE -DMODULE_PICODISPLAY_ENABLED=1 ) -target_link_libraries(usermod INTERFACE usermod_pico_display) \ No newline at end of file +target_link_libraries(usermod INTERFACE usermod_pico_display) + +set_source_files_properties( + ${CMAKE_CURRENT_LIST_DIR}/pico_display.c + PROPERTIES COMPILE_FLAGS + "-Wno-discarded-qualifiers -Wno-implicit-int" +) \ No newline at end of file diff --git a/micropython/modules/pico_explorer/usermod.cmake b/micropython/modules/pico_explorer/usermod.cmake index cae51ada..6b9999bf 100644 --- a/micropython/modules/pico_explorer/usermod.cmake +++ b/micropython/modules/pico_explorer/usermod.cmake @@ -18,4 +18,10 @@ target_compile_definitions(usermod_pico_explorer INTERFACE -DMODULE_PICOEXPLORER_ENABLED=1 ) -target_link_libraries(usermod INTERFACE usermod_pico_explorer) \ No newline at end of file +target_link_libraries(usermod INTERFACE usermod_pico_explorer) + +set_source_files_properties( + ${CMAKE_CURRENT_LIST_DIR}/pico_explorer.c + PROPERTIES COMPILE_FLAGS + "-Wno-discarded-qualifiers -Wno-implicit-int" +) \ No newline at end of file diff --git a/micropython/modules/pico_rgb_keypad/usermod.cmake b/micropython/modules/pico_rgb_keypad/usermod.cmake index 4d961684..37901c28 100644 --- a/micropython/modules/pico_rgb_keypad/usermod.cmake +++ b/micropython/modules/pico_rgb_keypad/usermod.cmake @@ -14,4 +14,10 @@ target_compile_definitions(usermod_pico_rgb_keypad INTERFACE -DMODULE_PICOKEYPAD_ENABLED=1 ) -target_link_libraries(usermod INTERFACE usermod_pico_rgb_keypad) \ No newline at end of file +target_link_libraries(usermod INTERFACE usermod_pico_rgb_keypad) + +set_source_files_properties( + ${CMAKE_CURRENT_LIST_DIR}/pico_rgb_keypad.c + PROPERTIES COMPILE_FLAGS + "-Wno-discarded-qualifiers -Wno-implicit-int" +) \ No newline at end of file diff --git a/micropython/modules/pico_scroll/usermod.cmake b/micropython/modules/pico_scroll/usermod.cmake index 2a79f81c..5f064307 100644 --- a/micropython/modules/pico_scroll/usermod.cmake +++ b/micropython/modules/pico_scroll/usermod.cmake @@ -14,4 +14,10 @@ target_compile_definitions(usermod_pico_scroll INTERFACE -DMODULE_PICOSCROLL_ENABLED=1 ) -target_link_libraries(usermod INTERFACE usermod_pico_scroll) \ No newline at end of file +target_link_libraries(usermod INTERFACE usermod_pico_scroll) + +set_source_files_properties( + ${CMAKE_CURRENT_LIST_DIR}/pico_scroll.c + PROPERTIES COMPILE_FLAGS + "-Wno-discarded-qualifiers -Wno-implicit-int" +) \ No newline at end of file diff --git a/micropython/modules/pico_unicorn/usermod.cmake b/micropython/modules/pico_unicorn/usermod.cmake index 3b59b135..0c3840c6 100644 --- a/micropython/modules/pico_unicorn/usermod.cmake +++ b/micropython/modules/pico_unicorn/usermod.cmake @@ -16,4 +16,10 @@ target_compile_definitions(usermod_pico_unicorn INTERFACE -DMODULE_PICOUNICORN_ENABLED=1 ) -target_link_libraries(usermod INTERFACE usermod_pico_unicorn) \ No newline at end of file +target_link_libraries(usermod INTERFACE usermod_pico_unicorn) + +set_source_files_properties( + ${CMAKE_CURRENT_LIST_DIR}/pico_unicorn.c + PROPERTIES COMPILE_FLAGS + "-Wno-discarded-qualifiers -Wno-implicit-int" +) \ No newline at end of file