Skip to content

Fix Pico builds with the io umbrella manifest #1595

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.

Sign up for GitHub

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

Open
HipsterBrown wants to merge 3 commits into
base: public
Choose a base branch
from
Open

Fix Pico builds with the io umbrella manifest #1595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69c5cfc
fix(pico): add missing comma to pico io manifest includes list
HipsterBrown Apr 18, 2026
36a7388
fix(io): use pico/manifest_net.json only for compatible subplatform t…
HipsterBrown Apr 18, 2026
a237061
fix(pico/audioout): add conditional guard defines, cast samples type
HipsterBrown Apr 18, 2026
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
15 changes: 14 additions & 1 deletion modules/io/audioout/pico/audioout-pico.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,19 @@
#include "pico/audio_i2s.h"
#include "modTimer.h"

#ifndef MODDEF_AUDIOOUT_I2S_BITSPERSAMPLE
#define MODDEF_AUDIOOUT_I2S_BITSPERSAMPLE 16
#endif
#ifndef MODDEF_AUDIOOUT_I2S_DATAOUT_PIN
#define MODDEF_AUDIOOUT_I2S_DATAOUT_PIN PICO_AUDIO_I2S_DATA_PIN
#endif
#ifndef MODDEF_AUDIOOUT_I2S_BCK_PIN
#define MODDEF_AUDIOOUT_I2S_BCK_PIN PICO_AUDIO_I2S_CLOCK_PIN_BASE
#endif
#ifndef MODDEF_AUDIOOUT_I2S_LR_PIN
#define MODDEF_AUDIOOUT_I2S_LR_PIN (MODDEF_AUDIOOUT_I2S_BCK_PIN + 1)
#endif

typedef struct AudioOutElementRecord AudioOutElementRecord;
typedef struct AudioOutElementRecord *AudioOutElement;

Expand Down Expand Up @@ -576,7 +589,7 @@ int doWrite(AudioOut audioOut, void *audioData, xsUnsignedValue requested)
int16_t volumeFixed = audioOut->volumeFixed;
int requestedSamples = amt >> 1; //@@ broken for stereo & 8 bit
int16_t *src = (int16_t *)audioData;
int16_t *samples = buffer->buffer->bytes + audioOut->bufferPendingPos;
int16_t *samples = (int16_t *)(buffer->buffer->bytes + audioOut->bufferPendingPos);
int i;
for (i=0; i<requestedSamples; i++)
samples[i] = (*src++ * volumeFixed) >> 8;
Expand Down
6 changes: 6 additions & 0 deletions modules/io/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
"include": "./manifests/esp32/manifest.json"
},
"pico": {
"include": "./manifests/pico/manifest.json"
},
"pico/pico_w": {
"include": "./manifests/pico/manifest_net.json"
},
"pico/pico_2_w": {
"include": "./manifests/pico/manifest_net.json"
},
"nrf52": {
Expand Down
3 changes: 1 addition & 2 deletions modules/io/manifests/pico/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"$(IO)/analog/manifest.json",
"$(IO)/audioout/manifest.json",
"$(IO)/digital/manifest.json",
"$(IO)/i2c/manifest.json"
"$(IO)/i2c/manifest.json",
"$(IO)/pulsecount/manifest.json",
"$(IO)/pwm/manifest.json",
"$(IO)/serial/manifest.json",
Expand All @@ -18,7 +18,6 @@
"$(MODULES)/pins/digital/pico/modGPIO"
],
"commodetto/Bitmap": "$(COMMODETTO)/commodettoBitmap",

"system": "$(IO)/system/*"
},
"preload": [
Expand Down