diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2016-06-03 02:52:39 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2016-06-03 02:52:39 +0200 |
| commit | 735ba437336563e10ea8326f6f63b81593463a26 (patch) | |
| tree | aef930715a13f5036ba62cfb153b14c7fb5127d6 /usb-pjon | |
| parent | fastled now works on mimimus32 (diff) | |
updated to PJON 3.0 Release
Diffstat (limited to 'usb-pjon')
| -rw-r--r-- | usb-pjon/Makefile | 2 | ||||
| -rw-r--r-- | usb-pjon/usb-pjon.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usb-pjon/Makefile b/usb-pjon/Makefile index bc7347b..76e4831 100644 --- a/usb-pjon/Makefile +++ b/usb-pjon/Makefile @@ -28,7 +28,7 @@ CXX_LIBS := arduino-stub EXTERNAL_LIBS := lufa pjon SPREADAVR_PATH := .. -PJON_PATH := $(SPREADAVR_PATH)/contrib/PJON +PJON_PATH := $(SPREADAVR_PATH)/contrib/PJON-3.0 PJON_OPTS := LUFA_PATH := $(SPREADAVR_PATH)/contrib/lufa-LUFA-151115 diff --git a/usb-pjon/usb-pjon.cpp b/usb-pjon/usb-pjon.cpp index 3c48810..b83f537 100644 --- a/usb-pjon/usb-pjon.cpp +++ b/usb-pjon/usb-pjon.cpp @@ -55,13 +55,13 @@ void error_handler(uint8_t code, uint8_t data) { } } -void recv_handler(uint8_t length, uint8_t *payload) { +void recv_handler(uint8_t id, uint8_t *payload, uint8_t length) { if(length == 0) { - printf("got 0 byte message...\r\n"); + printf("got 0 byte message from %d...\r\n", id); return; } led_on(); - printf("got message(%d bytes): '", length); + printf("got message(%d bytes) from %d: '", length, id); for(uint16_t i = 0; i < length; ++i) putchar(payload[i]); printf("'\r\n"); |