Merged 1.0.5

Merge remote-tracking branch 'arduino/master' into ide-1.5.x

Conflicts:
	app/src/processing/app/Base.java
	build/shared/revisions.txt
	hardware/arduino/avr/cores/arduino/malloc.c
	hardware/arduino/cores/arduino/avr-libc/malloc.c
	hardware/arduino/cores/arduino/malloc.c
	todo.txt

1 files changed, 198 insertions, 0 deletions

diff --git a/libraries/GSM/GSM3ShieldV1ModemCore.cpp b/libraries/GSM/GSM3ShieldV1ModemCore.cpp
new file mode 100644
index 0000000..c90ff4d
--- /dev/null
+++ b/libraries/GSM/GSM3ShieldV1ModemCore.cpp
@@ -0,0 +1,198 @@
+#include <GSM3ShieldV1ModemCore.h>
+#include <Arduino.h>
+
+GSM3ShieldV1ModemCore theGSM3ShieldV1ModemCore;
+
+char* __ok__="OK";
+
+GSM3ShieldV1ModemCore::GSM3ShieldV1ModemCore() : gss()
+{
+	gss.registerMgr(this);
+	_dataInBufferFrom=0;
+	_dataInBufferTo=0;
+	commandError=1;
+	commandCounter=0;
+	ongoingCommand=NONE;
+	takeMilliseconds();
+	
+	for(int i=0;i<UMPROVIDERS;i++)
+		UMProvider[i]=0;
+}
+
+void GSM3ShieldV1ModemCore::registerUMProvider(GSM3ShieldV1BaseProvider* provider)
+{
+	for(int i=0;i<UMPROVIDERS;i++)
+	{
+		if(UMProvider[i]==0)
+		{
+			UMProvider[i]=provider;
+			break;
+		}
+
+	}
+
+}
+
+void GSM3ShieldV1ModemCore::unRegisterUMProvider(GSM3ShieldV1BaseProvider* provider)
+{
+	for(int i=0;i<UMPROVIDERS;i++)
+	{
+		if(UMProvider[i]==provider)
+		{
+			UMProvider[i]=0;
+			break;
+		}
+	}
+}
+
+
+//Response parse.
+bool GSM3ShieldV1ModemCore::genericParse_rsp(bool& rsp, char* string, char* string2)
+{
+	if((string==0) && (string2==0))
+		string=__ok__;
+	
+	rsp=theBuffer().locate(string);
+	
+	if((!rsp)&&(string2!=0))
+		rsp=theBuffer().locate(string2);
+		
+	return true;
+}
+
+void GSM3ShieldV1ModemCore::closeCommand(int code)
+{
+	// If we were configuring the modem,
+	// and there's been an error
+	// we don't know exactly where we are
+	if((code!=1)&&(theGSM3ShieldV1ModemCore.getOngoingCommand()==MODEMCONFIG))
+		theGSM3ShieldV1ModemCore.setStatus(ERROR);
+
+	setCommandError(code);
+	ongoingCommand=NONE;
+	activeProvider=0;
+	commandCounter=1;
+}
+
+//Generic command (stored in flash).
+void GSM3ShieldV1ModemCore::genericCommand_rq(PROGMEM prog_char str[], bool addCR)
+{
+	theBuffer().flush();
+	writePGM(str, addCR);	
+}
+
+//Generic command (const string).
+void GSM3ShieldV1ModemCore::genericCommand_rqc(const char* str, bool addCR)
+{
+	theBuffer().flush();
+	print(str);
+	if(addCR)
+		print("\r");
+}
+
+// If we are not debugging, lets manage data in interrupt time
+// but if we are not, just take note.
+void GSM3ShieldV1ModemCore::manageMsg(byte from, byte to)
+{
+	if(_debug)
+	{
+		_dataInBufferFrom=from;
+		_dataInBufferTo=to;
+	}
+	else
+	{
+		manageMsgNow(from, to);
+	}
+}
+
+void GSM3ShieldV1ModemCore::manageReceivedData()
+{
+	if(_debug)
+	{
+/*		Serial.print(theBuffer().getHead());
+		Serial.print(" ");
+		Serial.println(theBuffer().getTail());*/
+		if(_dataInBufferFrom != _dataInBufferTo)
+		{
+			theBuffer().debugBuffer();
+			manageMsgNow(_dataInBufferFrom, _dataInBufferTo);
+			_dataInBufferFrom=0;
+			_dataInBufferTo=0;
+		}
+	}
+	else
+	{
+		// Just debugging the non debugging
+//		Serial.println();
+//		Serial.print("Com:");
+//		Serial.print(ongoingCommand);
+//		Serial.print("   Step:");
+//		Serial.print(commandCounter);
+	}
+}
+
+//Select between URC or response.
+void GSM3ShieldV1ModemCore::manageMsgNow(byte from, byte to)
+{
+	bool recognized=false;
+	
+	for(int i=0;(i<UMPROVIDERS)&&(!recognized);i++)
+	{
+		if(UMProvider[i])
+			recognized=UMProvider[i]->recognizeUnsolicitedEvent(from);
+	}
+	if((!recognized)&&(activeProvider))
+		activeProvider->manageResponse(from, to);
+}
+
+
+void GSM3ShieldV1ModemCore::openCommand(GSM3ShieldV1BaseProvider* provider, GSM3_commandType_e c)
+{	
+	activeProvider=provider;
+	commandError=0;
+	commandCounter=1;
+	ongoingCommand=c;
+	_dataInBufferFrom=0;
+	_dataInBufferTo=0;
+
+};
+
+size_t GSM3ShieldV1ModemCore::writePGM(PROGMEM prog_char str[], bool CR)
+{
+	int i=0;
+	char c;
+	
+	do
+	{	
+		c=pgm_read_byte_near(str + i); 
+		if(c!=0)
+			write(c);
+		i++;
+	} while (c!=0);
+	if(CR)
+		print("\r");
+		
+	return 1;
+}
+
+size_t GSM3ShieldV1ModemCore::write(uint8_t c)
+{
+	if(_debug)
+		GSM3CircularBuffer::printCharDebug(c);
+	return gss.write(c);
+}
+
+unsigned long GSM3ShieldV1ModemCore::takeMilliseconds()
+{
+	unsigned long now=millis();
+	unsigned long delta;
+	delta=now-milliseconds;
+	milliseconds=now;
+	return delta;
+}
+
+void GSM3ShieldV1ModemCore::delayInsideInterrupt(unsigned long milliseconds)
+{
+	for (unsigned long k=0;k<milliseconds;k++)  
+		theGSM3ShieldV1ModemCore.gss.tunedDelay(1000); 
+}