rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-18 12:54:25 +01:00
Code Issues Releases Activity

Merge branch 'ide-1.5.x-discovery' into dev-ide-1.5.x-discovery

Browse Source
This commit is contained in:
Federico Fissore 2013-06-25 16:14:17 +02:00
commit 31b1465d44
9 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/shared/revisions.txt
View File

@ -20,6 +20,8 @@ ARDUINO 1.5.3 BETA
[libraries] [libraries]
* sam: Added CAN library (still in early stage of development) (Palliser) * sam: Added CAN library (still in early stage of development) (Palliser)
* sam: Bugfix SPI library: begin() after end() now works (stimmer)
* sam: Bugfix SPI library: incorrent pin configuration in non-extended mode.
[firmwares] [firmwares]
* Arduino Due: fixed USB2Serial garbage at startup (https://github.com/arduino/Arduino/pull/1267) * Arduino Due: fixed USB2Serial garbage at startup (https://github.com/arduino/Arduino/pull/1267)

4
hardware/arduino/avr/cores/arduino/WString.cpp
View File

@ -325,14 +325,14 @@ unsigned char String::concat(unsigned long num)
unsigned char String::concat(float num) unsigned char String::concat(float num)
{ {
char buf[20]; char buf[20];
char* string = dtostrf(num, 8, 6, buf); char* string = dtostrf(num, 8, 2, buf);
return concat(string, strlen(string)); return concat(string, strlen(string));
} }
unsigned char String::concat(double num) unsigned char String::concat(double num)
{ {
char buf[20]; char buf[20];
char* string = dtostrf(num, 8, 6, buf); char* string = dtostrf(num, 8, 2, buf);
return concat(string, strlen(string)); return concat(string, strlen(string));
} }

4
hardware/arduino/avr/cores/arduino/WString.h
View File

@ -69,8 +69,8 @@ public:
explicit String(unsigned int, unsigned char base=10); explicit String(unsigned int, unsigned char base=10);
explicit String(long, unsigned char base=10); explicit String(long, unsigned char base=10);
explicit String(unsigned long, unsigned char base=10); explicit String(unsigned long, unsigned char base=10);
explicit String(float, int decimalPlaces=6); explicit String(float, int decimalPlaces=2);
explicit String(double, int decimalPlaces=6); explicit String(double, int decimalPlaces=2);
~String(void); ~String(void);
// memory management // memory management

4
hardware/arduino/avr/cores/robot/WString.cpp
View File

@ -325,14 +325,14 @@ unsigned char String::concat(unsigned long num)
unsigned char String::concat(float num) unsigned char String::concat(float num)
{ {
char buf[20]; char buf[20];
char* string = dtostrf(num, 8, 6, buf); char* string = dtostrf(num, 8, 2, buf);
return concat(string, strlen(string)); return concat(string, strlen(string));
} }
unsigned char String::concat(double num) unsigned char String::concat(double num)
{ {
char buf[20]; char buf[20];
char* string = dtostrf(num, 8, 6, buf); char* string = dtostrf(num, 8, 2, buf);
return concat(string, strlen(string)); return concat(string, strlen(string));
} }

4
hardware/arduino/avr/cores/robot/WString.h
View File

@ -69,8 +69,8 @@ public:
explicit String(unsigned int, unsigned char base=10); explicit String(unsigned int, unsigned char base=10);
explicit String(long, unsigned char base=10); explicit String(long, unsigned char base=10);
explicit String(unsigned long, unsigned char base=10); explicit String(unsigned long, unsigned char base=10);
explicit String(float, int decimalPlaces=6); explicit String(float, int decimalPlaces=2);
explicit String(double, int decimalPlaces=6); explicit String(double, int decimalPlaces=2);
~String(void); ~String(void);
// memory management // memory management

4
hardware/arduino/sam/cores/arduino/WString.cpp
View File

@ -326,14 +326,14 @@ unsigned char String::concat(unsigned long num)
unsigned char String::concat(float num) unsigned char String::concat(float num)
{ {
char buf[20]; char buf[20];
char* string = dtostrf(num, 8, 6, buf); char* string = dtostrf(num, 8, 2, buf);
return concat(string, strlen(string)); return concat(string, strlen(string));
} }
unsigned char String::concat(double num) unsigned char String::concat(double num)
{ {
char buf[20]; char buf[20];
char* string = dtostrf(num, 8, 6, buf); char* string = dtostrf(num, 8, 2, buf);
return concat(string, strlen(string)); return concat(string, strlen(string));
} }

4
hardware/arduino/sam/cores/arduino/WString.h
View File

@ -69,8 +69,8 @@ public:
explicit String(unsigned int, unsigned char base=10); explicit String(unsigned int, unsigned char base=10);
explicit String(long, unsigned char base=10); explicit String(long, unsigned char base=10);
explicit String(unsigned long, unsigned char base=10); explicit String(unsigned long, unsigned char base=10);
explicit String(float, int decimalPlaces=6); explicit String(float, int decimalPlaces=2);
explicit String(double, int decimalPlaces=6); explicit String(double, int decimalPlaces=2);
~String(void); ~String(void);
// memory management // memory management

9
hardware/arduino/sam/libraries/SPI/SPI.cpp
View File

@ -13,13 +13,14 @@
SPIClass::SPIClass(Spi *_spi, uint32_t _id, void(*_initCb)(void)) : SPIClass::SPIClass(Spi *_spi, uint32_t _id, void(*_initCb)(void)) :
spi(_spi), id(_id), initCb(_initCb) spi(_spi), id(_id), initCb(_initCb)
{ {
initCb(); // Empty
SPI_Configure(spi, id, SPI_MR_MSTR | SPI_MR_PS | SPI_MR_MODFDIS);
SPI_Enable(spi);
} }
void SPIClass::begin() { void SPIClass::begin() {
initCb();
SPI_Configure(spi, id, SPI_MR_MSTR | SPI_MR_PS | SPI_MR_MODFDIS);
SPI_Enable(spi);
// NPCS control is left to the user // NPCS control is left to the user
// Default speed set to 4Mhz // Default speed set to 4Mhz

2
hardware/arduino/sam/variants/arduino_due_x/variant.h
View File

@ -84,7 +84,7 @@ extern "C"{
#define BOARD_SPI_SS1 (4u) #define BOARD_SPI_SS1 (4u)
#define BOARD_SPI_SS2 (52u) #define BOARD_SPI_SS2 (52u)
#define BOARD_SPI_SS3 PIN_SPI_SS3 #define BOARD_SPI_SS3 PIN_SPI_SS3
#define BOARD_SPI_DEFAULT_SS BOARD_SPI_SS2 #define BOARD_SPI_DEFAULT_SS BOARD_SPI_SS3
#define BOARD_PIN_TO_SPI_PIN(x) \ #define BOARD_PIN_TO_SPI_PIN(x) \
(x==BOARD_SPI_SS0 ? PIN_SPI_SS0 : \ (x==BOARD_SPI_SS0 ? PIN_SPI_SS0 : \