--- trunk/Embedded/main.c	2007/12/05 14:39:35	159
+++ trunk/Embedded/main.c	2007/12/05 15:01:15	160
@@ -2,6 +2,7 @@
 #include <stdio.h>
 #include <htc.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include "lcd.h"
 #include "Delay.h"
@@ -17,22 +18,24 @@
 
 
 unsigned char global_Pot_Hi, global_Pot_Lo;
-unsigned char global_LCD_Buffer[LCD_ROWS][LCD_LENGTH];
 unsigned char global_serial_send[BUFFER], global_serial_recieve_buffer[BUFFER];
 bit global_recieve_done = 0, global_interval_changed = 0;
 unsigned int global_serial_byte_counter = 0, global_sms_counter = 1, global_time_counter = 0;
 unsigned int global_emergency_counter = 600, global_time_interval = 3600;
 unsigned char global_temp = 0;
 
-unsigned char global_message_buffer[BUFFER];
-unsigned char global_message_buffer_length;
+unsigned char global_message_buffer1[BUFFER];
+unsigned char global_message_buffer2[BUFFER];
+unsigned char global_message_buffer_length1;
+unsigned char global_message_buffer_length2;
 
 unsigned char global_lcd_buf[16];
 
 unsigned short global_imei_tversum;
 
-unsigned char cell_nr[15] = ""; // = "21681784";
+unsigned char global_cell_nr[15] = ""; // = "21681784";
 bit global_modem_init = 0;
+bit global_has_imei = 0;
 
 unsigned char global_sms_recieve_number[3];
 
@@ -47,19 +50,33 @@
 void on_recieve(void);
 void on_initial_recieve(void);
 void sms_recieved(void);
+void send_sms(unsigned char* payload);
 
 
 void reset_recieve_buffer(void)
 {
 	global_recieve_done = 0;
 	
-	global_serial_byte_counter=0;
-	global_serial_recieve_buffer[0] = 0;
+	global_message_buffer_length1 = 0;
+	//global_message_buffer1[0] = 0;	
+	global_message_buffer_length2 = 0;
+	//global_message_buffer2[0] = 0;	
 	
-	global_message_buffer_length = 0;
-	global_message_buffer[0] = 0;	
+	memset(global_message_buffer1, 0, BUFFER);
+	memset(global_message_buffer2, 0, BUFFER);
 }	
 
+void pic18_io_init(void)
+{
+	TRISA0	= 1;	// analog input
+	TRISA5	= 0;	// Output
+	TRISB1	= 1;	// TRISB1-4 Digital input
+	TRISB2	= 1;
+	TRISB3	= 1;
+	TRISB4	= 1;
+}
+
+
 
 void ad_init(void) // Nicked from H7
 {
@@ -123,27 +140,36 @@
 	T1OSCEN = 1; //enable oscillator circuit	
 	RD16 = 0; //normal 8 bit writes
 	TMR1ON = 1;
-}
-
-void pic18_io_init(void)
-{
-	TRISA0	= 1;	// analog input
-	TRISA1	= 0;	// Output
-	TRISB1	= 1;	// TRISB1-4 Digital input
-	TRISB2	= 1;
-	TRISB3	= 1;
-	TRISB4	= 1;
 }	
 
 void sms_init(void)
 {
 	int i;
+	char buf[2];
+
 
 	reset_recieve_buffer();
 	sprintf(global_serial_send,"at+cgsn\r");
 	serial_send();
 	DelaySek(1);
-	while(!global_recieve_done) ;
+	//while(!global_recieve_done) ;
+	
+	while (global_has_imei == 0)
+	{
+		if (strstr(global_message_buffer1,"OK") != 0)
+		{
+			global_imei_tversum = 0;
+			for (i=0; i<15; ++i)
+			{
+				buf[0] = global_message_buffer2[i];
+				buf[1] = 0;
+				global_imei_tversum += atoi(buf);
+				//global_imei_tversum += (global_message_buffer2[i] - '0');
+			}
+			
+			global_has_imei = 1;
+		}
+	}
 
 
 	sprintf(global_serial_send,"%s", "at+cpin=8043\r");
@@ -153,6 +179,12 @@
 	{
 		on_initial_recieve();
 	}
+	DelayMs(5);
+	
+	reset_recieve_buffer();
+	sprintf(global_serial_send, "at+cmgd=1,4\r");
+	serial_send();
+	while ( strstr(global_message_buffer1,"OK") == 0) ;
 }
 
 
@@ -187,31 +219,51 @@
 		DelayMs(10);
 	}
 	DelayMs(250);
+	global_serial_send[0] = 0;
 	DelayMs(250);
 }	
 
-void serial_recieved(void)
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// Takes the recieving data and fills it in a buffer, when we meet a '\r' we fill the data from,
+// global_serial_recieve_buffer, to global_message_buffer1, and sets the flag global_recieve_done.
+void serial_recieved(void) 
 {
 	char data_byte, saved_data[LCD_LENGTH];
 	
 	data_byte = RCREG;
 	
-	if (data_byte == '\n')
+	if (data_byte == '\n')		// Cant be bothered to do anyting if the byte is a '\n'.
 		return;
 		
-	if (global_serial_byte_counter == 0 && data_byte == '\r')
+	if (global_serial_byte_counter == 0 && data_byte == '\r')	// don't care about '\r', if it's the first byte we recieve.
 		return;
 
-	global_serial_recieve_buffer[global_serial_byte_counter] = data_byte;
-		
-	if (data_byte == '\r')
+//	if (global_serial_byte_counter == BUFFER -1)
+//		global_seriaæl_recieve_buffer[global_serial_byte_counter] = 0;
+
+//	if (data_byte != '\r' && (global_serial_byte_counter-1) < BUFFER)	
+//		global_serial_recieve_buffer[ global_serial_byte_counter++ ] = data_byte;	// fills the data_byte into our buffer.
+	global_serial_recieve_buffer[ global_serial_byte_counter] = data_byte;
+	
+	
+	if (data_byte == '\r')	// when we meet a '\r', the transmission is done, and we fill the constxt of 
+							// global_message_buffer1 into global_message_buffer2 our main buffer into
+							// global_message_buffer2, and the same with our recieve buffer, global_serial_recieve_buffer
+							// into global_message_buffer1.
 	{
-		global_recieve_done = 1;
-		//global_serial_byte_counter = 0;
+		global_recieve_done = 1; // indicates the recieve transmission is done.
 		global_serial_recieve_buffer[global_serial_byte_counter] = 0; //zero terminate
 		
-		strcpy(global_message_buffer, global_serial_recieve_buffer);
-		global_message_buffer_length = global_serial_byte_counter;
+		// global_message_buffer1 -> global_message_buffer2
+		strcpy(global_message_buffer2, global_message_buffer1);
+		global_message_buffer_length2 = global_message_buffer_length1;
+		
+		// global_serial_recieve_buffer -> global_message_buffer1
+		strcpy(global_message_buffer1, global_serial_recieve_buffer);
+		global_message_buffer_length1 = global_serial_byte_counter;
+		
+		
+		global_serial_byte_counter = 0;
 	}	
 	else
 	{
@@ -234,21 +286,28 @@
 	lcd_clear();
 	lcd_goto(0x00);
 	
-	sprintf(global_lcd_buf, "%d", global_temp);
+	sprintf(global_lcd_buf, "Temp: %d", global_temp);
 	lcd_puts(global_lcd_buf);
 
 }
 	
 void send_update(void)
 {
-	sprintf(global_serial_send, "at+cmgs=\"%s\"\r", cell_nr);
+	char update[40];
+	sprintf(update, "%d:%d:%d:%d:%d:%d", global_sms_counter, global_temp, FIREDET, EMPTYTANK, FEEDING, PWRFAIL);
+	send_sms(update);
+
+	global_sms_counter++;
+}	
+
+void send_sms(unsigned char* payload)
+{
+	sprintf(global_serial_send, "at+cmgs=\"%s\"\r", global_cell_nr);
 	serial_send();
-	sprintf(global_serial_send, "%d:%d:%d:%d:%d:%d%c", global_sms_counter, global_temp, FIREDET, EMPTYTANK, FEEDING, PWRFAIL, 0x1A);
-	lcd_goto(40);
-	lcd_puts(global_serial_send);
+	sprintf(global_serial_send, "%s%c", payload, 0x1A);
 	serial_send();
 	DelayMs(250);
-	global_sms_counter++;
+	
 }	
 
 void convertTemp()
@@ -258,7 +317,7 @@
 	if( adVal >=840 )
 		global_temp = 100;
 	else
-		global_temp = (adVal / 8.3886);
+		global_temp = (unsigned char) (adVal / 8.3886);
 }
 
 
@@ -267,7 +326,7 @@
 {
 	char len,i;
 	
-	len = strlen(cell_nr);
+	len = strlen(global_cell_nr);
 	eeprom_write(0, (global_time_interval/60));
 	eeprom_write(1, global_sms_counter>>8);
 	eeprom_write(2, global_sms_counter);
@@ -275,7 +334,7 @@
 	
 	for (i=0; i<len; ++i)
 	{
-		eeprom_write(i+4, cell_nr[i] );
+		eeprom_write(i+4, global_cell_nr[i] );
 	}
 }
 
@@ -290,10 +349,10 @@
 	
 	for (i=0; i<len; ++i)
 	{
-		cell_nr[i] = eeprom_read(i+4);
+		global_cell_nr[i] = eeprom_read(i+4);
 	}
 	
-	cell_nr[i] = 0; //zero terminated!
+	global_cell_nr[i] = 0; //zero terminated!
 }	
 
 void on_initial_recieve(void)
@@ -301,6 +360,7 @@
 	char imei[16];
 	char* ptr;
 	char i;
+	char buf[2];
 	
 	if (strstr(global_serial_recieve_buffer,"+WIND: 11") != 0)
 	{
@@ -310,56 +370,82 @@
 		ptr +=4;
 		strncpy(imei, ptr,15);
 		imei[15] = 0;
-
-		global_imei_tversum = 0;
-		for (i=0; i<15; ++i)
-		{
-			global_imei_tversum += (imei[i] - '0');
-		}
-		
 		
 		reset_recieve_buffer();
 	}
 }
 
-
 void on_recieve(void)
 {
-	char tmp[17];
+	char tmp[3];
 	char* ptr;
 	tmp[0]=0;
 		
-	if (global_recieve_done == 0 || global_message_buffer_length == 0)
+	if (global_recieve_done == 0 || global_message_buffer_length1 == 0)
 		return;
 
-	
-	if (strstr(global_serial_recieve_buffer,"CMTI") != 0)
+	if (strstr(global_message_buffer1,"CMTI") != 0) // here we handles a incomming SMS
 	{
-		ptr = strstr(global_serial_recieve_buffer,",");
-		strcat(tmp,ptr+1);
-		sprintf(global_sms_recieve_number,"%s", tmp);
-		lcd_clear();
-		lcd_puts(global_sms_recieve_number);
+		ptr = strstr(global_message_buffer1,",");	// finds the point just before the nr. of the SMS.
+		strcat(tmp,ptr+1);							// puts that number in tmp
+		global_sms_recieve_number[0] = 0;			// wanna be sure that we write the new number from global_sms_recieve_number[0]
+		strcat(global_sms_recieve_number, tmp);		// puts the sms number into the global variable.
 		sms_recieved();
-	}
-	else if (strstr(global_message_buffer,"CMTI") != 0)
-	{
-		ptr = strstr(global_message_buffer,",");
-		strcat(tmp,ptr+1);
-		lcd_clear();
-		lcd_puts(tmp);
-	}
-	
-	
+	}	
 	reset_recieve_buffer();
 }
 
 void sms_recieved(void)
 {
-	sprintf(global_serial_send, "AT+CMGR=%s\r", global_sms_recieve_number);
-	serial_send();
+	char buf[4];
+	char i,imei;
+	char pos;
+	
+	sprintf(global_serial_send, "AT+CMGR=%s\r", global_sms_recieve_number);	// formates the variable that sends commands to the SMS modem.
+	serial_send();		// Sends the command.
+	
+	while(strstr(global_message_buffer1, "OK")  == 0)	// stays here until we recieve a "OK" from the modem.
+		DelayMs(1);
+
+	DelayUs(10);
+	
+	for (i=0; global_message_buffer2[i] != ':' && global_message_buffer2[i] != 0; ++i)
+	{
+		buf[i] = global_message_buffer2[i];
+	}
+	
+	buf[i] = 0;
+	imei = atoi(buf);
+	
+	if (imei == global_imei_tversum)
+	{
+		i++; //spring over ':'
+		pos = 0;
+		for ( ; global_message_buffer2[i] != ':'; ++i, ++pos)
+		{
+			global_cell_nr[pos] = global_message_buffer2[i];
+		}
+		global_cell_nr[pos] = 0; //zero terminator
+		
+		i++; //spring over ':'
+		pos=0;
+		for ( ; global_message_buffer2[i] ; ++i,++pos)
+		{
+			buf[pos] = global_message_buffer2[i];
+		}
+		buf[pos]=0;
+		
+		global_time_interval = atoi(buf);
+		global_time_interval *= 60;
+		eeprom_writer();			// writes the new cell nr. and time interval to the eeprom.
+		send_sms("conf ok");
+	}
+	
+
 }
 
+
+
 void main()
 {
 ////////////////////
@@ -367,6 +453,8 @@
 
 	// Running init for various components.
 	pic18_io_init();
+	RA5 = 1;			// Indicates that the board is running inits.
+	
 	rs232_init();
 	ad_init();
 	lcd_init(0);
@@ -381,6 +469,8 @@
 	DelayMs(50);
 	reset_recieve_buffer();
 
+	RA5 = 0;			// Inits are done, and RA1 will now work as a error notifier.
+
 	while(1)
 	{
 	// If there happends to be a critical state on the system, we send a sms.
@@ -411,7 +501,7 @@
 			global_Pot_Hi = ADRESH;
 			global_Pot_Lo = ADRESL;
 			convertTemp();
-			//update_lcd();
+			update_lcd();
 			GODONE = 1;
 		}
 	// Handels the recieve sms'es.