diff --git a/UsbReceive/UsbReceive/UsbReceive/Debug/Sketch.o b/UsbReceive/UsbReceive/UsbReceive/Debug/Sketch.o index 01d48206506fb26fcfe1b09f0db578797fd5b77d..e9283366e560cf05a61d08d8a1f35c1a3d56f80b 100644 Binary files a/UsbReceive/UsbReceive/UsbReceive/Debug/Sketch.o and b/UsbReceive/UsbReceive/UsbReceive/Debug/Sketch.o differ diff --git a/UsbReceive/UsbReceive/UsbReceive/Debug/UsbReceive.elf b/UsbReceive/UsbReceive/UsbReceive/Debug/UsbReceive.elf index 4fdc5f94903b60696f89650c67a853575e7a94f1..1b9c8ca5fe026cbde17939f20208bb265384a00b 100644 Binary files a/UsbReceive/UsbReceive/UsbReceive/Debug/UsbReceive.elf and b/UsbReceive/UsbReceive/UsbReceive/Debug/UsbReceive.elf differ diff --git a/UsbReceive/UsbReceive/UsbReceive/Debug/UsbReceive.lss b/UsbReceive/UsbReceive/UsbReceive/Debug/UsbReceive.lss index 256d41fc24fe86697bc2ca738cd2113ac64d8bf6..55e16a8fc949c6cfa5896210128218dfeb4bb927 100644 --- a/UsbReceive/UsbReceive/UsbReceive/Debug/UsbReceive.lss +++ b/UsbReceive/UsbReceive/UsbReceive/Debug/UsbReceive.lss @@ -25,11 +25,11 @@ Idx Name Size VMA LMA File off Algn CONTENTS, READONLY, DEBUGGING 10 .debug_macro 0001d497 00000000 00000000 0008d0b2 2**0 CONTENTS, READONLY, DEBUGGING - 11 .debug_line 0000deb9 00000000 00000000 000aa549 2**0 + 11 .debug_line 0000deb4 00000000 00000000 000aa549 2**0 CONTENTS, READONLY, DEBUGGING - 12 .debug_str 000824e6 00000000 00000000 000b8402 2**0 + 12 .debug_str 000824e6 00000000 00000000 000b83fd 2**0 CONTENTS, READONLY, DEBUGGING - 13 .debug_frame 00001a00 00000000 00000000 0013a8e8 2**2 + 13 .debug_frame 00001a00 00000000 00000000 0013a8e4 2**2 CONTENTS, READONLY, DEBUGGING Disassembly of section .text: @@ -111,11 +111,8 @@ void setup() { 118: 0249 lsls r1, r1, #9 11a: 4810 ldr r0, [pc, #64] ; (15c <setup+0x48>) 11c: f000 fc90 bl a40 <_ZN7Serial_5beginEm> -// Wire.begin(); - - // Initialize Wireling -// Wireling.begin(); -// Wireling.selectPort(0); + + PORT_PIN_TO_OUTPUT(MY_IO_8); 120: 2201 movs r2, #1 122: 241f movs r4, #31 diff --git a/UsbReceive/UsbReceive/UsbReceive/Debug/UsbReceive.map b/UsbReceive/UsbReceive/UsbReceive/Debug/UsbReceive.map index cc5029add01d69f58f5e215ea7050baff76d28be..2e66499590ef9721290c39e9c8cba06dec8fb9fa 100644 --- a/UsbReceive/UsbReceive/UsbReceive/Debug/UsbReceive.map +++ b/UsbReceive/UsbReceive/UsbReceive/Debug/UsbReceive.map @@ -6852,27 +6852,27 @@ OUTPUT(UsbReceive.elf elf32-littlearm) .debug_macro 0x0001cc39 0x6e3 C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(Print.o) .debug_macro 0x0001d31c 0x17b C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(Print.o) -.debug_line 0x00000000 0xdeb9 - .debug_line 0x00000000 0xcdf Sketch.o - .debug_line 0x00000cdf 0x7c9 C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(cortex_handlers.o) - .debug_line 0x000014a8 0x8cf C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(delay.o) - .debug_line 0x00001d77 0x63 C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(hooks.o) - .debug_line 0x00001dda 0xc22 C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(main.o) - .debug_line 0x000029fc 0xc94 C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(Reset.o) - .debug_line 0x00003690 0x7f1 C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(startup.o) - .debug_line 0x00003e81 0xe0c C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(Stream.o) - .debug_line 0x00004c8d 0xff1 C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(CDC.o) - .debug_line 0x00005c7e 0x706 C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(PluggableUSB.o) - .debug_line 0x00006384 0x1851 C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(USBCore.o) - .debug_line 0x00007bd5 0x8a3 C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(wiring.o) - .debug_line 0x00008478 0xab0 C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(wiring_analog.o) - .debug_line 0x00008f28 0x894 C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(wiring_digital.o) - .debug_line 0x000097bc 0x930 C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(wiring_private.o) - .debug_line 0x0000a0ec 0x9c1 C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(variant.o) - .debug_line 0x0000aaad 0x3fb C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(new.o) - .debug_line 0x0000aea8 0x1200 C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(SERCOM.o) - .debug_line 0x0000c0a8 0xedb C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(Uart.o) - .debug_line 0x0000cf83 0xf36 C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(Print.o) +.debug_line 0x00000000 0xdeb4 + .debug_line 0x00000000 0xcda Sketch.o + .debug_line 0x00000cda 0x7c9 C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(cortex_handlers.o) + .debug_line 0x000014a3 0x8cf C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(delay.o) + .debug_line 0x00001d72 0x63 C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(hooks.o) + .debug_line 0x00001dd5 0xc22 C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(main.o) + .debug_line 0x000029f7 0xc94 C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(Reset.o) + .debug_line 0x0000368b 0x7f1 C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(startup.o) + .debug_line 0x00003e7c 0xe0c C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(Stream.o) + .debug_line 0x00004c88 0xff1 C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(CDC.o) + .debug_line 0x00005c79 0x706 C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(PluggableUSB.o) + .debug_line 0x0000637f 0x1851 C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(USBCore.o) + .debug_line 0x00007bd0 0x8a3 C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(wiring.o) + .debug_line 0x00008473 0xab0 C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(wiring_analog.o) + .debug_line 0x00008f23 0x894 C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(wiring_digital.o) + .debug_line 0x000097b7 0x930 C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(wiring_private.o) + .debug_line 0x0000a0e7 0x9c1 C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(variant.o) + .debug_line 0x0000aaa8 0x3fb C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(new.o) + .debug_line 0x0000aea3 0x1200 C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(SERCOM.o) + .debug_line 0x0000c0a3 0xedb C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(Uart.o) + .debug_line 0x0000cf7e 0xf36 C:\git\serial-communication-arduino\UsbReceive\UsbReceive\ArduinoCore\Debug\libArduinoCore.a(Print.o) .debug_str 0x00000000 0x824e6 .debug_str 0x00000000 0x7c0d8 Sketch.o diff --git a/UsbReceive/UsbReceive/UsbReceive/Sketch.cpp b/UsbReceive/UsbReceive/UsbReceive/Sketch.cpp index 533369c0360ee11996461fa57b2b8f41ecf1817d..16d8cc8ede5e588772da14432a1de6ab92c5a7ef 100644 --- a/UsbReceive/UsbReceive/UsbReceive/Sketch.cpp +++ b/UsbReceive/UsbReceive/UsbReceive/Sketch.cpp @@ -8,12 +8,9 @@ void remove_force (void); /************************************************************************* * Code that reads values sent from python through serial +* Sets DAC value according to that ************************************************************************/ - -//#include <Wire.h> // For I2C communication with sensor -//#include <Wireling.h> // For interfacing with TinyCircuits Wirelings -//Beginning of Auto generated function prototypes by Atmel Studio -//End of Auto generated function prototypes by Atmel Studio + // Make Serial Monitor compatible for all TinyCircuits processors #if defined(ARDUINO_ARCH_AVR) @@ -22,8 +19,8 @@ void remove_force (void); #define SerialMonitorInterface SerialUSB #endif -int MY_IO_8 = PIN_PA06; // PA06 according to variant.cpp -int MY_IO_9 = PIN_PA07; // PA07 according to variant.cpp +int MY_IO_8 = PIN_PA06; +int MY_IO_9 = PIN_PA07; int MY_DAC_OUT = A0; //also 14 according to variant.cpp @@ -32,12 +29,6 @@ void setup() { SerialMonitorInterface.begin(115200); - -// Wire.begin(); - - // Initialize Wireling -// Wireling.begin(); -// Wireling.selectPort(0); PORT_PIN_TO_OUTPUT(MY_IO_8); PORT_PIN_TO_OUTPUT(MY_IO_9); analogWriteResolution(10); // Change the DAC resolution to 10-bits @@ -49,6 +40,8 @@ void loop() { int output; if (SerialMonitorInterface.available()> -1) { + + // send something back to allow the device identification output = SerialMonitorInterface.parseInt(); if (output > 0) apply_force(output); @@ -57,7 +50,6 @@ void loop() { }// end if serial available - }