Skip to content

Fix library.properties for bundled libraries #340

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

Merged
merged 22 commits into from
Oct 20, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
29d6290
Library: make doom lib non legacy
facchinm Oct 5, 2021
7099920
Libraries: modernize USBMSD library
facchinm Oct 5, 2021
a07afd0
Libraries: remove outdeted WiFi bindings
facchinm Oct 5, 2021
70676ea
USBHOST: fix library.properties
facchinm Oct 5, 2021
4c4c50a
Libraries: modernize USBHID library
facchinm Oct 5, 2021
7c8cfce
Libraries: modernize RPC library
facchinm Oct 5, 2021
92f7f53
Libraries: fix various misleading library.properties
facchinm Oct 5, 2021
cd474b8
USBHID: update examples
facchinm Oct 5, 2021
590f115
Libraries: modernize *_System libs
facchinm Oct 5, 2021
606ec02
Fix Portenta_lvgl example
facchinm Oct 5, 2021
06ae571
Doom: fix example sketch and remove binaries
facchinm Oct 5, 2021
f2095ae
Portenta_Video: hide library
facchinm Oct 5, 2021
b5b3aec
Libraries: modernize SDCARD
facchinm Oct 5, 2021
3eae8b7
Libraries: modernize Portenta_Camera
facchinm Oct 5, 2021
cba214e
Libraries: modernize Portenta_SDRAM and add example
facchinm Oct 5, 2021
a109746
Libraries: Portenta_lvgl: fix examples and rename library
facchinm Oct 5, 2021
4424b33
Modernize Portenta_Video and readd example
facchinm Oct 7, 2021
f3de8b0
Apply suggestions from code review
facchinm Oct 8, 2021
981209c
lvgl: add compatibility layer for both v7 and v8
marqdevx Oct 13, 2021
15e344b
Add missing library dependency to "smoke test" CI workflow
per1234 Oct 8, 2021
d600f09
Expand "smoke test" CI workflow to cover new examples
per1234 Oct 8, 2021
0ebf94f
GH: CI: add lvgl v8 to test matrix
facchinm Oct 13, 2021
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
Prev Previous commit
Next Next commit
Doom: fix example sketch and remove binaries
  • Loading branch information
facchinm committed Oct 5, 2021
commit 06ae57137cd9700240c4fa63564067d784fb4109
41 changes: 22 additions & 19 deletions libraries/doom/examples/Doom/Doom.ino
Original file line number Diff line number Diff line change
@@ -1,36 +1,39 @@
/* Arduino wrapper for DoomGeneric
* Mouse and keyboard controls are not implemented at the moment;
* to use the internal QSPI flash as storage, force the board in bootloader mode
* by double clicking the reset button and upload doom.fat.dump (from doom/utils folder)
* with this command
*
* dfu-util -a1 --device 0x2341:0x035b -D doom.fat.dump --dfuse-address=0x90000000
*/
/*
Arduino wrapper for DoomGeneric
Mouse and keyboard controls are not implemented at the moment.

To use the internal QSPI flash as storage, run Portenta_WiFiFirmwareUpdater
sketch once to create the partitions, AccessFlashAsUSBDisk to expose the QSPI flash
as a USB disk, copy DOOM1.WAD in the biggest partition, flash this sketch and you are ready to go :)
*/

#include "QSPIFBlockDevice.h"
#include "FATFileSystem.h"
#include "MBRBlockDevice.h"
#include "doomgeneric.h"

QSPIFBlockDevice block_device(PD_11, PD_12, PF_7, PD_13, PF_10, PG_6, QSPIF_POLARITY_MODE_1, 40000000);
QSPIFBlockDevice block_device;
// Comment previous line and uncomment these two if you want to store DOOM.WAD in an external SD card (FAT32 formatted)
// #include "SDMMCBlockDevice.h"
// SDMMCBlockDevice block_device;

mbed::FATFileSystem fs("fs");
mbed::MBRBlockDevice fs_data(&block_device, 2);
static mbed::FATFileSystem fs("fs");

extern "C" int main_wrapper(int argc, char **argv);
char*argv[] = {"/fs/doom", "-iwad", "/fs/DOOM1.WAD"};

void setup() {
// put your setup code here, to run once:
delay(2000);
int err = fs.mount(&block_device);
int err = fs.mount(&fs_data);
if (err) {
// Reformat if we can't mount the filesystem
// this should only happen on the first boot
printf("No filesystem found, formatting... ");
fflush(stdout);
err = fs.reformat(&block_device);
printf("No filesystem found, please run AccessFlashAsUSBDisk sketch and copy DOOM1.WAD in the big partition");
pinMode(LEDB, OUTPUT);
while (1) {
digitalWrite(LEDB, LOW);
delay(100);
digitalWrite(LEDB, HIGH);
delay(100);
}
}
DIR *dir;
struct dirent *ent;
Expand All @@ -51,4 +54,4 @@ void setup() {
void loop() {
// put your main code here, to run repeatedly:

}
}
Binary file removed libraries/doom/src/utils/DOOM1.WAD
Binary file not shown.
Binary file removed libraries/doom/src/utils/doom.fat
Binary file not shown.
Binary file removed libraries/doom/src/utils/doom.fat.dump
Binary file not shown.
Binary file removed libraries/doom/src/utils/doom.littlefs
Binary file not shown.