diff options
| author | Scott Shawcroft <scott@tannewt.org> | 2020-12-02 13:10:39 -0800 |
|---|---|---|
| committer | Scott Shawcroft <scott@tannewt.org> | 2020-12-02 13:10:39 -0800 |
| commit | 608c98501bb90e02a480b2d84032a46f9a4d0737 (patch) | |
| tree | adea018a0c0e714ef33b79a306b69885568b6ad0 /ports/nrf | |
| parent | 34bbcc4910014c3b4646d8005baf8244bac51f03 (diff) | |
| parent | d7ba641ff646b48e5ad38ff72a2dcfe17bb54624 (diff) | |
Merge remote-tracking branch 'adafruit/main' into msgpack
Diffstat (limited to 'ports/nrf')
| -rw-r--r-- | ports/nrf/common-hal/microcontroller/Processor.c | 8 | ||||
| -rw-r--r-- | ports/nrf/common-hal/rgbmatrix/RGBMatrix.h | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/ports/nrf/common-hal/microcontroller/Processor.c b/ports/nrf/common-hal/microcontroller/Processor.c index 03d9c4d3f..ab5f29b5d 100644 --- a/ports/nrf/common-hal/microcontroller/Processor.c +++ b/ports/nrf/common-hal/microcontroller/Processor.c @@ -24,8 +24,10 @@ * THE SOFTWARE. */ -#include "common-hal/microcontroller/Processor.h" #include "py/runtime.h" + +#include "common-hal/microcontroller/Processor.h" +#include "shared-bindings/microcontroller/ResetReason.h" #include "supervisor/shared/translate.h" #include "nrfx_saadc.h" @@ -119,3 +121,7 @@ void common_hal_mcu_processor_get_uid(uint8_t raw_id[]) { ((uint32_t*) raw_id)[i] = NRF_FICR->DEVICEID[i]; } } + +mcu_reset_reason_t common_hal_mcu_processor_get_reset_reason(void) { + return RESET_REASON_UNKNOWN; +} diff --git a/ports/nrf/common-hal/rgbmatrix/RGBMatrix.h b/ports/nrf/common-hal/rgbmatrix/RGBMatrix.h index 48de4dcb2..24d86f177 100644 --- a/ports/nrf/common-hal/rgbmatrix/RGBMatrix.h +++ b/ports/nrf/common-hal/rgbmatrix/RGBMatrix.h @@ -24,8 +24,8 @@ * THE SOFTWARE. */ -#ifndef MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_RGBMATRIX_RGBMATRIX_H -#define MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_RGBMATRIX_RGBMATRIX_H +#ifndef MICROPY_INCLUDED_NRF_COMMON_HAL_RGBMATRIX_RGBMATRIX_H +#define MICROPY_INCLUDED_NRF_COMMON_HAL_RGBMATRIX_RGBMATRIX_H void *common_hal_rgbmatrix_timer_allocate(void); void common_hal_rgbmatrix_timer_enable(void*); |