Skip to content

Commit b694388

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents 0ced12c + ef70b7b commit b694388

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

conf.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,6 @@ def autoapi_prepare_jinja_env(jinja_env):
277277

278278
import sphinx_rtd_theme
279279
html_theme = 'sphinx_rtd_theme'
280-
html_theme_path = [sphinx_rtd_theme.get_html_theme_path(), '.']
281280

282281
# Theme options are theme-specific and customize the look and feel of a theme
283282
# further. For a list of options available for each theme, see the

shared-bindings/alarm/__init__.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ static mp_obj_t alarm_exit_and_deep_sleep_until_alarms(size_t n_args, const mp_o
196196
common_hal_alarm_set_deep_sleep_alarms(n_args, pos_args, num_dios, dios_array);
197197

198198
// Raise an exception, which will be processed in main.c.
199-
mp_raise_type_arg(&mp_type_DeepSleepRequest, NULL);
199+
mp_raise_type(&mp_type_DeepSleepRequest);
200200

201201
// Doesn't get here.
202202
return mp_const_none;

0 commit comments

Comments
 (0)