118 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Stefan Kratochwil	5f9bdb2517	Fastest sd clockrate possible with sandisk ultra 32gb card	2025-10-14 20:27:41 +02:00
Matthias Blankertz	502805e2e8	hwconfig: Fix pad config for SD SPI, move clockrate to hwconfig ... The code snippet in hwconfig to adjust the drive strength was incorrect: It was adjusting the wrong pins. This was probably not updated during some pin shuffling in the breadboard phase. Fix this by adjusting the correct pins. Experimentation shows that both setting the slew rate to fast or setting the drive strength to 8 mA (default: slow and 4 mA) is sufficient to make SD SPI work at 25 MHz on the Rev1 PCB. For now, the combination 8 mA and slow is chosen (slow slew rate should result in less high frequency EMI). Also make the SD clock rate adjustable in hwconfig, and set it to 25 MHz for Rev1 and 15 MHz for the breadboard setup. Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-10-13 23:38:33 +02:00
Matthias Blankertz	4a15b2c221	Merge pull request 'hw-update-and-pcb' (#40) from hw-update-and-pcb into main ... Reviewed-on: #40 Reviewed-by: Stefan Kratochwil <kratochwil-la@gmx.de>	2025-10-07 20:19:56 +00:00
Matthias Blankertz	d3674e46aa	scripts: Add HW revision support to flash.sh ... Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-10-07 22:12:44 +02:00
Matthias Blankertz	1fa3b3c887	rp2_sd: Increase timeout for SD card initialization ... Spurious failures were observed with a SanDisk Ultra 32GB card that no longer occur with the increased timeouts. Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-10-07 22:12:44 +02:00
Matthias Blankertz	4d295501eb	build: Fix check-format and clang-format paths ... The check-format and clang-format targets were not adjusted when the code was reorganized in commit 7f8282315e ("Restructure sources"). Fix it to find the C sources that are now in the modules directory. Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-10-07 22:12:44 +02:00
Matthias Blankertz	c9150eb21a	audiocore: Support swapping dclk and lrclk pins for I2S ... Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-10-07 22:12:44 +02:00
Matthias Blankertz	da90228ab5	Make hardware configurable ... Move hardware-specifics (pin assignments, power management) to hwconfig_*.py. The build system will build a firmware image firmware-filesystem-$variant.uf2 for all variants for which a hwconfig_$variant.py file exits. Inside the filesystem image, the selected variants hwconfig_$variant.py file will always be named hwconfig.py. At runtime, main.py will attempt to import hwconfig which will load the configuration for the correct variant. Currently, the hwconfig_* modules are expected to define the pin mapping and implement a board_init method. Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-10-07 22:12:44 +02:00
Matthias Blankertz	bd17197fef	Merge pull request 'sd: Fix SDSC card support' (#41) from fix-sdsc-card-blocksize into main ... Reviewed-on: #41 Reviewed-by: Stefan Kratochwil <kratochwil-la@gmx.de>	2025-10-07 19:54:11 +00:00
Matthias Blankertz	d39157ba0a	sd: Fix SDSC card support ... - Old SDSC cards could have a native blocksize != 512 bytes, but they should support the SET_BLOCKLEN command to set the blocksize to 512. Use that so we can just assume 512 everywhere else. - SDSC cards used byte addresses, not sector numbers, for the argument of READ_BLOCK and WRITE_BLOCK. Check the card type and multiply the sector number with 512 if necessary. Tested with a noname chinese 128 MiB-ish card. Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-09-07 15:53:22 +02:00
Matthias Blankertz	09c8f522b8	hw: Clean up schematic, add RUN reset ... Clean up schematic and put battery power, buttons and run/reset in subblocks. Add missing switch on RUN to reset the RP2040. In the PCB this is actually a jumper instead of a switch right now, so it fits in the existing layout. Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-09-02 22:17:59 +02:00
Matthias Blankertz	0ce0b51f1c	Add battery charger, PCB rev 1 ... Signed-off-by: Matthias Blankertz <matthias@blankertz.org> pcb-rev1	2025-09-02 22:17:59 +02:00
Matthias Blankertz	e33fefc552	Merge pull request 'add-pytest-infrastructure' (#38) from add-pytest-infrastructure into main ... Reviewed-on: #38 Reviewed-by: Stefan Kratochwil <kratochwil-la@gmx.de>	2025-08-28 15:37:09 +00:00
Matthias Blankertz	95b3924736	ci: flake8 on all python folders; Run pytest in CI ... Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-08-27 13:43:12 +02:00
Matthias Blankertz	27110b7b62	Add infrastructure for pytest and mypy ... Make mypy run with proper type stubs for micropython RP2. Add basic structure for pytest testing. Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-08-27 13:42:08 +02:00
Matthias Blankertz	fb36ac8ed2	Merge pull request 'Switch btree to use mpy stack' (#37) from btree-use-mpy-stack into main ... Reviewed-on: #37 Reviewed-by: Stefan Kratochwil <kratochwil-la@gmx.de>	2025-08-27 11:30:05 +00:00
Matthias Blankertz	4c7ce78201	Switch btree to use mpy stack	2025-08-24 17:51:35 +02:00
Matthias Blankertz	10de110375	Merge remote-tracking branch 'origin/feature/upgrade_micropython_1_26_0_plus_fixes'	2025-08-24 17:47:30 +02:00
Stefan Kratochwil	5c2df891d9	micropython: upgrade to 1.26.0, reverted single commit. ... Migrated all patches from the previous version. A change in the Findpicotool.cmake script in the pico-sdk led to a downgrade of picotool, which incorporated mbedtls into the build, which itself is not buildable with cmake versions < 3.5. The commit which made this isolated change was reverted. Future versions of micropython will use pico-sdk 2.2.0 or newer, where this problem is fixed, and picotool is pinned to a release version.	2025-08-24 17:43:26 +02:00
Matthias Blankertz	e72443ff1f	Merge pull request 'misc-minor-fixes' (#35) from misc-minor-fixes into main ... Reviewed-on: #35 Reviewed-by: Stefan Kratochwil <kratochwil-la@gmx.de>	2025-08-24 15:36:59 +00:00
Matthias Blankertz	3f0eeb837a	micropython: Increase micropython stack allocation ... Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-08-23 12:54:04 +02:00
Matthias Blankertz	3bd81f01e2	rp2_sd: Increase write timeout ... Some SD cards seem to need a bit more time...	2025-08-20 19:51:07 +02:00
Matthias Blankertz	6f155ebb55	audiocore: Fix small race window in get_fifo_read_value_blocking ... In theory, the FIFO interrupt could occur after getting the fifo_read_value and reenabling interrupts, but before __wfi is called, causing a deadlock. Fix this by calling __wfi with interrupts still disabled. It will return immediately if an interrupt is pending. Add two __nop to ensure that the CPU has enough instructions between enabling interrupts and disabling them again at the top of the loop. Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-08-20 19:50:51 +02:00
Matthias Blankertz	f1de8c6c75	Merge pull request 'micropython: Enable btree module for RPI_PICO_W' (#34) from enable-btree-module into main ... Reviewed-on: #34 Reviewed-by: Stefan Kratochwil <kratochwil-la@gmx.de>	2025-08-19 18:10:31 +00:00
Matthias Blankertz	3b349af8cf	micropython: Enable btree module for RPI_PICO_W	2025-08-19 20:05:01 +02:00
Matthias Blankertz	679495bf2b	Merge pull request 'Handle partitioned and unpartitioned SD cards' (#32) from sd-partition-support into main ... Reviewed-on: #32 Reviewed-by: Stefan Kratochwil <kratochwil-la@gmx.de>	2025-08-05 19:51:58 +00:00
Matthias Blankertz	e9bd4f72b6	Handle partitioned and unpartitioned SD cards ... Add utils.MBRPartition to implement basic partitioned device support. Try to mount partition 1 of SDCard first, if that fails, try to mount entire device as FAT file system. Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-08-05 21:16:09 +02:00
Matthias Blankertz	34f9a44cdb	schematic: Fix I2S_SD pullup ... Sparkfun I2S audio board already has MAX98357A SD pin pullup for mono mode, so external pullup is redundant and can actually cause issues. Remove it.	2025-07-22 22:07:44 +02:00
Matthias Blankertz	2796dbcf16	Merge pull request 'Add SDCard write support' (#31) from standalone-mp3 into main ... Reviewed-on: #31 Reviewed-by: Stefan Kratochwil <kratochwil-la@gmx.de>	2025-07-22 20:04:28 +00:00
Stefan Kratochwil	ff2a609752	rp2_sd: make debug flags accessible through cmake variables.	2025-07-22 21:39:07 +02:00
Matthias Blankertz	2f0d4cc3eb	rp2_sd: Add optional read CRC check	2025-07-22 21:30:27 +02:00
Matthias Blankertz	7ccab40cd6	rp2_sd: Add write support to SD driver ... Add write support to rp2_sd driver. Cleanup standalone-mp3 test tool and add write test mode. Signed-off-by: Matthias Blankertz <matthias@blankertz.org>	2025-07-22 21:30:27 +02:00
Matthias Blankertz	96fea9dab6	Add standalone-mp3 test tool	2025-06-26 20:49:03 +02:00
Matthias Blankertz	9059da1a70	Merge pull request 'nfc-mp3-demo' (#19) from nfc-mp3-demo into main ... Reviewed-on: #19 Reviewed-by: Stefan Kratochwil <kratochwil-la@gmx.de>	2025-05-27 18:48:42 +00:00
Stefan Kratochwil	0353796110	Merge pull request 'micropython: upgrade to 1.25.0 plus necessary changes and fixes.' (#20) from feature/upgrade_micropython_1_25_0_plus_fixes into main ... Reviewed-on: #20 Reviewed-by: Matthias Blankertz <matthias@blankertz.org>	2025-05-27 18:28:16 +00:00
Matthias Blankertz	ce02daad3a	Move playlist handling from mp3player to app ... This completes the move of the nfc-mp3-demo to the new architecture.	2025-05-20 22:04:27 +02:00
Matthias Blankertz	7778147b66	app: Implement volume curve	2025-05-20 22:04:27 +02:00
Matthias Blankertz	7712c25627	Turn TimerManager into a Singleton	2025-05-20 22:04:27 +02:00
Matthias Blankertz	69b6f6e860	build: Copy python files to staging dir for littlefs	2025-05-20 22:04:27 +02:00
Matthias Blankertz	903840f982	wip: New architecture ... Change PlayerApp to new architecture - depedencies injected via named tuple - some initial type checking - move on button press logic to PlayerApp TODO: Adapt MP3 player	2025-05-20 22:04:27 +02:00
Matthias Blankertz	b477aba94c	Add initial button handling	2025-05-20 22:04:27 +02:00
Matthias Blankertz	f0c3fe4db8	Use context managers to ensure deinit of audiocore and sd	2025-05-20 22:04:27 +02:00
Matthias Blankertz	d02776eea8	Add basic application for playback based on NFC tags ... Copy and clean up test.py to main.py. Add app module (currently on app.py, maybe make it a directory later) for application classes. Implement app.TimerManager to allow scheduling of delayed events in the micropython async framework. Implement app.TagPlaybackManager which handles playing back MP3 files based on the NFC tag reader. Currently, simply plays all MP3 files in a folder, for which the folder name matches the tag id, in order. Resume, random and other features not yet supported.	2025-05-20 22:04:27 +02:00
Matthias Blankertz	fb496b6991	nfc: Add tag change notification callback	2025-05-20 22:04:27 +02:00
Stefan Kratochwil	1b683358d1	micropython: upgrade to 1.25.0 plus necessary changes and fixes. ... Upgrade and cherry-picks were necessary due to a compilation issue introduced with gcc 15.1 regarding unterminated string literals. For more details see https://github.com/micropython/micropython/pull/17269. Still hot and untested...	2025-05-20 20:13:24 +02:00
Matthias Blankertz	91af2087b2	Merge pull request '15-create-filesystem-image-with-firmware' (#17) from 15-create-filesystem-image-with-firmware into main ... Reviewed-on: #17 Reviewed-by: Stefan Kratochwil <kratochwil-la@gmx.de>	2025-04-29 17:37:11 +00:00
Matthias Blankertz	7f8282315e	Restructure sources ... The python and C modules that are supposed to be built into the firmware image (i.e. those that are in manifest.py or in USER_C_MODULES) have been moved to the software/modules directory. The software/src directory should now only contain python scripts and other files that should be installed to the Picos flash filesystem. The idea is that these should be those scripts that implement the application behaviour, as these are the ones that a user who does not want to build the whole firmware themself wants to modify.	2025-04-01 22:05:30 +02:00
Matthias Blankertz	8a8cb85c39	ci: Add firmware with filesystem image to artifacts	2025-04-01 22:05:30 +02:00
Matthias Blankertz	e2895589f1	schematic: Update to KiCad 9 and some minor fixes ... - Add gain setting resistor for I2S Amp - Add three pushbuttons	2025-04-01 21:21:48 +02:00
Matthias Blankertz	de5f0a3ad0	Add test rig	2025-04-01 21:14:39 +02:00