--- trunk/Embedded/main.c	2007/12/05 15:20:07	162
+++ trunk/Embedded/main.c	2007/12/06 14:19:51	178
@@ -8,8 +8,6 @@
 #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
@@ -20,10 +18,12 @@
 unsigned char global_Pot_Hi, global_Pot_Lo;
 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;
@@ -31,7 +31,7 @@
 
 unsigned char global_lcd_buf[16];
 
-unsigned short global_imei_tversum;
+unsigned int global_imei_tversum;
 
 unsigned char global_cell_nr[15] = ""; // = "21681784";
 bit global_modem_init = 0;
@@ -42,6 +42,7 @@
 __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);
@@ -50,7 +51,8 @@
 void on_recieve(void);
 void on_initial_recieve(void);
 void sms_recieved(void);
-void send_sms(unsigned char* payload);
+void send_sms(const unsigned char* payload);
+void eeprom_writer(void);
 
 
 void reset_recieve_buffer(void)
@@ -65,7 +67,7 @@
 	memset(global_message_buffer1, 0, BUFFER);
 	memset(global_message_buffer2, 0, BUFFER);
 }	
-
+//////////  INITS  //////////
 void pic18_io_init(void)
 {
 	TRISA0	= 1;	// analog input
@@ -97,6 +99,10 @@
 	PCFG2=1;
 	PCFG3=1;
 	
+	//Reset the A/D result registers
+	ADRESH = 0;
+	ADRESL = 0;
+	
 	//Result is right justified
 	ADFM=1; 
 	
@@ -104,17 +110,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)
 {
@@ -127,6 +123,8 @@
 	TMR1IE	= 1;	// Enables timer 1
 }	
 
+
+
 void timer_init(void)
 {
 	TMR1CS = 1; //use external clock
@@ -140,19 +138,30 @@
 	T1OSCEN = 1; //enable oscillator circuit	
 	RD16 = 0; //normal 8 bit writes
 	TMR1ON = 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 sms_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)
 	{
@@ -164,30 +173,71 @@
 				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");
+	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)
 	{
-		on_initial_recieve();
+		sprintf(global_serial_send,"%s", "at+cpin=8043\r");
+		serial_send();
+		
+		while(global_modem_init == 0)
+		{
+			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) ;
 }
 
+void serial_send(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(150);
+	global_serial_send[0] = 0;
+	DelayMs(150);
+}
+
+void on_initial_recieve(void)
+{
+	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.
@@ -204,28 +254,7 @@
 	}
 }		
 
-
-void serial_send(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);
-	global_serial_send[0] = 0;
-	DelayMs(250);
-}	
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// 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.
+//////////  INTERRUPT TRIGGED //////////
 void serial_recieved(void) 
 {
 	char data_byte;
@@ -241,7 +270,12 @@
 
 	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_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 
@@ -273,14 +307,18 @@
 	global_emergency_counter++;
 	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, "Temp: %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;
+	}
 
 }
 	
@@ -293,17 +331,23 @@
 	global_sms_counter++;
 }	
 
-void send_sms(unsigned char* payload)
+void send_sms(const unsigned char* payload)
 {
 	sprintf(global_serial_send, "at+cmgs=\"%s\"\r", global_cell_nr);
 	serial_send();
 	sprintf(global_serial_send, "%s%c", payload, 0x1A);
 	serial_send();
-	DelayMs(250);
-	
+	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;
@@ -348,25 +392,6 @@
 	global_cell_nr[i] = 0; //zero terminated!
 }	
 
-void on_initial_recieve(void)
-{
-	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();
-	}
-}
 
 void on_recieve(void)
 {
@@ -437,7 +462,12 @@
 
 }
 
-
+void Delay(int time)
+{
+	int wanted = (global_time_counter + time) % global_time_interval;
+	
+	while (global_time_counter < wanted) ;
+}
 
 void main()
 {
@@ -451,10 +481,11 @@
 	rs232_init();
 	ad_init();
 	lcd_init(0);
+	lcd_clear();
+	lcd_home();
 	interrupt_init();
-	sms_init();
-	//eeprom_init();
 	timer_init();
+	sms_init();
 	eeprom_reader();
 ///////////////
 // Main loop //
@@ -467,13 +498,14 @@
 	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;
@@ -493,9 +525,8 @@
 		{
 			global_Pot_Hi = ADRESH;
 			global_Pot_Lo = ADRESL;
-			convertTemp();
-			if (global_time_counter % 5 == 0)
-				update_lcd();
+			convert_temp();
+			update_lcd();
 			GODONE = 1;
 		}
 	// Handels the recieve sms'es.