Skip to content

Commit fe6bfde

Browse files
committed
move pcnt handler
1 parent 4438050 commit fe6bfde

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

locale/circuitpython.pot

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-11-01 11:11+0530\n"
11+
"POT-Creation-Date: 2020-11-04 21:18+0530\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -296,6 +296,10 @@ msgstr ""
296296
msgid "All I2C peripherals are in use"
297297
msgstr ""
298298

299+
#: ports/esp32s2/peripherals/pcnt_handler.c
300+
msgid "All PCNT units in use"
301+
msgstr ""
302+
299303
#: ports/atmel-samd/common-hal/canio/Listener.c
300304
#: ports/esp32s2/common-hal/canio/Listener.c
301305
#: ports/stm/common-hal/canio/Listener.c
@@ -1272,10 +1276,6 @@ msgstr ""
12721276
msgid "No MOSI Pin"
12731277
msgstr ""
12741278

1275-
#: ports/esp32s2/pcnt_handler.c
1276-
msgid "No PCNT unit free"
1277-
msgstr ""
1278-
12791279
#: ports/atmel-samd/common-hal/busio/UART.c
12801280
#: ports/esp32s2/common-hal/busio/UART.c
12811281
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c

ports/esp32s2/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@ SRC_C += \
173173
background.c \
174174
fatfs_port.c \
175175
mphalport.c \
176-
pcnt_handler.c \
177176
bindings/espidf/__init__.c \
178177
boards/$(BOARD)/board.c \
179178
boards/$(BOARD)/pins.c \
@@ -189,6 +188,7 @@ SRC_C += \
189188
lib/utils/pyexec.c \
190189
lib/utils/stdout_helpers.c \
191190
lib/utils/sys_stdio_mphal.c \
191+
peripherals/pcnt_handler.c \
192192
peripherals/pins.c \
193193
peripherals/rmt.c \
194194
supervisor/shared/memory.c

ports/esp32s2/pcnt_handler.c renamed to ports/esp32s2/peripherals/pcnt_handler.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ void pcnt_handler_init(pcnt_config_t* pcnt_config) {
4242
pcnt_state[i] = PCNT_UNIT_ACTIVE;
4343
break;
4444
} else if (i == 3) {
45-
mp_raise_RuntimeError(translate("No PCNT unit free"));
45+
mp_raise_RuntimeError(translate("All PCNT units in use"));
4646
}
4747
}
4848

ports/esp32s2/pcnt_handler.h renamed to ports/esp32s2/peripherals/pcnt_handler.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
* THE SOFTWARE.
2525
*/
2626

27-
#ifndef MICROPY_INCLUDED_ESP32S2_PCNT_HANDLER_H
28-
#define MICROPY_INCLUDED_ESP32S2_PCNT_HANDLER_H
27+
#ifndef MICROPY_INCLUDED_ESP32S2_PERIPHERALS_PCNT_HANDLER_H
28+
#define MICROPY_INCLUDED_ESP32S2_PERIPHERALS_PCNT_HANDLER_H
2929

3030
#include "driver/pcnt.h"
3131

3232
extern void pcnt_handler_init(pcnt_config_t* pcnt_config);
3333
extern void pcnt_handler_deinit(pcnt_unit_t* unit);
3434

35-
#endif // MICROPY_INCLUDED_ESP32S2_PCNT_HANDLER_H
35+
#endif // MICROPY_INCLUDED_ESP32S2_PERIPHERALS_PCNT_HANDLER_H

0 commit comments

Comments
 (0)