Merge branch 'ide-1.5.x' into HEAD

Author: cmaglie

build/shared/revisions.txt

@@ -1,4 +1,4 @@
-ARDUINO 1.5.7 BETA
+ARDUINO 1.5.7 BETA - 2014.07.07
 
 [core]
 * Upgraded AVR toolchain: gcc 4.8.1, avr-libc 1.8.0
@@ -13,6 +13,7 @@ ARDUINO 1.5.7 BETA
 * avr: Fix EXTERNAL_NUM_INTERRUPTS for atmega128rfa1 and atmega256rfr2 (Matthijs Kooijman)
 * sam: Fix to Wire::endTransmisson() return value (bluesign2k)
 * sam: Fix to Wire usage of TWI status register (bluesign2k)
+* avr: Fixed PROGMEM statements to be compatible with newer avr gcc (Scott Howard)
 
 [ide]
 * Moved to appbundler for building releases for MacOSX. (Haavar Valeur)
@@ -36,7 +37,7 @@ ARDUINO 1.5.7 BETA
 * Improved speed of YunSerialTerminal
 * Fixed CRC of shutdown command on YunSerialTerminal example
 * Updates/Fix to various examples
-* avr: Added Wire.setClock(..) method (Kristian Sloth Lauszus)
+* Added Wire.setClock(..) method (Kristian Sloth Lauszus)
 
 The following changes are included also in the (not yet released) Arduino IDE 1.0.6:
 
@@ -61,12 +62,12 @@ The following changes are included also in the (not yet released) Arduino IDE 1.
 [firmware]
 * Wifishield: fixed paths on firmware upgrade scripts
 
-ARDUINO 1.5.6-r2 BETA 2014.02.21
+ARDUINO 1.5.6-r2 BETA - 2014.02.21
 
 [ide]
 * JSSC: Fixed NPE when RXCHAR event with no bytes (José Pereda)
 
-ARDUINO 1.5.6 BETA 2014.02.20
+ARDUINO 1.5.6 BETA - 2014.02.20
 
 [ide]
 * Implemented 1.5 library specification Rev.2
@@ -107,14 +108,14 @@ ARDUINO 1.5.6 BETA 2014.02.20
 * Make some operators in IPAddress const (Matthijs Kooijman)
 * Fix for compiling assembler files with newer gcc
 
-ARDUINO 1.5.5-r2 BETA 2014.01.10
+ARDUINO 1.5.5-r2 BETA - 2014.01.10
 
 * Signed drivers for Windows 8.1
 * Fixed Windows drivers signature (that prevented installation on
   some Windows 8.x OS). Now the signature is timestamped and should
   not expire.
 
-ARDUINO 1.5.5 BETA 2013.11.28
+ARDUINO 1.5.5 BETA - 2013.11.28
 
 NOTICE:
 The 1.5 library format is under heavy review on the Arduino Developers mailing list.
@@ -167,7 +168,7 @@ We suggest to delay the adoption of the new format until a stable 1.5.x is relea
 * avr: added variant file for Arduino Ethernet
 * Added SERIAL_* metadata in variants files (Paul Stoffregen)
 
-ARDUINO 1.5.4 BETA 2013.09.10
+ARDUINO 1.5.4 BETA - 2013.09.10
 
 [ide]
 * Revert to English locale if the system default is not available
@@ -183,7 +184,7 @@ ARDUINO 1.5.4 BETA 2013.09.10
 [core]
 * avr: fixed bug introduced with recent optimizations in HardwareSerial (atmega8 cpu) (darryl)
 
-ARDUINO 1.5.3 BETA 2013.08.30
+ARDUINO 1.5.3 BETA - 2013.08.30
 
 [ide]
 * Removed useless baud rates from serial monitor

hardware/arduino/sam/libraries/Wire/Wire.cpp

@@ -95,8 +95,7 @@ static inline bool TWI_STATUS_NACK(uint32_t status) {
 TwoWire::TwoWire(Twi *_twi, void(*_beginCb)(void)) :
 	twi(_twi), rxBufferIndex(0), rxBufferLength(0), txAddress(0),
 			txBufferLength(0), srvBufferIndex(0), srvBufferLength(0), status(
-					UNINITIALIZED), onBeginCallback(_beginCb) {
-	// Empty
+					UNINITIALIZED), onBeginCallback(_beginCb), twiClock(TWI_CLOCK) {
 }
 
 void TwoWire::begin(void) {
@@ -106,7 +105,7 @@ void TwoWire::begin(void) {
 	// Disable PDC channel
 	twi->TWI_PTCR = UART_PTCR_RXTDIS | UART_PTCR_TXTDIS;
 
-	TWI_ConfigureMaster(twi, TWI_CLOCK, VARIANT_MCK);
+	TWI_ConfigureMaster(twi, twiClock, VARIANT_MCK);
 	status = MASTER_IDLE;
 }
 
@@ -127,6 +126,11 @@ void TwoWire::begin(int address) {
 	begin((uint8_t) address);
 }
 
+void TwoWire::setClock(uint32_t frequency) {
+	twiClock = frequency;
+	TWI_SetClock(twi, twiClock, VARIANT_MCK);
+}
+
 uint8_t TwoWire::requestFrom(uint8_t address, uint8_t quantity, uint8_t sendStop) {
 	if (quantity > BUFFER_LENGTH)
 		quantity = BUFFER_LENGTH;

hardware/arduino/sam/libraries/Wire/Wire.h

@@ -35,6 +35,7 @@ class TwoWire : public Stream {
 	void begin();
 	void begin(uint8_t);
 	void begin(int);
+	void setClock(uint32_t);
 	void beginTransmission(uint8_t);
 	void beginTransmission(int);
 	uint8_t endTransmission(void);
@@ -100,6 +101,7 @@ class TwoWire : public Stream {
 
 	// TWI clock frequency
 	static const uint32_t TWI_CLOCK = 100000;
+	uint32_t twiClock;
 
 	// Timeouts (
 	static const uint32_t RECV_TIMEOUT = 100000;

hardware/arduino/sam/libraries/Wire/keywords.txt

@@ -11,6 +11,7 @@
 #######################################
 
 begin	KEYWORD2
+setClock	KEYWORD2
 beginTransmission	KEYWORD2
 endTransmission	KEYWORD2
 requestFrom	KEYWORD2

hardware/arduino/sam/system/libsam/include/twi.h

@@ -67,6 +67,8 @@
 
 extern void TWI_ConfigureMaster(Twi *pTwi, uint32_t twck, uint32_t mck);
 
+extern void TWI_SetClock( Twi *pTwi, uint32_t dwTwCk, uint32_t dwMCk );
+
 extern void TWI_ConfigureSlave(Twi *pTwi, uint8_t slaveAddress);
 
 extern void TWI_Stop(Twi *pTwi);

hardware/arduino/sam/system/libsam/source/twi.c

@@ -96,10 +96,6 @@
  */
 void TWI_ConfigureMaster( Twi* pTwi, uint32_t dwTwCk, uint32_t dwMCk )
 {
-    uint32_t dwCkDiv = 0 ;
-    uint32_t dwClDiv ;
-    uint32_t dwOk = 0 ;
-
     assert( pTwi ) ;
 
     /* SVEN: TWI Slave Mode Enabled */
@@ -115,6 +111,19 @@ void TWI_ConfigureMaster( Twi* pTwi, uint32_t dwTwCk, uint32_t dwMCk )
     /* Set master mode */
     pTwi->TWI_CR = TWI_CR_MSEN ;
 
+    /* Configure clock */
+    TWI_SetClock(pTwi, dwTwCk, dwMCk);
+}
+
+
+void TWI_SetClock( Twi *pTwi, uint32_t dwTwCk, uint32_t dwMCk )
+{
+    assert( pTwi ) ;
+
+    uint32_t dwCkDiv = 0 ;
+    uint32_t dwClDiv ;
+    uint32_t dwOk = 0 ;
+
     /* Configure clock */
     while ( !dwOk )
     {
@@ -137,6 +146,7 @@ void TWI_ConfigureMaster( Twi* pTwi, uint32_t dwTwCk, uint32_t dwMCk )
     pTwi->TWI_CWGR = (dwCkDiv << 16) | (dwClDiv << 8) | dwClDiv ;
 }
 
+
 /**
  * \brief Configures a TWI peripheral to operate in slave mode.
  * \param pTwi  Pointer to an Twi instance.

hardware/arduino/sam/variants/arduino_due_x/libsam_sam3x8e_gcc_rel.a

@@ -72,7 +72,7 @@ pmc.o:
 00000000 T pmc_switch_udpck_to_upllck
 
 pwmc.o:
-00000000 r C.9.8049
+00000000 r C.9.8054
 00000000 t FindClockConfiguration
 00000000 T PWMC_ConfigureChannel
 00000000 T PWMC_ConfigureChannelExt
@@ -100,14 +100,14 @@ pwmc.o:
 00000000 T PWMC_SetSyncChannelUpdateUnlock
 00000000 T PWMC_WriteBuffer
          U __assert_func
-00000000 r __func__.6631
-00000000 r __func__.6642
-00000000 r __func__.6657
-00000000 r __func__.6668
-00000000 r __func__.6679
-00000000 r __func__.6686
-00000000 r __func__.6770
-00000000 r __func__.6776
+00000000 r __func__.6635
+00000000 r __func__.6646
+00000000 r __func__.6661
+00000000 r __func__.6672
+00000000 r __func__.6683
+00000000 r __func__.6690
+00000000 r __func__.6774
+00000000 r __func__.6780
 
 rtc.o:
 00000000 T RTC_ClearSCCR
@@ -123,9 +123,9 @@ rtc.o:
 00000000 T RTC_SetTime
 00000000 T RTC_SetTimeAlarm
          U __assert_func
-00000000 r __func__.6628
-00000000 r __func__.6637
-00000000 r __func__.6642
+00000000 r __func__.6632
+00000000 r __func__.6641
+00000000 r __func__.6646
 
 rtt.o:
 00000000 T RTT_EnableIT
@@ -134,8 +134,8 @@ rtt.o:
 00000000 T RTT_SetAlarm
 00000000 T RTT_SetPrescaler
          U __assert_func
-00000000 r __func__.6635
-00000000 r __func__.6643
+00000000 r __func__.6639
+00000000 r __func__.6647
 
 spi.o:
 00000000 T SPI_Configure
@@ -161,9 +161,9 @@ tc.o:
 00000000 T TC_Start
 00000000 T TC_Stop
          U __assert_func
-00000000 r __func__.6630
-00000000 r __func__.6636
-00000000 r __func__.6642
+00000000 r __func__.6634
+00000000 r __func__.6640
+00000000 r __func__.6646
 
 timetick.o:
 00000000 T GetTickCount
@@ -184,24 +184,26 @@ twi.o:
 00000000 T TWI_GetStatus
 00000000 T TWI_ReadByte
 00000000 T TWI_SendSTOPCondition
+00000000 T TWI_SetClock
 00000000 T TWI_StartRead
 00000000 T TWI_StartWrite
 00000000 T TWI_Stop
 00000000 T TWI_TransferComplete
 00000000 T TWI_WriteByte
          U __assert_func
-00000000 r __func__.7003
-00000000 r __func__.7018
-00000000 r __func__.7022
-00000000 r __func__.7029
-00000000 r __func__.7033
-00000000 r __func__.7038
-00000000 r __func__.7046
-00000000 r __func__.7060
-00000000 r __func__.7065
-00000000 r __func__.7069
-00000000 r __func__.7074
-00000000 r __func__.7078
+00000000 r __func__.7004
+00000000 r __func__.7010
+00000000 r __func__.7028
+00000000 r __func__.7032
+00000000 r __func__.7039
+00000000 r __func__.7043
+00000000 r __func__.7048
+00000000 r __func__.7056
+00000000 r __func__.7070
+00000000 r __func__.7075
+00000000 r __func__.7079
+00000000 r __func__.7084
+00000000 r __func__.7088
 
 usart.o:
 00000000 T USART_Configure
@@ -220,7 +222,7 @@ usart.o:
 00000000 T USART_Write
 00000000 T USART_WriteBuffer
          U __assert_func
-00000000 r __func__.6924
+00000000 r __func__.6928
 
 wdt.o:
 00000000 T WDT_Disable
@@ -298,7 +300,7 @@ startup_sam3xa.o:
          U main
 
 adc.o:
-00000000 r C.0.8141
+00000000 r C.0.8146
 00000000 T adc_configure_power_save
 00000000 T adc_configure_sequence
 00000000 T adc_configure_timing
@@ -488,7 +490,7 @@ efc.o:
 00000000 T efc_set_flash_access_mode
 00000000 T efc_set_wait_state
 0000006c T efc_write_fmr
-00000000 b iap_perform_command.6905
+00000000 b iap_perform_command.6909
 
 gpbr.o:
 00000000 T gpbr_read

hardware/arduino/sam/variants/arduino_due_x/libsam_sam3x8e_gcc_rel.a.txt

@@ -6,8 +6,8 @@
 #define __TOUTMODEMCONFIGURATION__ 5000//equivalent to 30000 because of time in interrupt routine.
 #define __TOUTAT__ 1000
 
-char _command_AT[] PROGMEM = "AT";
-char _command_CGREG[] PROGMEM = "AT+CGREG?";
+const char _command_AT[] PROGMEM = "AT";
+const char _command_CGREG[] PROGMEM = "AT+CGREG?";
 
 
 GSM3ShieldV1AccessProvider::GSM3ShieldV1AccessProvider(bool debug)

libraries/GSM/src/GSM3ShieldV1AccessProvider.cpp

@@ -12,7 +12,7 @@ int GSM3ShieldV1BaseProvider::ready()
 	return theGSM3ShieldV1ModemCore.getCommandError();
 };
 
-void GSM3ShieldV1BaseProvider::prepareAuxLocate(PROGMEM prog_char str[], char auxLocate[])
+void GSM3ShieldV1BaseProvider::prepareAuxLocate(PGM_P str, char auxLocate[])
 {
 	int i=0;
 	char c;

libraries/GSM/src/GSM3ShieldV1BaseProvider.cpp

@@ -54,7 +54,7 @@ class GSM3ShieldV1BaseProvider
 		@param str			PROGMEN
 		@param auxLocate	Buffer where to locate strings
 	*/
-	void prepareAuxLocate(PROGMEM prog_char str[], char auxLocate[]);
+	void prepareAuxLocate(PGM_P str, char auxLocate[]);
 
 	/** Manages modem response
 		@param from 		Initial byte of buffer
@@ -70,4 +70,4 @@ class GSM3ShieldV1BaseProvider
 
 };
 
-#endif
+#endif

libraries/GSM/src/GSM3ShieldV1BaseProvider.h

@@ -1,8 +1,8 @@
 #include <GSM3ShieldV1DataNetworkProvider.h>
 #include <Arduino.h>
 
-char _command_CGATT[] PROGMEM = "AT+CGATT=";
-char _command_SEPARATOR[] PROGMEM = "\",\"";
+const char _command_CGATT[] PROGMEM = "AT+CGATT=";
+const char _command_SEPARATOR[] PROGMEM = "\",\"";
 
 //Attach GPRS main function.	
 GSM3_NetworkStatus_t GSM3ShieldV1DataNetworkProvider::attachGPRS(char* apn, char* user_name, char* password, bool synchronous)

libraries/GSM/src/GSM3ShieldV1DataNetworkProvider.cpp

@@ -75,7 +75,7 @@ void GSM3ShieldV1ModemCore::closeCommand(int code)
 }
 
 //Generic command (stored in flash).
-void GSM3ShieldV1ModemCore::genericCommand_rq(PROGMEM prog_char str[], bool addCR)
+void GSM3ShieldV1ModemCore::genericCommand_rq(PGM_P str, bool addCR)
 {
 	theBuffer().flush();
 	writePGM(str, addCR);	
@@ -157,7 +157,7 @@ void GSM3ShieldV1ModemCore::openCommand(GSM3ShieldV1BaseProvider* provider, GSM3
 
 };
 
-size_t GSM3ShieldV1ModemCore::writePGM(PROGMEM prog_char str[], bool CR)
+size_t GSM3ShieldV1ModemCore::writePGM(PGM_P str, bool CR)
 {
 	int i=0;
 	char c;