Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion devices/ble_hci/common-hal/_bleio/__init__.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ bool vm_used_ble;

// switch (sec_status) {
// case BLE_GAP_SEC_STATUS_UNSPECIFIED:
// mp_raise_bleio_SecurityError(MP_ERROR_TEXT("Unspecified issue. Can be that the pairing prompt on the other device was declined or ignored."));
// mp_raise_bleio_SecurityError(MP_ERROR_TEXT("Unspecified issue. The pairing request on the other device may have been declined or ignored."));
// return;
// default:
// mp_raise_bleio_SecurityError(MP_ERROR_TEXT("Unknown security error: 0x%04x"), sec_status);
Expand Down
32 changes: 17 additions & 15 deletions locale/circuitpython.pot
Original file line number Diff line number Diff line change
Expand Up @@ -1682,7 +1682,8 @@ msgstr ""
msgid "Only IPv4 addresses supported"
msgstr ""

#: ports/mimxrt10xx/common-hal/busio/SPI.c shared-bindings/busio/SPI.c
#: ports/mimxrt10xx/common-hal/busio/SPI.c
#: ports/raspberrypi/bindings/wiznet/PIO_SPI.c shared-bindings/busio/SPI.c
msgid "Must provide MISO or MOSI pin"
msgstr ""

Expand Down Expand Up @@ -1738,12 +1739,14 @@ msgid "Unknown gatt error: 0x%04x"
msgstr ""

#: ports/nordic/common-hal/_bleio/__init__.c
#: ports/zephyr-cp/common-hal/_bleio/Connection.c
msgid ""
"Unspecified issue. Can be that the pairing prompt on the other device was "
"Unspecified issue. The pairing request on the other device may have been "
"declined or ignored."
msgstr ""

#: ports/nordic/common-hal/_bleio/__init__.c
#: ports/zephyr-cp/common-hal/_bleio/Connection.c
#, c-format
msgid "Unknown security error: 0x%04x"
msgstr ""
Expand Down Expand Up @@ -1844,6 +1847,17 @@ msgstr ""
msgid "In-buffer elements must be <= 4 bytes long"
msgstr ""

#: ports/raspberrypi/bindings/wiznet/PIO_SPI.c shared-bindings/bitbangio/I2C.c
#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/I2C.c
#: shared-bindings/busio/SPI.c
msgid "Function requires lock"
msgstr ""

#: ports/raspberrypi/bindings/wiznet/PIO_SPI.c shared-bindings/bitbangio/SPI.c
#: shared-bindings/busio/SPI.c
msgid "buffer slices must be of equal length"
msgstr ""

#: ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.c
#: ports/stm/common-hal/alarm/touch/TouchAlarm.c
msgid "Touch alarms not available"
Expand Down Expand Up @@ -3732,6 +3746,7 @@ msgid "file must be a file opened in byte mode"
msgstr ""

#: shared-bindings/audiodelays/Chorus.c shared-bindings/audiodelays/Echo.c
#: shared-bindings/audiodelays/Flanger.c
#: shared-bindings/audiodelays/GranularPitchShift.c
#: shared-bindings/audiodelays/MultiTapDelay.c
#: shared-bindings/audiodelays/PitchShift.c
Expand All @@ -3749,10 +3764,6 @@ msgstr ""
msgid "bits_per_sample must be 16"
msgstr ""

#: shared-bindings/audioi2sin/I2SIn.c
msgid "%q requires %q"
msgstr ""

#: shared-bindings/audioi2sin/I2SIn.c
#, c-format
msgid "invalid destination buffer, must be an array of type: %c"
Expand All @@ -3762,15 +3773,6 @@ msgstr ""
msgid "%q and %q must be different"
msgstr ""

#: shared-bindings/bitbangio/I2C.c shared-bindings/bitbangio/SPI.c
#: shared-bindings/busio/I2C.c shared-bindings/busio/SPI.c
msgid "Function requires lock"
msgstr ""

#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c
msgid "buffer slices must be of equal length"
msgstr ""

#: shared-bindings/bitmapfilter/__init__.c
msgid ""
"weights must be a sequence with an odd square number of elements (usually 9 "
Expand Down
2 changes: 1 addition & 1 deletion ports/nordic/common-hal/_bleio/__init__.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ void check_sec_status(uint8_t sec_status) {

switch (sec_status) {
case BLE_GAP_SEC_STATUS_UNSPECIFIED:
mp_raise_bleio_SecurityError(MP_ERROR_TEXT("Unspecified issue. Can be that the pairing prompt on the other device was declined or ignored."));
mp_raise_bleio_SecurityError(MP_ERROR_TEXT("Unspecified issue. The pairing request on the other device may have been declined or ignored."));
return;
default:
mp_raise_bleio_SecurityError(MP_ERROR_TEXT("Unknown security error: 0x%04x"), sec_status);
Expand Down
15 changes: 15 additions & 0 deletions ports/zephyr-cp/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,18 @@ config BT_GATT_DYNAMIC_DB

config BT_GATT_CLIENT
default y

config BT_SMP
default y

config BT_BONDABLE
default y

config SETTINGS
default y

config BT_SETTINGS
default y

config BT_KEYS_OVERWRITE_OLDEST
default y
8 changes: 7 additions & 1 deletion ports/zephyr-cp/boards/adafruit_feather_rp2040.overlay
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,13 @@
nvm_partition: partition@180000 {
compatible = "zephyr,mapped-partition";
label = "nvm";
reg = <0x180000 0x1000>;
reg = <0x180000 0x800>;
};

storage_partition: partition@180800 {
compatible = "zephyr,mapped-partition";
label = "storage";
reg = <0x180800 0x800>;
};

circuitpy_partition: partition@181000 {
Expand Down
18 changes: 18 additions & 0 deletions ports/zephyr-cp/boards/frdm_mcxn947_mcxn947_cpu0.overlay
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
&w25q64jvssiq {
/delete-node/ partitions;

partitions {
#address-cells = <1>;
#size-cells = <1>;
ranges;

storage_partition: partition@0 {
compatible = "zephyr,mapped-partition";
label = "storage";
reg = <0x0 DT_SIZE_K(32)>;
};

circuitpy_partition: partition@8000 {
compatible = "zephyr,mapped-partition";
label = "circuitpy";
reg = <0x00008000 (DT_SIZE_M(8) - DT_SIZE_K(32))>;
};
};
};

#include "../app.overlay"
9 changes: 7 additions & 2 deletions ports/zephyr-cp/boards/frdm_rw612.overlay
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
&w25q512jvfiq {
partitions {
/delete-node/ partition@620000;
circuitpy_partition: partition@620000 {
storage_partition: partition@620000 {
compatible = "zephyr,mapped-partition";
label = "storage";
reg = <0x00620000 DT_SIZE_K(32)>;
};
circuitpy_partition: partition@628000 {
compatible = "zephyr,mapped-partition";
label = "circuitpy";
reg = <0x00620000 (DT_SIZE_M(58) - DT_SIZE_K(128))>;
reg = <0x00628000 (DT_SIZE_M(58) - DT_SIZE_K(128) - DT_SIZE_K(32))>;
};
};
};
Expand Down
9 changes: 7 additions & 2 deletions ports/zephyr-cp/boards/frdm_rw612_rw612_cpu0.overlay
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
&w25q512jvfiq {
partitions {
/delete-node/ storage_partition;
circuitpy_partition: partition@620000 {
storage_partition: partition@620000 {
compatible = "zephyr,mapped-partition";
label = "storage";
reg = <0x00620000 DT_SIZE_K(32)>;
};
circuitpy_partition: partition@628000 {
compatible = "zephyr,mapped-partition";
label = "circuitpy";
reg = <0x00620000 (DT_SIZE_M(58) - DT_SIZE_K(128))>;
reg = <0x00628000 (DT_SIZE_M(58) - DT_SIZE_K(128) - DT_SIZE_K(32))>;
};
}

Expand Down
9 changes: 7 additions & 2 deletions ports/zephyr-cp/boards/mimxrt1170_evk_mimxrt1176_cm7.overlay
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
&is25wp128 {
partitions {
/delete-node/ partition@e20000;
circuitpy_partition: partition@e20000 {
storage_partition: partition@e20000 {
compatible = "zephyr,mapped-partition";
label = "storage";
reg = <0x00e20000 DT_SIZE_K(32)>;
};
circuitpy_partition: partition@e28000 {
compatible = "zephyr,mapped-partition";
label = "circuitpy";
reg = <0x00e20000 (DT_SIZE_M(2) - DT_SIZE_K(128))>;
reg = <0x00e28000 (DT_SIZE_M(2) - DT_SIZE_K(128) - DT_SIZE_K(32))>;
};
};
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,3 +121,9 @@ wifi = false
zephyr_display = false
zephyr_kernel = false
zlib = true
# extmod modules shared with MicroPython
asyncio = true
binascii = true
json = true
re = true
select = true
8 changes: 7 additions & 1 deletion ports/zephyr-cp/boards/native_sim.overlay
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,13 @@
circuitpy_partition: partition@0 {
compatible = "zephyr,mapped-partition";
label = "circuitpy";
reg = <0x00000000 DT_SIZE_K(2040)>;
reg = <0x00000000 DT_SIZE_K(2032)>;
};

storage_partition: partition@1fc000 {
compatible = "zephyr,mapped-partition";
label = "storage";
reg = <0x001fc000 DT_SIZE_K(8)>;
};

nvm_partition: partition@1fe000 {
Expand Down
8 changes: 7 additions & 1 deletion ports/zephyr-cp/boards/nrf5340bsim_nrf5340_cpuapp.overlay
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,13 @@
circuitpy_partition: partition@0 {
compatible = "zephyr,mapped-partition";
label = "circuitpy";
reg = <0x00000000 DT_SIZE_K(1024)>;
reg = <0x00000000 DT_SIZE_K(1008)>;
};

storage_partition: partition@fc000 {
compatible = "zephyr,mapped-partition";
label = "storage";
reg = <0x000fc000 DT_SIZE_K(16)>;
};
};
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,15 @@
#size-cells = <1>;

circuitpy_partition: partition@0 {
compatible = "zephyr,mapped-partition";
label = "circuitpy";
reg = <0x00000000 DT_SIZE_K(512)>;
reg = <0x00000000 (DT_SIZE_K(2036) - DT_SIZE_K(32))>;
};

storage_partition: partition@1f5000 {
compatible = "zephyr,mapped-partition";
label = "storage";
reg = <0x001f5000 DT_SIZE_K(32)>;
};
};
};
Expand Down
8 changes: 7 additions & 1 deletion ports/zephyr-cp/boards/rpi_pico2_rp2350a_m33.overlay
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,13 @@
nvm_partition: partition@180000 {
compatible = "zephyr,mapped-partition";
label = "nvm";
reg = <0x180000 0x1000>;
reg = <0x180000 0x800>;
};

storage_partition: partition@180800 {
compatible = "zephyr,mapped-partition";
label = "storage";
reg = <0x180800 0x800>;
};

circuitpy_partition: partition@181000 {
Expand Down
8 changes: 7 additions & 1 deletion ports/zephyr-cp/boards/rpi_pico2_rp2350a_m33_w.overlay
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,13 @@
nvm_partition: partition@180000 {
compatible = "zephyr,mapped-partition";
label = "nvm";
reg = <0x180000 0x1000>;
reg = <0x180000 0x800>;
};

storage_partition: partition@180800 {
compatible = "zephyr,mapped-partition";
label = "storage";
reg = <0x180800 0x800>;
};

circuitpy_partition: partition@181000 {
Expand Down
8 changes: 7 additions & 1 deletion ports/zephyr-cp/boards/rpi_pico_rp2040.overlay
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,13 @@
nvm_partition: partition@180000 {
compatible = "zephyr,mapped-partition";
label = "nvm";
reg = <0x180000 0x1000>;
reg = <0x180000 0x800>;
};

storage_partition: partition@180800 {
compatible = "zephyr,mapped-partition";
label = "storage";
reg = <0x180800 0x800>;
};

circuitpy_partition: partition@181000 {
Expand Down
8 changes: 7 additions & 1 deletion ports/zephyr-cp/boards/rpi_pico_rp2040_w.overlay
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,13 @@
nvm_partition: partition@180000 {
compatible = "zephyr,mapped-partition";
label = "nvm";
reg = <0x180000 0x1000>;
reg = <0x180000 0x800>;
};

storage_partition: partition@180800 {
compatible = "zephyr,mapped-partition";
label = "storage";
reg = <0x180800 0x800>;
};

circuitpy_partition: partition@181000 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,16 @@
partitions {
/delete-node/ partition@7800000;

circuitpy_partition: partition@7800000 {
storage_partition: partition@7800000 {
compatible = "zephyr,mapped-partition";
label = "storage";
reg = <0x7800000 DT_SIZE_K(32)>;
};

circuitpy_partition: partition@7808000 {
compatible = "zephyr,mapped-partition";
label = "circuitpy";
reg = <0x7800000 DT_SIZE_M(8)>;
reg = <0x7808000 (DT_SIZE_M(8) - DT_SIZE_K(32))>;
};
};
};
Expand Down
16 changes: 16 additions & 0 deletions ports/zephyr-cp/boards/stm32h7b3i_dk.overlay
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
&mx25lm51245 {
/delete-node/ partitions;

partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;

storage_partition: partition@0 {
label = "storage";
reg = <0x00000000 DT_SIZE_K(32)>;
};

circuitpy_partition: partition@8000 {
label = "circuitpy";
reg = <0x00008000 (DT_SIZE_M(64) - DT_SIZE_K(32))>;
};
};
};

&sram5 {
Expand Down
Loading
Loading