summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Shawcroft <scott.shawcroft@gmail.com>2017-02-19 17:24:15 +0100
committerScott Shawcroft <scott.shawcroft@gmail.com>2017-02-19 17:24:15 +0100
commita5a41d7163e62918133cb79f4e0c6847bfbd023a (patch)
tree39ff7f16296d434a4c17ba702e7b716327125037
parent8584f5fece5f80f673e7712d78520d0d8a65b55e (diff)
atmel-samd: Save a little space by tweaking error messages.
-rw-r--r--atmel-samd/common-hal/nativeio/AnalogIn.c2
-rw-r--r--atmel-samd/common-hal/nativeio/PWMOut.c8
-rw-r--r--atmel-samd/common-hal/nativeio/SPI.c4
-rw-r--r--atmel-samd/common-hal/nativeio/UART.c2
4 files changed, 8 insertions, 8 deletions
diff --git a/atmel-samd/common-hal/nativeio/AnalogIn.c b/atmel-samd/common-hal/nativeio/AnalogIn.c
index 7e97577e4..b07bbe12b 100644
--- a/atmel-samd/common-hal/nativeio/AnalogIn.c
+++ b/atmel-samd/common-hal/nativeio/AnalogIn.c
@@ -46,7 +46,7 @@ void common_hal_nativeio_analogin_construct(nativeio_analogin_obj_t* self,
const mcu_pin_obj_t *pin) {
if (!pin->has_adc) {
// No ADC function on that pin
- nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "pin %q does not have ADC capabilities", pin->name));
+ nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Pin does not have ADC capabilities"));
}
self->pin = pin;
diff --git a/atmel-samd/common-hal/nativeio/PWMOut.c b/atmel-samd/common-hal/nativeio/PWMOut.c
index a122fadb5..6baf1e946 100644
--- a/atmel-samd/common-hal/nativeio/PWMOut.c
+++ b/atmel-samd/common-hal/nativeio/PWMOut.c
@@ -80,12 +80,12 @@ void common_hal_nativeio_pwmout_construct(nativeio_pwmout_obj_t* self,
if (pin->primary_timer.tc == 0 && pin->secondary_timer.tc == 0) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
- "Invalid pin."));
+ "Invalid pin"));
}
if (frequency == 0 || frequency > 6000000) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
- "Invalid PWM frequency."));
+ "Invalid PWM frequency"));
}
uint16_t primary_timer_index = 0xff;
@@ -136,7 +136,7 @@ void common_hal_nativeio_pwmout_construct(nativeio_pwmout_obj_t* self,
index = primary_timer_index;
}
if (t == NULL) {
- nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "All timers in use."));
+ nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "All timers in use"));
return;
}
uint8_t resolution = 0;
@@ -266,7 +266,7 @@ void common_hal_nativeio_pwmout_set_frequency(nativeio_pwmout_obj_t* self,
uint32_t frequency) {
if (frequency == 0 || frequency > 6000000) {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
- "Invalid PWM frequency."));
+ "Invalid PWM frequency"));
}
const pin_timer_t* t = self->timer;
uint8_t resolution;
diff --git a/atmel-samd/common-hal/nativeio/SPI.c b/atmel-samd/common-hal/nativeio/SPI.c
index 705e30d8e..0267a546b 100644
--- a/atmel-samd/common-hal/nativeio/SPI.c
+++ b/atmel-samd/common-hal/nativeio/SPI.c
@@ -92,7 +92,7 @@ void common_hal_nativeio_spi_construct(nativeio_spi_obj_t *self,
}
}
if (sercom == NULL) {
- nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Invalid pins."));
+ nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Invalid pins"));
}
// Depends on where MOSI and CLK are.
@@ -111,7 +111,7 @@ void common_hal_nativeio_spi_construct(nativeio_spi_obj_t *self,
}
}
if (dopo == 8) {
- nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "SPI MOSI and clock pins incompatible."));
+ nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "SPI MOSI and clock pins incompatible"));
}
config_spi_master.mux_setting = (dopo << SERCOM_SPI_CTRLA_DOPO_Pos) |
diff --git a/atmel-samd/common-hal/nativeio/UART.c b/atmel-samd/common-hal/nativeio/UART.c
index 8a6617315..29afaf0d0 100644
--- a/atmel-samd/common-hal/nativeio/UART.c
+++ b/atmel-samd/common-hal/nativeio/UART.c
@@ -162,7 +162,7 @@ void common_hal_nativeio_uart_construct(nativeio_uart_obj_t *self,
}
}
if (sercom == NULL) {
- nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Invalid pins."));
+ nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Invalid pins"));
}
if (tx == NULL) {
tx_pad = 0;