--- trunk/Embedded/main.c	2007/12/05 07:30:04	151
+++ trunk/Embedded/main.c	2007/12/09 20:50:42	204
@@ -2,13 +2,11 @@
 #include <stdio.h>
 #include <htc.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include "lcd.h"
 #include "Delay.h"
-// Delay.h is included inside lcd.c
 
-#define LCD_LENGTH 16
-#define LCD_ROWS 2
 #define BUFFER 128
 #define PWRFAIL RB1
 #define FIREDET RB2
@@ -17,23 +15,33 @@
 
 
 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_serial_byte_counter = 0, global_sms_counter = 1, global_time_counter = 0,  global_time_counter_image = 0;
 unsigned int global_emergency_counter = 600, global_time_interval = 3600;
 unsigned char global_temp = 0;
 
+unsigned int global_temp_update_display = 0;
+
+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 int 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];
 
 __EEPROM_DATA( 60, 0, 1, 8, '2', '1', '6', '8');
 __EEPROM_DATA( '1', '7', '8', '4',0,0,0,0);
 
+
 void serial_recieved(void);
 void serial_send(void);
 void update_lcd(void);
@@ -41,13 +49,34 @@
 void timer1_interrupt(void);
 void on_recieve(void);
 void on_initial_recieve(void);
+void sms_recieved(void);
+void send_sms(const unsigned char* payload);
+void eeprom_writer(void);
 
 
 void reset_recieve_buffer(void)
 {
-	global_recieve_done = 0; 
-	global_serial_byte_counter=0;
+	global_recieve_done = 0;
+	
+	global_message_buffer_length1 = 0;
+	//global_message_buffer1[0] = 0;	
+	global_message_buffer_length2 = 0;
+	//global_message_buffer2[0] = 0;	
+	
+	memset(global_message_buffer1, 0, BUFFER);
+	memset(global_message_buffer2, 0, BUFFER);
 }	
+//////////  INITS  //////////
+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
@@ -69,6 +98,10 @@
 	PCFG2=1;
 	PCFG3=1;
 	
+	//Reset the A/D result registers
+	ADRESH = 0;
+	ADRESL = 0;
+	
 	//Result is right justified
 	ADFM=1; 
 	
@@ -76,17 +109,7 @@
 	ADON=1;
 }
 
-void rs232_init(void)
-{
-	SPEN	= 0;	// Serial Port Enable Bit... 0 = disabled
-	TRISC6	= 0;	
-	TRISC7	= 1;
 
-	SPBRG	= 207;	// 1200 baud rate... 25 = 9600
-					// x = (Fosc / (16*[baud rate]) )-1
-	TXSTA	= 0x24;	// Enables BRGH and TXEN inthe TXSTA register
-	RCSTA	= 0x90;	// 0x90 enables SPEN and CREN in the RCSTA register
-}
 
 void interrupt_init(void)
 {
@@ -99,6 +122,8 @@
 	TMR1IE	= 1;	// Enables timer 1
 }	
 
+
+
 void timer_init(void)
 {
 	TMR1CS = 1; //use external clock
@@ -113,38 +138,106 @@
 	RD16 = 0; //normal 8 bit writes
 	TMR1ON = 1;
 }
-
-void pic18_io_init(void)
+	
+void rs232_init(void)
 {
-	TRISA0	= 1;	// analog input
-	TRISA1	= 0;	// Output
-	TRISB1	= 1;	// TRISB1-4 Digital input
-	TRISB2	= 1;
-	TRISB3	= 1;
-	TRISB4	= 1;
-}	
+	SPEN	= 0;	// Serial Port Enable Bit... 0 = disabled
+	TRISC6	= 0;	
+	TRISC7	= 1;
 
-void sms_init(void)
+	SPBRG	= 207;	// 1200 baud rate... 25 = 9600
+					// x = (Fosc / (16*[baud rate]) )-1
+	TXSTA	= 0x24;	// Enables BRGH and TXEN inthe TXSTA register
+	RCSTA	= 0x90;	// 0x90 enables SPEN and CREN in the RCSTA register
+}
+
+void modem_init(void)
 {
 	int i;
+	char buf[2];
+	
+	while ( strstr(global_message_buffer1,"+WIND: 7") == 0 && global_time_counter < 10 ) ;	// Waiting for the modem to be ready
 
 	reset_recieve_buffer();
 	sprintf(global_serial_send,"at+cgsn\r");
 	serial_send();
-	DelaySek(1);
-	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_has_imei = 1;
+		}
+	}
 
-	sprintf(global_serial_send,"%s", "at+cpin=8043\r");
+	sprintf(global_serial_send,"%s", "at+cpin?\r");
 	serial_send();
+	DelayMs(100);		// Delay to give the modem a chance to answer.
 	
-	while(global_modem_init == 0)
+	if (strstr(global_message_buffer1, "+CPIN: SIM PIN") != 0)
+	{
+		sprintf(global_serial_send,"%s", "at+cpin=8043\r");
+		serial_send();
+		
+		while(global_modem_init == 0)
+		{
+			on_initial_recieve();
+		}
+	}
+	reset_recieve_buffer();
+	sprintf(global_serial_send, "at+cmgd=1,4\r");
+	serial_send();
+	while ( strstr(global_message_buffer1,"OK") == 0) ;
+}
+
+void serial_send(void)
+{
+	int i;
+	char data_byte;
+	for(i = 0; i < BUFFER; i++)
 	{
-		on_initial_recieve();
+		data_byte = global_serial_send[i];
+		if( data_byte == '\r')
+			i = (BUFFER - 1);
+		TXREG = data_byte;
+		while(TRMT==0) ;
+		DelayMs(10);
 	}
+	DelayMs(150);
+	global_serial_send[0] = 0;
+	DelayMs(150);
 }
 
+void on_initial_recieve(void)
+{
+// can't se what the outcommented lines in here sould do, that make any sence.
+//	char imei[16];
+//	char* ptr;
+//	char i;
+//	char buf[2];
+	
+	if (strstr(global_serial_recieve_buffer,"+WIND: 11") != 0)
+	{
+		global_modem_init = 1;
+
+//		ptr = strstr(global_serial_recieve_buffer,"cgsn");
+//		ptr +=4;
+//		strncpy(imei, ptr,15);
+//		imei[15] = 0;
+		
+		reset_recieve_buffer();
+	}
+}
 
+//////////  INTERRUPT HANDLER  //////////
 void interrupt interrupt_handler(void)
 {
 	// Finds out what interrupt have been trigged, and starts the respective function.
@@ -161,49 +254,49 @@
 	}
 }		
 
-
-void serial_send(void)
+//////////  INTERRUPT TRIGGED //////////
+void serial_recieved(void) 
 {
-	int i;
 	char data_byte;
-	for(i = 0; i < BUFFER; i++)
-	{
-		data_byte = global_serial_send[i];
-		if( data_byte == '\r')
-			i = (BUFFER - 1);
-		TXREG = data_byte;
-		while(TRMT==0) ;
-		DelayMs(10);
-	}
-	DelayMs(250);
-	DelayMs(250);
-}	
-
-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')
-	{
-		global_recieve_done = 1;
-		//global_serial_byte_counter = 0;
-		global_serial_recieve_buffer[global_serial_byte_counter+1] = 0; //zero terminate
-	}	
+
+	if ( global_serial_byte_counter < BUFFER) //Prevent buffer overrun
+		global_serial_recieve_buffer[ global_serial_byte_counter++ ] = data_byte;	// fills the data_byte into our buffer.
 	else
 	{
-		global_serial_byte_counter++;
+		global_serial_recieve_buffer[0] = 0;
+		global_serial_byte_counter = 0;
+		return;
 	}
 	
+	
+	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; // indicates the recieve transmission is done.
+		global_serial_recieve_buffer[global_serial_byte_counter] = 0; //zero terminate
+		
+		// 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;
+	}	
 }
 
 void timer1_interrupt(void)
@@ -212,39 +305,56 @@
 	TMR1L = 0xFF;
 	global_time_counter++;
 	global_emergency_counter++;
-	RA1 = !RA1;
+//	RA1 = !RA1;
 }
-
+//////////  ORDENARY FUNKTIONS  //////////
 void update_lcd(void)
 {
-	lcd_clear();
-	lcd_goto(0x00);
+	if(global_temp_update_display != global_time_counter)
+	{
+	//	lcd_clear();
+		lcd_goto(0x00);
 	
-	sprintf(global_lcd_buf, "%d", global_temp);
-	lcd_puts(global_lcd_buf);
+		sprintf(global_lcd_buf, "Temp: %3d", global_temp);
+		lcd_puts(global_lcd_buf);
+		global_temp_update_display = global_time_counter;
+	}
 
 }
 	
 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(const 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++;
+	DelayMs(150);
+	if(global_sms_counter % 4 == 0)
+	{
+		eeprom_writer();
+		sprintf(global_serial_send, "at+cmgd=1,3\r");
+		serial_send();
+		while ( strstr(global_message_buffer1,"OK") == 0) ;
+	}
 }	
 
-void convertTemp()
+void convert_temp()
 {
 	short adVal;
 	adVal = (global_Pot_Hi << 8) | global_Pot_Lo;
 	if( adVal >=840 )
 		global_temp = 100;
 	else
-		global_temp = (adVal / 8.3886);
+		global_temp = (unsigned char) (adVal / 8.3886);
 }
 
 
@@ -253,7 +363,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);
@@ -261,7 +371,7 @@
 	
 	for (i=0; i<len; ++i)
 	{
-		eeprom_write(i+4, cell_nr[i] );
+		eeprom_write(i+4, global_cell_nr[i] );
 	}
 }
 
@@ -276,63 +386,87 @@
 	
 	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)
-{
-	char imei[16];
-	char* ptr;
-	char i;
-	
-	if (strstr(global_serial_recieve_buffer,"+WIND: 11") != 0)
-	{
-		global_modem_init = 1;
-
-		ptr = strstr(global_serial_recieve_buffer,"cgsn");
-		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)
+	if (global_recieve_done == 0 || global_message_buffer_length1 == 0)
 		return;
 
-	lcd_goto(0x00);
-	lcd_puts(global_serial_recieve_buffer);		
-	
-	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);
+		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();
+	}	
+	reset_recieve_buffer();
+}
 
+void sms_recieved(void)
+{
+	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);
 
-	lcd_goto(0x40);
-	lcd_puts(tmp);
+	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");
 	}
 	
-	reset_recieve_buffer();
+
+}
+
+void Delay(int time)
+{
+	int wanted = (global_time_counter + time) % global_time_interval;
+	
+	while (global_time_counter < wanted) ;
 }
 
 void main()
@@ -342,13 +476,16 @@
 
 	// Running init for various components.
 	pic18_io_init();
+	RA5 = 1;		// Indicates that the board is running inits.
+	
 	rs232_init();
 	ad_init();
 	lcd_init(0);
+	lcd_clear();
+	lcd_home();
 	interrupt_init();
-	sms_init();
-	//eeprom_init();
 	timer_init();
+	modem_init();
 	eeprom_reader();
 ///////////////
 // Main loop //
@@ -356,16 +493,19 @@
 	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.
-		if( (global_temp >= 90 || PWRFAIL == 1 || FIREDET == 0 || FEEDING == 1 || EMPTYTANK == 1) && global_emergency_counter >= 600 )
+		if( (global_temp >= 90 || PWRFAIL == 1 || FIREDET == 0 || FEEDING ==1 ) && global_emergency_counter >= 600 )
 		{
 			send_update();
 			global_emergency_counter = 0;
 		}
+		
 	// Every X sec. a status sms is send.
-		if(global_time_counter >= 3600)
+		if(global_time_counter >= global_time_interval)
 		{
 			send_update();
 			global_time_counter = 0;
@@ -385,8 +525,8 @@
 		{
 			global_Pot_Hi = ADRESH;
 			global_Pot_Lo = ADRESL;
-			convertTemp();
-			//update_lcd();
+			convert_temp();
+			update_lcd();
 			GODONE = 1;
 		}
 	// Handels the recieve sms'es.