kristjank/tinio
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/cls-02/tinio

Browse Source
This commit is contained in:
Kristjan Komlosi
2019-07-22 16:41:11 +02:00
parent 439f1beede 107e36b03d
commit 992b62f39e
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tinio/tinio.c
View File

@@ -52,6 +52,7 @@ bool flpPin(CY_HANDLE h, int pinNumber) {
void parser(int argc, char **args); void parser(int argc, char **args);
<<<<<<< HEAD
void attachHandles(CY_HANDLE *h) { void attachHandles(CY_HANDLE *h) {
uint8_t num = 0; uint8_t num = 0;
cyErrHandler(CyGetListofDevices(&num)); cyErrHandler(CyGetListofDevices(&num));
@@ -78,6 +79,10 @@ void attachHandles(CY_HANDLE *h) {
miserably if the device is set to CDC mode, but custom and PHDC work fine. miserably if the device is set to CDC mode, but custom and PHDC work fine.
*/ */
// TODO: mek dis betr // TODO: mek dis betr
=======
inErr attachHandles() {
;
>>>>>>> 107e36b03d1a4f9c568d462d8a245ac01a1f51da
} }
int main(int argc, char **args){ int main(int argc, char **args){