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

Fixup gclk init

This commit is contained in:
Scott Shawcroft 2018-05-22 13:56:12 -07:00
parent 99123a8621
commit 31bcd1c45c
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/atmel-samd/common-hal/touchio/TouchIn.c
View File

@ -73,10 +73,10 @@ void common_hal_touchio_touchin_construct(touchio_touchin_obj_t* self,
if (gclk > GCLK_GEN_NUM) {
mp_raise_RuntimeError("No free GCLKs");
}
enable_clock_generator(self->gclk, CLOCK_48MHZ, 6);
enable_clock_generator(gclk, CLOCK_48MHZ, 6);
/* Setup and enable generic clock source for PTC module. */
connect_gclk_to_peripheral(self->gclk, PTC_GCLK_ID);
connect_gclk_to_peripheral(gclk, PTC_GCLK_ID);
_pm_enable_bus_clock(PM_BUS_APBC, PTC);
}
@ -107,7 +107,7 @@ void common_hal_touchio_touchin_deinit(touchio_touchin_obj_t* self) {
if (common_hal_touchio_touchin_deinited(self)) {
return;
}
// We leave the clocks running because they may be in use by others.s
// We leave the clocks running because they may be in use by others.
reset_pin(self->config.pin);
self->config.pin = NO_PIN;

1
ports/atmel-samd/common-hal/touchio/TouchIn.h
View File

@ -38,7 +38,6 @@ typedef struct {
mp_obj_base_t base;
struct adafruit_ptc_config config;
uint16_t threshold;
uint8_t gclk;
} touchio_touchin_obj_t;
void touchin_reset(void);