mirrors/mch2022-template-app
1
0
Fork 1
mirror of https://github.com/badgeteam/mch2022-template-app.git synced 2024-11-29 04:21:06 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup and bugfixes

Browse source
This commit is contained in:
Renze Nicolai 2022-01-07 00:42:19 +01:00
parent 8eb6d46138
commit 32f40e51a8
5 changed files with 3 additions and 17389 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitmodules vendored
View file

@ -1,27 +1,21 @@
[submodule "esp-idf"] [submodule "esp-idf"]
path = esp-idf path = esp-idf
url = https://github.com/espressif/esp-idf.git url = https://github.com/espressif/esp-idf.git
branch = master
[submodule "factory_test/components/bus-i2c"] [submodule "factory_test/components/bus-i2c"]
path = factory_test/components/bus-i2c path = factory_test/components/bus-i2c
url = git@github.com:Nicolai-Electronics/esp32-component-bus-i2c.git url = git@github.com:Nicolai-Electronics/esp32-component-bus-i2c.git
branch = master
[submodule "factory_test/components/i2c-pca9555"] [submodule "factory_test/components/i2c-pca9555"]
path = factory_test/components/i2c-pca9555 path = factory_test/components/i2c-pca9555
url = git@github.com:Nicolai-Electronics/esp32-component-i2c-pca9555.git url = git@github.com:Nicolai-Electronics/esp32-component-i2c-pca9555.git
branch = master
[submodule "factory_test/components/i2c-bno055"] [submodule "factory_test/components/i2c-bno055"]
path = factory_test/components/i2c-bno055 path = factory_test/components/i2c-bno055
url = git@github.com:Nicolai-Electronics/esp32-component-i2c-bno055.git url = git@github.com:Nicolai-Electronics/esp32-component-i2c-bno055.git
branch = master
[submodule "factory_test/components/spi-ili9341"] [submodule "factory_test/components/spi-ili9341"]
path = factory_test/components/spi-ili9341 path = factory_test/components/spi-ili9341
url = git@github.com:Nicolai-Electronics/esp32-component-spi-ili9341.git url = git@github.com:Nicolai-Electronics/esp32-component-spi-ili9341.git
branch = master
[submodule "factory_test/components/spi-ice40"] [submodule "factory_test/components/spi-ice40"]
path = factory_test/components/spi-ice40 path = factory_test/components/spi-ice40
url = git@github.com:Nicolai-Electronics/esp32-component-spi-ice40.git url = git@github.com:Nicolai-Electronics/esp32-component-spi-ice40.git
branch = master
[submodule "factory_test/components/sdcard"] [submodule "factory_test/components/sdcard"]
path = factory_test/components/sdcard path = factory_test/components/sdcard
url = git@github.com:Nicolai-Electronics/esp32-component-sdcard.git url = git@github.com:Nicolai-Electronics/esp32-component-sdcard.git

2
factory_test/components/i2c-pca9555

@ -1 +1 @@
Subproject commit 10e413edd7d1b086c647b84f7dadf7bd1047789d Subproject commit 1ae02d7fe779ed7d6517288a9a85942c16e162b4

8683
factory_test/main/bitstream.h
View file

File diff suppressed because it is too large Load diff

8680
factory_test/main/bitstream2.h
View file

File diff suppressed because it is too large Load diff

21
factory_test/main/main.c
View file

@ -8,7 +8,6 @@
#include <esp_err.h> #include <esp_err.h>
#include <esp_log.h> #include <esp_log.h>
#include "hardware.h" #include "hardware.h"
#include "bitstream2.h"
#include "managed_i2c.h" #include "managed_i2c.h"
#include "pax_gfx.h" #include "pax_gfx.h"
#include "sdcard.h" #include "sdcard.h"
@ -34,26 +33,10 @@ void button_handler(uint8_t pin, bool value) {
switch(pin) { switch(pin) {
case PCA9555_PIN_BTN_START: { case PCA9555_PIN_BTN_START: {
printf("Start button %s\n", value ? "pressed" : "released"); printf("Start button %s\n", value ? "pressed" : "released");
/*if (value) {
esp_err_t res = ice40_load_bitstream(ice40, proto2_bin, proto2_bin_len);
if (res != ESP_OK) {
ESP_LOGE(TAG, "Failed to program the FPGA (%d)", res);
} else {
printf("FPGA enabled\n");
}
}*/
break; break;
} }
case PCA9555_PIN_BTN_SELECT: { case PCA9555_PIN_BTN_SELECT: {
printf("Select button %s\n", value ? "pressed" : "released"); printf("Select button %s\n", value ? "pressed" : "released");
/*if (value) {
esp_err_t res = ice40_disable(ice40);
if (res != ESP_OK) {
ESP_LOGE(TAG, "Failed to disable the FPGA (%d)", res);
} else {
printf("FPGA disabled\n");
}
}*/
break; break;
} }
case PCA9555_PIN_BTN_MENU: case PCA9555_PIN_BTN_MENU:
@ -328,9 +311,9 @@ esp_err_t verify_file_in_psram(FILE* fd) {
void fpga_test(void) { void fpga_test(void) {
esp_err_t res; esp_err_t res;
FILE* fpga_passthrough = fopen("/sd/passthrough.bin", "rb"); FILE* fpga_passthrough = fopen("/sd/pt.bin", "rb");
if (fpga_passthrough == NULL) { if (fpga_passthrough == NULL) {
ESP_LOGE(TAG, "Failed to open passthrough.bin"); ESP_LOGE(TAG, "Failed to open passthrough firmware (pt.bin) from the SD card");
return; return;
} }