1
0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-05 16:24:12 +01:00
Commit Graph

254 Commits

Author SHA1 Message Date
onovy
bf2ef13b50 Tone: Added missing break 2015-08-15 21:11:52 +02:00
Cristian Maglie
695fc40fbd Merge branch 'cdc-settings' of https://github.com/matthijskooijman/Arduino 2015-08-14 13:37:00 +02:00
Martino Facchin
5fe796d52e Merge pull request #3640 from NicoHood/USB-Core-Fixes
Usb core fixes
2015-08-13 09:39:21 +02:00
NicoHood
60e64cfd35 Added u2 Series support 2015-08-12 17:48:17 +02:00
NicoHood
7bd77de70b Precised USB Endpoint definitions 2015-08-12 17:48:17 +02:00
NicoHood
fd6f57d2d7 Added 16 byte endpoint support 2015-08-12 17:48:17 +02:00
NicoHood
b97b2519d1 Added missing static inline to USB Recv function 2015-08-12 17:48:17 +02:00
NicoHood
344897301c Made Magic Key Settings more flexible 2015-08-12 17:48:09 +02:00
Chuck Todd
25d81c98e4 Print not Aborting on Write() failure
Print::write(const uint8_t *buffer, size_t size) and Print::print(const
__FlashStringHelper *ifsh) would continue calling write(char) after a
failed write(char) this behavior would render returned count unuseable
see arduino/Arduino issue #3614
2015-08-12 11:47:57 +02:00
Peter Van Hoyweghen
4f87112c2e Add Serial_::availableForWrite().
This makes the CDC "Serial" object on the Leonardo and similar boards
support this recently introduced method as well. The CDC code in the sam
core is not changed.
2015-07-31 14:06:20 +02:00
Matthijs Kooijman
9b7b23f045 Prevent losing bytes in HardwareSerial::end()
end() already waited for the buffer to be empty, but then there could
still be two bytes in the hardware registers that still need to be
transmitted (which were dropped or kept in the buffer, depending on the
exact timing).

This changes the wait loop to a call to the flush() function, which
already takes care of really waiting for all bytes to be transmitted,
meaning it is safe to turn off the transmitter.
2015-07-31 14:06:20 +02:00
Matthijs Kooijman
b58f239400 Add Serial_::readBreak() to process SEND_BREAK requests
This allows detecting when the USB host sends a break request and what
the value of the request was. See the comments in USBAPI.h for details.

This just modifies the avr core, not the sam core.
2015-07-31 14:06:19 +02:00
Matthijs Kooijman
96f7b966bc Expose serial settings from CDC virtual serial port
This allows a sketch to find out the settings chosen by the USB host
(computer) and act accordingly.

Other than reading the DTR flag and checking if the baudrate is 1200,
the regular CDC code doesn't actually use any of these settings.

By exposing these settings to the sketch, it can for example copy them
to the hardware UART, turning the Leonardo into a proper USB-to-serial
device. This can be useful to let the computer directly talk to whatever
device is connected to the hardware serial port (like an XBee module).

The Teensy core already supported these methods. This code was
independently developed, but the method names were chosen to match the
Teensy code, for compatibility (except that `dtr()` and `rtr()` return
`bool`, while the Teensy version return a `uint8_t`).

This change is applied to both the avr and sam cores, which have a very
similar CDC implementation.
2015-07-31 13:40:43 +02:00
Martino Facchin
6a9568d3e1 fix pluggableUSB linked list 2015-07-16 13:13:52 +02:00
Martino Facchin
8a45883230 save RAM content overridden by bootloader magic
and restore it in case of aborted reboot
use RAMEND-1 as suggested by @yyyc514 in PR #2474

of course it's not a real solution but we cannot force everyone to update the bootloader using an external programmer
2015-07-16 13:13:52 +02:00
Martino Facchin
97a3771772 rename Setup typedef struct to USBSetup
was really too common
2015-07-16 13:13:52 +02:00
Martino Facchin
dee43a19d7 fix HID headers 2015-07-16 13:13:51 +02:00
Martino Facchin
9074b1ed18 fix HID descriptors bigger than 127 bytes 2015-07-16 13:13:51 +02:00
Martino Facchin
175240a906 Add support for waking up a host via USB HID
this is a rework of commit fbcf94801b
2015-07-16 13:13:51 +02:00
Martino Facchin
e211f1ea76 remove setupUSB weak hook and replace with global constructors
thanks @matthijskooijman
2015-07-16 13:13:49 +02:00
Martino Facchin
89928b4e15 rework PUSBCallbacks initialization 2015-07-16 13:13:39 +02:00
Martino Facchin
ada0e4c2f3 remove 3 endpoints to match at32u4 limit 2015-07-16 13:12:15 +02:00
Martino Facchin
f37547e8fd add numInterfaces field to PUSBCallbacks 2015-07-16 13:12:15 +02:00
Martino Facchin
7b5c25f534 implement PUSB modules as linked list 2015-07-16 13:12:14 +02:00
Martino Facchin
f67318a8b1 remove useless variables 2015-07-16 13:12:14 +02:00
Martino Facchin
91ccab4f09 make CDC function non removable 2015-07-16 13:12:14 +02:00
Martino Facchin
b2a6b61a2f add weak setupUSB() hook
override this function to insert additional USB endpoints
2015-07-16 13:12:14 +02:00
Martino Facchin
ec43b6c829 remove useless variable 2015-07-16 13:12:14 +02:00
Martino Facchin
1aec25b855 add PluggableUSB module 2015-07-16 13:12:14 +02:00
Martino Facchin
1f534eac35 move _initEndpoints from PROGMEM to RAM 2015-07-16 13:12:14 +02:00
Martino Facchin
2c5dd20298 Use generic composite device descriptor 2015-07-16 13:12:13 +02:00
Martino Facchin
5ee69a70ee Move EP defines to header 2015-07-16 13:12:13 +02:00
Martino Facchin
09460dd8c9 Remove HID core library 2015-07-16 13:12:13 +02:00
Matthijs Kooijman
ebeb7843d2 Check for __cplusplus >= 201103L as well as __GXX_EXPERIMENTAL_CXX0X__
Gcc 4.8 defines __cplusplus as 201103L, so we can check for that now. It
still also defines __GXX_EXPERIMENTAL_CXX0X__, but this could help on
other compilers, or if gcc ever decides to stop defining the
experimental macro.
2015-07-16 13:06:10 +02:00
Federico Fissore
431f319aca Removed a handful of SVN expansion keywords. See #277 2015-07-03 10:38:07 +02:00
Matthijs Kooijman
07c4d958c0 Warn about increasing HardwareSerial buffers to > 256
Properly supporting bigger buffers need better atomicity code, which
isn't implemented yet. Until it is, best to add a warning. See #2405.
2015-06-18 16:36:07 +02:00
Martino Facchin
ed1b8eb486 Add a Stream::find(char) method 2015-06-01 14:06:32 +00:00
Cristian Maglie
074d910857 Fixed unused argument warning 2015-05-30 15:19:44 +02:00
Cristian Maglie
2cbdc121e9 Fixed unused variables warnings and indentation 2015-05-29 20:02:50 +02:00
chromhelm
cd9d30a8fe Saving some bytes in HardwareSerial::write 2015-05-29 18:12:24 +02:00
Martino Facchin
7a22827359 pulseIn: be consistent with standard API
return 0 if timeout has been reached
2015-05-29 15:01:38 +02:00
Martino Facchin
689c654e8d pulseInASM: rework comment style 2015-05-29 15:01:38 +02:00
Martino Facchin
d4a80be045 pulseIn: add alternative implementation based on micros()
pulseInLong is suitable for long pulses in interrupt context
2015-05-29 15:01:38 +02:00
Martino Facchin
93f74f84ce pulseIn: modify function to use ASM implementation 2015-05-29 15:01:37 +02:00
Martino Facchin
b37b0d1b6d pulseIn: add ASM implementation
this assembly code was generated by avr-gcc 4.8.3
2015-05-29 15:01:37 +02:00
Martino Facchin
0c9f0d50a5 Revert "Temporary fix for pulseIn() regression."
This reverts commit 8ddc5198f6.
To be substituted by ASM generated code
2015-05-29 15:01:37 +02:00
Martino Facchin
d92bf5bdaa Merge pull request #3202 from Chris--A/randomSeed
Modified randomSeed, now uses unsigned long.
2015-05-28 10:54:26 +02:00
Martino Facchin
9d13023075 Merge pull request #3211 from Chris--A/println-optimize
Println optimize
2015-05-28 10:24:12 +02:00
Cristian Maglie
b4c5fa7109 Merge pull request #3244 from Lauszus/INT2
Check if INT2 is actually defined before issuing warning in detachInterrupt
2015-05-28 09:51:25 +02:00
Martino Facchin
f816e76d47 Merge pull request #3207 from chromhelm/master
Fixed bug with HWSerial flushing
2015-05-28 09:44:46 +02:00
Kristian Sloth Lauszus
272d5cc93d Check if INT2 is actually defined before issuing warning in detachInterrupt
This was caused after: https://github.com/arduino/Arduino/pull/3221
2015-05-28 03:42:32 +02:00
Victor Aprea
e9045d8b8a Add missing case to detachinterrupt 2015-05-24 20:35:23 -04:00
Cristian Maglie
e273178425 Indent fix. 2015-05-22 17:23:46 +02:00
Cano
c4080efdb5 zero delay fix, ADC prescaler fix 2015-05-22 17:23:46 +02:00
Cano
219914ef22 delayMicroseconds(): added support for 1Mhz, 12Mhz and 24Mhz
1Mhz is a default clock speed on Atmega328, many users run it on the
internal 1Mhz clock to save battery power. Up until now
delayMicroseconds() function wasn't taking this frequencies into an
account.
2015-05-22 17:23:45 +02:00
Chris--A
c617562e74 Optimize printLn calls. 2015-05-22 23:00:07 +10:00
chromhelm
ed331a817a Fixed bug with flushing 2015-05-21 21:42:40 +02:00
Chris--A
0051eadd2a Modified randomSeed, now uses unsigned long. 2015-05-21 16:52:42 +10:00
Nico
d2595129c5 RX and TX Serial buffer sizes can now be defined independently
Fixes #2597
2015-05-12 15:09:48 +02:00
Cristian Maglie
c96c917dd0 Fixed indentation in Stream.cpp, no code change 2015-04-21 18:10:32 +02:00
Cristian Maglie
35fc66c23d Fixed wrong bracket placement (see #3011) 2015-04-21 18:07:42 +02:00
Kristian Sloth Lauszus
91489d7ba8 Fixed: warning: comparison between signed and unsigned integer expressions 2015-04-21 00:08:11 +02:00
Kristian Sloth Lauszus
f3e7a3909d Fixed: warning: suggest explicit braces to avoid ambiguous 'else' 2015-04-21 00:08:02 +02:00
Martino Facchin
b41e4a3d7d Merge branch 'jipp-master' 2015-04-14 10:13:58 +02:00
Jan
df577bf244 Fix for issue #292
Replaced direct register manipulation with calls to bitWrite(). Fixed TIMSK5 usage on Leonardo (as well as some other preprocessor statements).
2015-04-13 20:36:28 +02:00
jipp
b5cc55ec3e Update Tone.cpp
Tone.cpp stops compile when TCCR0A/TCCR0B defined and WGM01 not defined #2923
2015-04-13 16:18:18 +02:00
Jan
3cde93501c Update Tone.cpp
Rebased the bugfix from the original Google Code issue #292 to work with Arduino 1.6.x

Description of original fix provided by Pete62:
The later 8 bit AVR's use two registers (TCCRxA, TCCRxB) whereas the ATmega8 only uses a single register (TCCR2) to house the control bits for Timer 2.  Bits were inadvertently being cleared.
2015-04-11 00:15:58 +02:00
Martino Facchin
ab5aea40a6 Stream: set findMulti function as protected
let's not expose it until the API is not accepted
widely by the dev mailing list
2015-03-24 17:13:14 +01:00
Jim Leonard (Xuth)
f43a7a698e Fix findUntil in Stream library
PR #2696 without timeout-related changes
2015-03-24 12:31:50 +01:00
Cristian Maglie
8ddc5198f6 Temporary fix for pulseIn() regression.
Fixes #2538
2015-01-18 17:34:40 +01:00
Cristian Maglie
20ac20f629 Arduino custom type boolean is now mapped to bool type
Fixes #2151
Fixes #2147
2015-01-07 14:56:19 +01:00
Cristian Maglie
0824abfee5 Merge branch 'master' into ide-1.5.x
Conflicts:
	hardware/arduino/cores/arduino/HardwareSerial.cpp
	hardware/arduino/cores/robot/Arduino.h
2014-10-21 17:47:59 +02:00
George Chailazopoulos
f5fe16bf2a Add #include "Print.h" in Server.h 2014-09-26 22:58:19 +03:00
Cristian Maglie
5f67650b80 Fixed trivial include error introduced in previous commit 2e3e539b... oops... 2014-09-12 16:58:05 +02:00
Cristian Maglie
2e3e539b71 Added license to USBAPI.h
Close #1847
2014-09-12 12:27:39 +02:00
Cristian Maglie
3d222cc372 Merge pull request #1937 from matthijskooijman/stringindex
String index fixes and cleanups
2014-09-12 11:56:12 +02:00
Matthijs Kooijman
04dba1e46f Fix off-by-one in String::substring
When checking the `left` argument, it previously allowed having
left == len. However, this means the substring starts one past the last
character in the string and should return the empty string. In practice,
this already worked correctly, because buffer[len] contains the trailing
nul, so it would (re)assign the empty string to `out`.

However, fixing this check makes it a bit more logical, and prevents a
fairly unlikely out-of-buffer write (to address 0x0) when calling
substring on an invalidated String:

	String bar = (char*)NULL;
	bar.substring(0, 0);
2014-09-10 13:42:06 +02:00
Cristian Maglie
6f9674288b Merge pull request #2279 from cmaglie/fix-leo-upload-osx10.9.4
Fix for upload problems on Arduino Leonardo (and derivatives) on OSX 10.9
2014-09-10 12:58:10 +02:00
Matthijs Kooijman
86015f441e Simplify String::remove(unsigned int)
Previously, this method calculated the length of the string from the
given index onwards. However, the other remove() method called already
contains code for this calculation, which is used when the count passed
in is too big. This means we can just pass in a very big count that is
guaranteed to point past the end of the string, shrinking the remove
method by a few bytes.
2014-09-10 12:33:25 +02:00
Matthijs Kooijman
2068f88a21 Fix bounds check in String::remove()
Previously, if you passed in a very big index and/or count, the
`index + count` could overflow, making the count be used as-is instead
of being truncated (causing the string to be updated wrongly and
potentially writing to arbitrary memory locations).

We can rewrite the comparison to use `len - index` instead. Since we
know that index < len, we are sure this subtraction does not overflow,
regardless of what values of index and count we pass in.

As an added bonus, the `len - index` value already needed be calculated
inside the if, so this saves a few instructions in the generated code.

To illustrate this problem, consider this code:

String foo = "foo";
Serial.println(foo.length()); // Prints 3
foo.remove(1, 65535); // Should remove all but first character
Serial.println(foo.length()); // Prints 4 without this patch

Not shown in this is example is that some arbitrary memory is written
as well.
2014-09-10 12:33:25 +02:00
Matthijs Kooijman
2b90124e3d Remove unneeded check in String::remove(unsigned int)
This check already happens in the remove(unsigned int, unsigned int)
method that is caled, so there is no need to also check this here.
2014-09-10 12:33:24 +02:00
Cristian Maglie
9a8b9c5c58 Fixed license for new.cpp and small cosmetic changes 2014-09-06 12:44:53 +02:00
Cristian Maglie
37ee800abd Correct implementation of gcc specific internal functions
The following empty stubs has been replaced by the gcc
flag -fno-threadsafe-static:

  int __cxa_guard_acquire(__guard *);
  void __cxa_guard_release (__guard *);
  void __cxa_guard_abort (__guard *);

The following empty stubs has been moved into their specific
module abi.cpp:

  void __cxa_pure_virtual(void) __attribute ((noreturn));
  void __cxa_deleted_virtual(void) __attribute ((noreturn));

Fix #107
2014-09-06 12:42:25 +02:00
Cristian Maglie
b0b83625c1 Printable.h doesn't need new.h but only stdlib.h for size_t.
Probalby new.h may be removed completely.
2014-09-06 12:37:57 +02:00
Cristian Maglie
aa776b30ba Fix for upload problems on Arduino Leonardo (and derivatives) with OSX 10.9.4 2014-09-01 12:16:41 +02:00
Cristian Maglie
7f2350f714 Merge branch 'master' into ide-1.5.x 2014-08-08 15:44:41 +02:00
Cristian Maglie
fd94e184a5 Merge remote-tracking branch 'arduino/master' into ide-1.5.x 2014-07-24 14:46:05 +02:00
Cristian Maglie
dbd9b77b49 Merge pull request #2190 from ribbons/compiler-warnings
Fix two compiler warnings generated by updated toolchain
2014-07-19 09:35:58 +02:00
PaulStoffregen
33cec73f26 Add availableForWrite() to HardwareSerial 2014-07-18 07:01:26 -07:00
Matt Robinson
61a3558946 Cast empty string to char* to fix compiler warning
Stream::find(char *target) passes an empty terminator string to
Stream::findUntil(char *target, char *terminator) which caused a compiler
warning with the updated toolchain, so cast it to a char*.
2014-07-17 16:51:35 +01:00
Cristian Maglie
e5f34e5a83 Merge branch 'ide-1.5.x-timer-variant' of github.com:matthijskooijman/Arduino into matthijskooijman-ide-1.5.x-timer-variant 2014-07-01 18:29:07 +02:00
Cristian Maglie
370648a532 Merge branch 'ide-1.5.7' into ide-1.5.x 2014-06-27 13:44:18 +02:00
Matthijs Kooijman
10a89a1d8d Support Atmega8 (and similar that define PE instead of UPE) again
These chips were previously supported, but since parity error checking
was added, this support has broken. Most chips define UPE0 (etc.) for
the parity error bit. Some chips don't have numbered UARTS so only
define UPE and even fewer define PE instead of UPE. This adds support
for those chips again.

Closes: #2137
2014-06-25 17:20:07 +02:00
Matthijs Kooijman
4014dd6070 Allow variants to define an initVariant() function that is called at startup.
See #2080 and #2139.
2014-06-25 16:56:19 +02:00
Cristian Maglie
59767b4c03 Removed patch for old malloc bug (no more useful with updated toolchain) 2014-06-25 10:14:35 +02:00
Cristian Maglie
1a305cdc45 Merge branch 'master' into ide-1.5.x 2014-06-19 17:01:53 +02:00
Cristian Maglie
7f9e9b1cc2 Merge branch 'master' into HEAD 2014-06-13 10:29:12 +02:00
Cristian Maglie
82fe44d76d Merge branch 'master' into HEAD 2014-05-30 10:54:14 +02:00
Cristian Maglie
36331fa1c9 Merge branch 'usbcdc-improved' into ide-1.5.x 2014-05-26 13:38:07 +02:00
Cristian Maglie
cc2a9a65c3 Merge branch 'ide-1.5.x-hwserial-cleanup' of github.com:matthijskooijman/Arduino into matthijskooijman-ide-1.5.x-hwserial-cleanup 2014-05-23 21:16:42 +02:00