Skip to content

Commit 76e0373

Browse files
tannewttannewt
committed
Fix nrf and unix
1 parent 2cd166b commit 76e0373

16 files changed

Lines changed: 53 additions & 38 deletions

File tree

‎ports/nrf/common-hal/analogio/AnalogIn.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
#include "common-hal/analogio/AnalogIn.h"
2929
#include "py/runtime.h"
30+
#include "supervisor/shared/translate.h"
3031

3132
#include "nrfx_saadc.h"
3233
#include "nrf_gpio.h"
@@ -35,7 +36,7 @@
3536

3637
void common_hal_analogio_analogin_construct(analogio_analogin_obj_t *self, const mcu_pin_obj_t *pin) {
3738
if (pin->adc_channel == 0)
38-
mp_raise_ValueError("Pin does not have ADC capabilities");
39+
mp_raise_ValueError(translate("Pin does not have ADC capabilities"));
3940

4041
nrf_gpio_cfg_default(NRF_GPIO_PIN_MAP(pin->port, pin->pin));
4142

‎ports/nrf/common-hal/analogio/AnalogOut.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@
2424
* THE SOFTWARE.
2525
*/
2626

27+
#include "shared-bindings/analogio/AnalogOut.h"
28+
2729
#include <stdint.h>
2830
#include <string.h>
2931

3032
#include "py/mperrno.h"
3133
#include "py/runtime.h"
32-
33-
#include "shared-bindings/analogio/AnalogOut.h"
34-
34+
#include "supervisor/shared/translate.h"
3535

3636
void common_hal_analogio_analogout_construct(analogio_analogout_obj_t* self, const mcu_pin_obj_t *pin) {
37-
mp_raise_RuntimeError("AnalogOut functionality not supported");
37+
mp_raise_RuntimeError(translate("AnalogOut functionality not supported"));
3838
}
3939

4040
bool common_hal_analogio_analogout_deinited(analogio_analogout_obj_t *self) {

‎ports/nrf/common-hal/busio/I2C.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include "shared-bindings/busio/I2C.h"
3030
#include "py/mperrno.h"
3131
#include "py/runtime.h"
32+
#include "supervisor/shared/translate.h"
3233

3334
#include "nrfx_twim.h"
3435
#include "nrf_gpio.h"
@@ -54,7 +55,7 @@ static uint8_t twi_error_to_mp(const nrfx_err_t err) {
5455

5556
void common_hal_busio_i2c_construct(busio_i2c_obj_t *self, const mcu_pin_obj_t *scl, const mcu_pin_obj_t *sda, uint32_t frequency, uint32_t timeout) {
5657
if (scl->pin == sda->pin)
57-
mp_raise_ValueError("Invalid pins");
58+
mp_raise_ValueError(translate("Invalid pins"));
5859

5960
const nrfx_twim_t instance = NRFX_TWIM_INSTANCE(INST_NO);
6061
self->twim = instance;

‎ports/nrf/common-hal/busio/UART.c‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#include "py/mperrno.h"
3333
#include "py/runtime.h"
3434
#include "py/stream.h"
35+
#include "supervisor/shared/translate.h"
3536

3637
#include "tick.h"
3738

@@ -41,15 +42,15 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
4142
const mcu_pin_obj_t * tx, const mcu_pin_obj_t * rx, uint32_t baudrate,
4243
uint8_t bits, uart_parity_t parity, uint8_t stop, uint32_t timeout,
4344
uint8_t receiver_buffer_size) {
44-
mp_raise_NotImplementedError("busio.UART not yet implemented");
45+
mp_raise_NotImplementedError(translate("busio.UART not yet implemented"));
4546
}
4647

4748
bool common_hal_busio_uart_deinited(busio_uart_obj_t *self) {
48-
mp_raise_NotImplementedError("busio.UART not yet implemented");
49+
mp_raise_NotImplementedError(translate("busio.UART not yet implemented"));
4950
}
5051

5152
void common_hal_busio_uart_deinit(busio_uart_obj_t *self) {
52-
mp_raise_NotImplementedError("busio.UART not yet implemented");
53+
mp_raise_NotImplementedError(translate("busio.UART not yet implemented"));
5354
if (common_hal_busio_uart_deinited(self)) {
5455
return;
5556
}
@@ -58,32 +59,32 @@ void common_hal_busio_uart_deinit(busio_uart_obj_t *self) {
5859

5960
// Read characters.
6061
size_t common_hal_busio_uart_read(busio_uart_obj_t *self, uint8_t *data, size_t len, int *errcode) {
61-
mp_raise_NotImplementedError("busio.UART not yet implemented");
62+
mp_raise_NotImplementedError(translate("busio.UART not yet implemented"));
6263
return 0;
6364
}
6465

6566
// Write characters.
6667
size_t common_hal_busio_uart_write(busio_uart_obj_t *self, const uint8_t *data, size_t len, int *errcode) {
67-
mp_raise_NotImplementedError("busio.UART not yet implemented");
68+
mp_raise_NotImplementedError(translate("busio.UART not yet implemented"));
6869
return 0;
6970
}
7071

7172
uint32_t common_hal_busio_uart_get_baudrate(busio_uart_obj_t *self) {
72-
mp_raise_NotImplementedError("busio.UART not yet implemented");
73+
mp_raise_NotImplementedError(translate("busio.UART not yet implemented"));
7374
return self->baudrate;
7475
}
7576

7677
void common_hal_busio_uart_set_baudrate(busio_uart_obj_t *self, uint32_t baudrate) {
77-
mp_raise_NotImplementedError("busio.UART not yet implemented");
78+
mp_raise_NotImplementedError(translate("busio.UART not yet implemented"));
7879
self->baudrate = baudrate;
7980
}
8081

8182
uint32_t common_hal_busio_uart_rx_characters_available(busio_uart_obj_t *self) {
82-
mp_raise_NotImplementedError("busio.UART not yet implemented");
83+
mp_raise_NotImplementedError(translate("busio.UART not yet implemented"));
8384
return 0;
8485
}
8586

8687
bool common_hal_busio_uart_ready_to_tx(busio_uart_obj_t *self) {
87-
mp_raise_NotImplementedError("busio.UART not yet implemented");
88+
mp_raise_NotImplementedError(translate("busio.UART not yet implemented"));
8889
return false;
8990
}

‎ports/nrf/common-hal/digitalio/DigitalInOut.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
#include "shared-bindings/digitalio/DigitalInOut.h"
2828
#include "py/runtime.h"
29+
#include "supervisor/shared/translate.h"
2930

3031
#include "nrf_gpio.h"
3132

@@ -154,7 +155,7 @@ digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(
154155
NRF_GPIO_Type *reg = nrf_gpio_pin_port_decode(&pin);
155156

156157
if (nrf_gpio_pin_dir_get(pin) == NRF_GPIO_PIN_DIR_OUTPUT) {
157-
mp_raise_AttributeError("Cannot get pull while in output mode");
158+
mp_raise_AttributeError(translate("Cannot get pull while in output mode"));
158159
return PULL_NONE;
159160
}
160161

‎ports/nrf/common-hal/microcontroller/Processor.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
#include "common-hal/microcontroller/Processor.h"
2828
#include "py/runtime.h"
29+
#include "supervisor/shared/translate.h"
2930

3031
#ifdef BLUETOOTH_SD
3132
#include "nrf_sdm.h"
@@ -45,7 +46,7 @@ float common_hal_mcu_processor_get_temperature(void) {
4546
uint32_t err_code = sd_temp_get(&temp);
4647
if (err_code != NRF_SUCCESS) {
4748
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
48-
"Can not get temperature. status: 0x" HEX2_FMT, (uint16_t)err_code));
49+
translate("Can not get temperature. status: 0x%02x"), (uint16_t)err_code));
4950

5051
return 0;
5152
}

‎ports/nrf/common-hal/pulseio/PWMOut.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#include "common-hal/pulseio/PWMOut.h"
3333
#include "nrf_gpio.h"
3434
#include "shared-bindings/pulseio/PWMOut.h"
35+
#include "supervisor/shared/translate.h"
3536

3637
#define PWM_MAX_MODULE 3
3738
#define PWM_MAX_CHANNEL 4
@@ -223,7 +224,7 @@ uint16_t common_hal_pulseio_pwmout_get_duty_cycle(pulseio_pwmout_obj_t* self) {
223224

224225
void common_hal_pulseio_pwmout_set_frequency(pulseio_pwmout_obj_t* self, uint32_t frequency) {
225226
if (frequency == 0 || frequency > 16000000) {
226-
mp_raise_ValueError("Invalid PWM frequency");
227+
mp_raise_ValueError(translate("Invalid PWM frequency"));
227228
}
228229

229230
self->freq = frequency;
@@ -238,4 +239,3 @@ uint32_t common_hal_pulseio_pwmout_get_frequency(pulseio_pwmout_obj_t* self) {
238239
bool common_hal_pulseio_pwmout_get_variable_frequency(pulseio_pwmout_obj_t* self) {
239240
return self->variable_freq;
240241
}
241-

‎ports/nrf/common-hal/usb_hid/Device.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include "common-hal/usb_hid/Device.h"
3030
#include "py/runtime.h"
3131
#include "shared-bindings/usb_hid/Device.h"
32+
#include "supervisor/shared/translate.h"
3233
#include "tusb.h"
3334

3435
uint8_t common_hal_usb_hid_device_get_usage_page(usb_hid_device_obj_t *self) {
@@ -41,21 +42,21 @@ uint8_t common_hal_usb_hid_device_get_usage(usb_hid_device_obj_t *self) {
4142

4243
void common_hal_usb_hid_device_send_report(usb_hid_device_obj_t *self, uint8_t* report, uint8_t len) {
4344
if (len != self->report_length) {
44-
mp_raise_ValueError_varg("Buffer incorrect size. Should be %d bytes.", self->report_length);
45+
mp_raise_ValueError_varg(translate("Buffer incorrect size. Should be %d bytes."), self->report_length);
4546
}
4647

4748
// Wait until interface is ready, timeout = 2 seconds
4849
uint64_t end_ticks = ticks_ms + 2000;
4950
while ( (ticks_ms < end_ticks) && !tud_hid_generic_ready() ) { }
5051

5152
if ( !tud_hid_generic_ready() ) {
52-
mp_raise_msg(&mp_type_OSError, "USB Busy");
53+
mp_raise_msg(&mp_type_OSError, translate("USB Busy"));
5354
}
5455

5556
memcpy(self->report_buffer, report, len);
5657

5758
if ( !tud_hid_generic_report(self->report_id, self->report_buffer, len) ) {
58-
mp_raise_msg(&mp_type_OSError, "USB Error");
59+
mp_raise_msg(&mp_type_OSError, translate("USB Error"));
5960
}
6061
}
6162

@@ -85,4 +86,3 @@ void tud_hid_generic_set_report_cb(uint8_t report_id, hid_report_type_t report_t
8586
}
8687
}
8788
}
88-

‎ports/nrf/drivers/bluetooth/ble_drv.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ void ble_drv_address_get(ble_drv_addr_t * p_addr) {
242242

243243
if (err_code != 0) {
244244
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
245-
"Can not query for the device address."));
245+
translate("Can not query for the device address.")));
246246
}
247247

248248
BLE_DRIVER_LOG("ble address, type: " HEX2_FMT ", " \

‎ports/nrf/modules/ubluepy/ubluepy_characteristic.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
#include "py/obj.h"
2828
#include "py/runtime.h"
29+
#include "supervisor/shared/translate.h"
2930

3031
#if MICROPY_PY_UBLUEPY_PERIPHERAL || MICROPY_PY_UBLUEPY_CENTRAL
3132

@@ -64,7 +65,7 @@ STATIC mp_obj_t ubluepy_characteristic_make_new(const mp_obj_type_t *type, size_
6465
// (void)sd_characterstic_add(s);
6566
} else {
6667
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
67-
"Invalid UUID parameter"));
68+
translate("Invalid UUID parameter")));
6869
}
6970

7071
if (args[1].u_int > 0) {

0 commit comments

Comments
 (0)