Skip to content

Commit

Permalink
Merge pull request #7723 from dhalbert/misc-fixes
Browse files Browse the repository at this point in the history
Doc fixes and translate fixes
  • Loading branch information
microdev1 authored Mar 14, 2023
2 parents 9083ae0 + 5ec5860 commit f708048
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
3 changes: 1 addition & 2 deletions ports/espressif/common-hal/espcamera/Camera.c
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,7 @@ void common_hal_espcamera_camera_construct(

if (common_hal_espidf_get_reserved_psram() == 0) {
mp_raise_msg(&mp_type_MemoryError, translate(
"espcamera.Camera requires reserved PSRAM to be configured. "
"See the documentation for instructions."));
"espcamera.Camera requires reserved PSRAM to be configured. See the documentation for instructions."));
}
for (int i = 0; i < 8; i++) {
claim_pin_number(data_pins[i]);
Expand Down
2 changes: 1 addition & 1 deletion shared-bindings/alarm/time/TimeAlarm.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ mp_obj_t MP_WEAK rtc_get_time_source_time(void) {
//| """Trigger an alarm when the specified time is reached."""
//|
//| def __init__(
//| self, monotonic_time: Optional[float] = None, epoch_time: Optional[int] = None
//| self, *, monotonic_time: Optional[float] = None, epoch_time: Optional[int] = None
//| ) -> None:
//| """Create an alarm that will be triggered when `time.monotonic()` would equal
//| ``monotonic_time``, or when `time.time()` would equal ``epoch_time``.
Expand Down
3 changes: 1 addition & 2 deletions shared-bindings/pwmio/PWMOut.c
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,7 @@ STATIC mp_obj_t pwmio_pwmout_obj_set_frequency(mp_obj_t self_in, mp_obj_t freque
check_for_deinit(self);
if (!common_hal_pwmio_pwmout_get_variable_frequency(self)) {
mp_raise_AttributeError(translate(
"PWM frequency not writable when variable_frequency is False on "
"construction."));
"PWM frequency not writable when variable_frequency is False on construction."));
}
mp_int_t freq = mp_obj_get_int(frequency);
if (freq == 0) {
Expand Down

0 comments on commit f708048

Please sign in to comment.