rafaelcaricio/mch2022-talktopics
1
0
Fork 0
forked from mirrors/mch2022-template-app
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #34 from badgeteam/tnt/fpga-prep

Browse source 
A couple of tweak preparing for future FPGA work
This commit is contained in:
Sylvain "tnt" Munaut 2022-05-16 23:37:54 +02:00 committed by GitHub
parent 7dd5adf3e0 ac19bf687a
commit a8f12b24a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/spi-ili9341

@ -1 +1 @@
Subproject commit 4bc90991a83df4e733705cc7c89906c64756e0f2
Subproject commit 8fe7ca9876e2afed472c5d01170d4e76acdf6399

13
main/CMakeLists.txt
View file

@ -1,5 +1,16 @@
idf_component_register(
SRCS "main.c" "menu.c" "fpga_test.c" "pax_keyboard.c" "system_wrapper.c" "appfs_wrapper.c" "graphics_wrapper.c" "settings.c" "wifi_connection.c" "rp2040_updater.c" "wifi_ota.c" "fpga_download.c"
SRCS "main.c"
"appfs_wrapper.c"
"fpga_test.c"
"graphics_wrapper.c"
"menu.c"
"pax_keyboard.c"
"rp2040_updater.c"
"settings.c"
"system_wrapper.c"
"wifi_connection.c"
"wifi_ota.c"
"fpga_download.c"
INCLUDE_DIRS "." "include"
EMBED_TXTFILES ${project_dir}/server_certs/isrgrootx1.pem
)

6
main/fpga_test.c
View file

@ -156,12 +156,6 @@ void fpga_test(ILI9341* ili9341, ICE40* ice40, xQueueHandle buttonQueue) {
reload_fpga = false;
printf("LCD deinit...\n");
ili9341_deinit(ili9341);
printf("LCD deselect...\n");
ili9341_select(ili9341, false);
printf("Wait...\n");
vTaskDelay(200 / portTICK_PERIOD_MS);
printf("LCD select...\n");
ili9341_select(ili9341, true);
printf("FPGA load...\n");
if (load_old_bitstream) {