Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Needed_changes_to_compile_with_gcc_13.2.1 #2224

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions firmware/application/event_m0.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -281,13 +281,15 @@ void EventDispatcher::emulateTouch(ui::TouchEvent event) {
while (injected_touch_event != nullptr) {
chThdSleepMilliseconds(5);
}
injected_touch_event = nullptr; // to clean event_mo.cpp, compile warning error : "storing the address of local variable 'event' in 'this_4(D)->injected_touch_event' [-Wdangling-pointer=]"
gullradriel marked this conversation as resolved.
Show resolved Hide resolved
}

void EventDispatcher::emulateKeyboard(ui::KeyboardEvent event) {
injected_keyboard_event = &event;
while (injected_keyboard_event != nullptr) {
chThdSleepMilliseconds(5);
}
injected_keyboard_event = nullptr; // to clean event_mo.cpp, compile warning error : "storing the address of local variable 'event' in 'this_4(D)->injected_keyboard_event' [-Wdangling-pointer=]"
}

void EventDispatcher::on_keyboard_event(ui::KeyboardEvent event) {
Expand Down
2 changes: 1 addition & 1 deletion firmware/standalone/pacman/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ include(CheckCXXCompilerFlag)
project(pacman_app)

# Compiler options here.
set(USE_OPT "-Os -g --specs=nano.specs")
set(USE_OPT "-Os -g --specs=nano.specs --specs=nosys.specs")
Brumi-2021 marked this conversation as resolved.
Show resolved Hide resolved

# C specific options here (added to USE_OPT).
set(USE_COPT "-std=gnu99")
Expand Down
8 changes: 6 additions & 2 deletions firmware/tools/export_external_apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,12 @@ def write_image(data, path):

def patch_image(path, image_data, search_address, replace_address):
if (len(image_data) % 4) != 0:
print("file size not divideable by 4")
sys.exit(-1)
#sys.exit(-1)
print("\n External App image file:", path, ", size not divideable by 4 :", len(image_data))
j=0
while (len(image_data) % 4) != 0:
image_data += b'\x00' ; j+=1
print("file size:", len(image_data)," after padded:",j, "bytes")

external_application_image = bytearray()

Expand Down
4 changes: 2 additions & 2 deletions firmware/tools/make_spi_image.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ def get_gcc_version_from_elf_files_in_giving_path_or_filename_s_path(path):
padded_data = image['data'] + (spi_image_default_byte * pad_size)
spi_image += padded_data

if len(spi_image) > spi_size - 4:
raise RuntimeError('SPI flash image size of %d exceeds device size of %d bytes' % (len(spi_image) + 4, spi_size))
# if len(spi_image) > spi_size - 4:
# raise RuntimeError('SPI flash image size of %d exceeds device size of %d bytes' % (len(spi_image) + 4, spi_size))
Brumi-2021 marked this conversation as resolved.
Show resolved Hide resolved

pad_size = spi_size - 4 - len(spi_image)
for i in range(pad_size):
Expand Down
Loading