summaryrefslogtreecommitdiff
path: root/shared-module
diff options
context:
space:
mode:
Diffstat (limited to 'shared-module')
-rw-r--r--shared-module/audioio/WaveFile.c11
-rw-r--r--shared-module/bitbangio/I2C.c4
-rw-r--r--shared-module/bitbangio/SPI.c13
-rw-r--r--shared-module/struct/__init__.c10
4 files changed, 20 insertions, 18 deletions
diff --git a/shared-module/audioio/WaveFile.c b/shared-module/audioio/WaveFile.c
index 7247db137..ce5877629 100644
--- a/shared-module/audioio/WaveFile.c
+++ b/shared-module/audioio/WaveFile.c
@@ -33,6 +33,7 @@
#include "py/runtime.h"
#include "shared-module/audioio/WaveFile.h"
+#include "supervisor/shared/translate.h"
struct wave_format_chunk {
uint16_t audio_format;
@@ -57,7 +58,7 @@ void common_hal_audioio_wavefile_construct(audioio_wavefile_obj_t* self,
if (bytes_read != 16 ||
memcmp(chunk_header, "RIFF", 4) != 0 ||
memcmp(chunk_header + 8, "WAVEfmt ", 8) != 0) {
- mp_raise_ValueError("Invalid wave file");
+ mp_raise_ValueError(translate("Invalid wave file"));
}
uint32_t format_size;
if (f_read(&self->file->fp, &format_size, 4, &bytes_read) != FR_OK) {
@@ -65,7 +66,7 @@ void common_hal_audioio_wavefile_construct(audioio_wavefile_obj_t* self,
}
if (bytes_read != 4 ||
format_size > sizeof(struct wave_format_chunk)) {
- mp_raise_ValueError("Invalid format chunk size");
+ mp_raise_ValueError(translate("Invalid format chunk size"));
}
struct wave_format_chunk format;
if (f_read(&self->file->fp, &format, format_size, &bytes_read) != FR_OK) {
@@ -79,7 +80,7 @@ void common_hal_audioio_wavefile_construct(audioio_wavefile_obj_t* self,
format.bits_per_sample > 16 ||
(format_size == 18 &&
format.extra_params != 0)) {
- mp_raise_ValueError("Unsupported format");
+ mp_raise_ValueError(translate("Unsupported format"));
}
// Get the sample_rate
self->sample_rate = format.sample_rate;
@@ -95,7 +96,7 @@ void common_hal_audioio_wavefile_construct(audioio_wavefile_obj_t* self,
}
if (bytes_read != 4 ||
memcmp((uint8_t *) data_tag, "data", 4) != 0) {
- mp_raise_ValueError("Data chunk must follow fmt chunk");
+ mp_raise_ValueError(translate("Data chunk must follow fmt chunk"));
}
uint32_t data_length;
@@ -103,7 +104,7 @@ void common_hal_audioio_wavefile_construct(audioio_wavefile_obj_t* self,
mp_raise_OSError(MP_EIO);
}
if (bytes_read != 4) {
- mp_raise_ValueError("Invalid file");
+ mp_raise_ValueError(translate("Invalid file"));
}
self->file_length = data_length;
self->data_start = self->file->fp.fptr;
diff --git a/shared-module/bitbangio/I2C.c b/shared-module/bitbangio/I2C.c
index 47529748a..5a9ac9a99 100644
--- a/shared-module/bitbangio/I2C.c
+++ b/shared-module/bitbangio/I2C.c
@@ -33,7 +33,7 @@
#include "shared-bindings/microcontroller/__init__.h"
#include "shared-bindings/digitalio/DigitalInOut.h"
#include "shared-module/bitbangio/types.h"
-
+#include "supervisor/shared/translate.h"
STATIC void delay(bitbangio_i2c_obj_t *self) {
// We need to use an accurate delay to get acceptable I2C
@@ -55,7 +55,7 @@ STATIC void scl_release(bitbangio_i2c_obj_t *self) {
}
// raise exception on timeout
if (count == 0) {
- mp_raise_msg(&mp_type_TimeoutError, "Clock stretch too long");
+ mp_raise_msg(&mp_type_TimeoutError, translate("Clock stretch too long"));
}
}
diff --git a/shared-module/bitbangio/SPI.c b/shared-module/bitbangio/SPI.c
index b203fe1b4..9e4508355 100644
--- a/shared-module/bitbangio/SPI.c
+++ b/shared-module/bitbangio/SPI.c
@@ -33,6 +33,7 @@
#include "shared-bindings/microcontroller/__init__.h"
#include "shared-bindings/digitalio/DigitalInOut.h"
#include "shared-module/bitbangio/types.h"
+#include "supervisor/shared/translate.h"
#define MAX_BAUDRATE (common_hal_mcu_get_clock_frequency() / 48)
@@ -41,13 +42,13 @@ void shared_module_bitbangio_spi_construct(bitbangio_spi_obj_t *self,
const mcu_pin_obj_t * miso) {
digitalinout_result_t result = common_hal_digitalio_digitalinout_construct(&self->clock, clock);
if (result != DIGITALINOUT_OK) {
- mp_raise_ValueError("Clock pin init failed.");
+ mp_raise_ValueError(translate("Clock pin init failed."));
}
if (mosi != mp_const_none) {
result = common_hal_digitalio_digitalinout_construct(&self->mosi, mosi);
if (result != DIGITALINOUT_OK) {
common_hal_digitalio_digitalinout_deinit(&self->clock);
- mp_raise_ValueError("MOSI pin init failed.");
+ mp_raise_ValueError(translate("MOSI pin init failed."));
}
self->has_mosi = true;
}
@@ -58,7 +59,7 @@ void shared_module_bitbangio_spi_construct(bitbangio_spi_obj_t *self,
if (mosi != mp_const_none) {
common_hal_digitalio_digitalinout_deinit(&self->mosi);
}
- mp_raise_ValueError("MISO pin init failed.");
+ mp_raise_ValueError(translate("MISO pin init failed."));
}
self->has_miso = true;
}
@@ -118,7 +119,7 @@ void shared_module_bitbangio_spi_unlock(bitbangio_spi_obj_t *self) {
// Writes out the given data.
bool shared_module_bitbangio_spi_write(bitbangio_spi_obj_t *self, const uint8_t *data, size_t len) {
if (len > 0 && !self->has_mosi) {
- mp_raise_ValueError("Cannot write without MOSI pin.");
+ mp_raise_ValueError(translate("Cannot write without MOSI pin."));
}
uint32_t delay_half = self->delay_half;
@@ -173,7 +174,7 @@ bool shared_module_bitbangio_spi_write(bitbangio_spi_obj_t *self, const uint8_t
// Reads in len bytes while outputting zeroes.
bool shared_module_bitbangio_spi_read(bitbangio_spi_obj_t *self, uint8_t *data, size_t len) {
if (len > 0 && !self->has_miso) {
- mp_raise_ValueError("Cannot read without MISO pin.");
+ mp_raise_ValueError(translate("Cannot read without MISO pin."));
}
uint32_t delay_half = self->delay_half;
@@ -237,7 +238,7 @@ bool shared_module_bitbangio_spi_read(bitbangio_spi_obj_t *self, uint8_t *data,
// transfer
bool shared_module_bitbangio_spi_transfer(bitbangio_spi_obj_t *self, const uint8_t *dout, uint8_t *din, size_t len) {
if (len > 0 && (!self->has_mosi || !self->has_miso) ) {
- mp_raise_ValueError("Cannot transfer without MOSI and MISO pins.");
+ mp_raise_ValueError(translate("Cannot transfer without MOSI and MISO pins."));
}
uint32_t delay_half = self->delay_half;
diff --git a/shared-module/struct/__init__.c b/shared-module/struct/__init__.c
index eac41c9c3..78c04f07b 100644
--- a/shared-module/struct/__init__.c
+++ b/shared-module/struct/__init__.c
@@ -31,11 +31,12 @@
#include "py/runtime.h"
#include "py/binary.h"
#include "py/parsenum.h"
+#include "supervisor/shared/translate.h"
void struct_validate_format(char fmt) {
#if MICROPY_NONSTANDARD_TYPECODES
if( fmt == 'S' || fmt == 'O') {
- mp_raise_RuntimeError("'S' and 'O' are not supported format types");
+ mp_raise_RuntimeError(translate("'S' and 'O' are not supported format types"));
}
#endif
}
@@ -70,7 +71,6 @@ mp_uint_t get_fmt_num(const char **p) {
return val;
}
-
void shared_modules_struct_pack_into(mp_obj_t fmt_in, byte *p, byte* end_p, size_t n_args, const mp_obj_t *args) {
const char *fmt = mp_obj_str_get_str(fmt_in);
char fmt_type = get_fmt_type(&fmt);
@@ -80,7 +80,7 @@ void shared_modules_struct_pack_into(mp_obj_t fmt_in, byte *p, byte* end_p, size
mp_uint_t sz = 1;
if (*fmt == '\0') {
// more arguments given than used by format string; CPython raises struct.error here
- mp_raise_RuntimeError("too many arguments provided with the given format");
+ mp_raise_RuntimeError(translate("too many arguments provided with the given format"));
}
struct_validate_format(*fmt);
@@ -88,7 +88,7 @@ void shared_modules_struct_pack_into(mp_obj_t fmt_in, byte *p, byte* end_p, size
sz = get_fmt_num(&fmt);
}
if (p + sz > end_p) {
- mp_raise_RuntimeError("buffer too small");
+ mp_raise_RuntimeError(translate("buffer too small"));
}
if (*fmt == 's') {
@@ -172,7 +172,7 @@ mp_obj_tuple_t * shared_modules_struct_unpack_from(mp_obj_t fmt_in, byte *p, byt
sz = get_fmt_num(&fmt);
}
if (p + sz > end_p) {
- mp_raise_RuntimeError("buffer too small");
+ mp_raise_RuntimeError(translate("buffer too small"));
}
mp_obj_t item;
if (*fmt == 's') {