djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add copyright notice. remove obsolete comments.

Browse Source
This commit is contained in:
jun2sak 2021-04-25 19:19:11 +09:00
parent 6e9429d779
commit a17fcb6d1a
6 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ports/nrf/common-hal/alarm/__init__.c
View File

@ -5,6 +5,7 @@
*
* Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
* Copyright (c) 2020 Dan Halbert for Adafruit Industries
* Copyright (c) 2021 Junji Sakai
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@ -119,11 +120,6 @@ bool common_hal_alarm_woken_from_sleep(void) {
nrf_sleep_source_t alarm_woken_from_sleep_2(void) {
nrf_sleep_source_t cause = _get_wakeup_cause();
#ifdef NRF_DEBUG_PRINT
if (cause != NRF_SLEEP_WAKEUP_UNDEFINED) {
//print_wakeup_cause(cause);
}
#endif
if (cause == NRF_SLEEP_WAKEUP_GPIO ||
cause == NRF_SLEEP_WAKEUP_TIMER ||
cause == NRF_SLEEP_WAKEUP_TOUCHPAD) {
@ -136,9 +132,6 @@ nrf_sleep_source_t alarm_woken_from_sleep_2(void) {
STATIC mp_obj_t _get_wake_alarm(size_t n_alarms, const mp_obj_t *alarms) {
nrf_sleep_source_t cause = _get_wakeup_cause();
#ifdef NRF_DEBUG_PRINT
//print_wakeup_cause(cause);
#endif
switch (cause) {
case NRF_SLEEP_WAKEUP_TIMER: {
return alarm_time_timealarm_get_wakeup_alarm(n_alarms, alarms);
@ -264,16 +257,16 @@ nrf_sleep_source_t system_on_idle_until_alarm(int64_t timediff_ms, uint32_t pres
qspi_flash_exit_sleep();
#endif
#ifdef NRF_DEBUG_PRINT
tickdiff = port_get_raw_ticks(NULL) - start_tick;
double sec;
if (prescaler == 0) {
timediff_ms = tickdiff / 1024;
sec = (double)tickdiff / 1024;
}
else {
timediff_ms = tickdiff * prescaler / 1024;
sec = (double)(tickdiff * prescaler) / 1024;
}
(void)timediff_ms;
#ifdef NRF_DEBUG_PRINT
dbg_printf("lapse %6.1f sec\r\n", (double)(timediff_ms));
dbg_printf("lapse %6.1f sec\r\n", sec);
#endif
return wakeup_cause;

1
ports/nrf/common-hal/alarm/__init__.h
View File

@ -4,6 +4,7 @@
* The MIT License (MIT)
*
* Copyright (c) 2020 Dan Halbert for Adafruit Industries.
* Copyright (c) 2021 Junji Sakai
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal

1
ports/nrf/common-hal/alarm/pin/PinAlarm.c
View File

@ -5,6 +5,7 @@
*
* Copyright (c) 2020 Dan Halbert for Adafruit Industries
* Copyright (c) 2020 Scott Shawcroft for Adafruit Industries
* Copyright (c) 2021 Junji Sakai
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal

4
ports/nrf/common-hal/alarm/time/TimeAlarm.c
View File

@ -4,6 +4,7 @@
* The MIT License (MIT)
*
* Copyright (c) 2020 Dan Halbert for Adafruit Industries
* Copyright (c) 2021 Junji Sakai
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@ -24,10 +25,7 @@
* THE SOFTWARE.
*/
//#include "esp_sleep.h"
#include "py/runtime.h"
//#include "supervisor/esp_port.h"
#include <stdio.h>
#include "common-hal/alarm/__init__.h"

1
ports/nrf/supervisor/port.c
View File

@ -4,6 +4,7 @@
* The MIT License (MIT)
*
* Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
* Copyright (c) 2021 Junji Sakai
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal

6
supervisor/shared/serial.c
View File

@ -39,7 +39,7 @@
#ifdef NRF_DEBUG_PRINT
// XXX these functions are in nrf/supervisor/debug_uart.c
extern void _debug_uart_init(void);
extern void _debug_print_substr(const char* text, uint32_t length);
extern void _debug_print_substr(const char *text, uint32_t length);
#endif
/*
@ -71,7 +71,7 @@ void serial_early_init(void) {
#endif
#ifdef NRF_DEBUG_PRINT
_debug_uart_init();
_debug_uart_init();
#endif
}
@ -155,7 +155,7 @@ void serial_write_substring(const char *text, uint32_t length) {
#if defined(DEBUG_UART_TX) && defined(DEBUG_UART_RX)
int uart_errcode;
common_hal_busio_uart_write(&debug_uart, (const uint8_t*) text, length, &uart_errcode);
common_hal_busio_uart_write(&debug_uart, (const uint8_t *) text, length, &uart_errcode);
#endif
#ifdef NRF_DEBUG_PRINT