--- trunk/Embedded/main.c	2007/12/05 16:11:12	167
+++ trunk/Embedded/main.c	2007/12/06 13:36:07	175
@@ -20,11 +20,11 @@
 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 char global_temp_update_display = 0;
+unsigned int global_temp_update_display = 0;
 
 unsigned char global_message_buffer1[BUFFER];
 unsigned char global_message_buffer2[BUFFER];
@@ -44,6 +44,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);
@@ -53,6 +54,7 @@
 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)
@@ -67,7 +69,7 @@
 	memset(global_message_buffer1, 0, BUFFER);
 	memset(global_message_buffer2, 0, BUFFER);
 }	
-
+//////////  INITS  //////////
 void pic18_io_init(void)
 {
 	TRISA0	= 1;	// analog input
@@ -99,6 +101,10 @@
 	PCFG2=1;
 	PCFG3=1;
 	
+	//Reset the A/D result registers
+	ADRESH = 0;
+	ADRESL = 0;
+	
 	//Result is right justified
 	ADFM=1; 
 	
@@ -106,17 +112,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)
 {
@@ -129,6 +125,8 @@
 	TMR1IE	= 1;	// Enables timer 1
 }	
 
+
+
 void timer_init(void)
 {
 	TMR1CS = 1; //use external clock
@@ -142,19 +140,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)
 	{
@@ -166,47 +175,32 @@
 				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);		// 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 interrupt interrupt_handler(void)
-{
-	// Finds out what interrupt have been trigged, and starts the respective function.
-	if(RCIF == 1)			// Serial recieve interrupt
-	{
-		serial_recieved();
-		RCIF = 0;
-	}
-	
-	if(TMR1IF == 1)			// timer1 interrupt trigger.
-	{
-		timer1_interrupt();
-		TMR1IF = 0;
-	}
-}		
-
-
 void serial_send(void)
 {
 	int i;
@@ -224,10 +218,24 @@
 	global_serial_send[0] = 0;
 	DelayMs(150);
 }	
+//////////  INTERRUPT HANDLER  //////////
+void interrupt interrupt_handler(void)
+{
+	// Finds out what interrupt have been trigged, and starts the respective function.
+	if(RCIF == 1)			// Serial recieve interrupt
+	{
+		serial_recieved();
+		RCIF = 0;
+	}
+	
+	if(TMR1IF == 1)			// timer1 interrupt trigger.
+	{
+		timer1_interrupt();
+		TMR1IF = 0;
+	}
+}		
 
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// 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;
@@ -280,7 +288,7 @@
 	global_emergency_counter++;
 	RA1 = !RA1;
 }
-
+//////////  ORDENARY FUNKTIONS  //////////
 void update_lcd(void)
 {
 	if(global_temp_update_display != global_time_counter)
@@ -311,7 +319,13 @@
 	sprintf(global_serial_send, "%s%c", payload, 0x1A);
 	serial_send();
 	DelayMs(150);
-	
+	if(global_sms_counter % 3 == 0)
+	{
+		eeprom_writer();
+		sprintf(global_serial_send, "at+cmgd=1,3\r");
+		serial_send();
+		while ( strstr(global_message_buffer1,"OK") == 0) ;
+	}
 }	
 
 void convertTemp()
@@ -448,7 +462,12 @@
 
 }
 
-
+void Delay(int time)
+{
+	int wanted = (global_time_counter + time) % global_time_interval;
+	
+	while (global_time_counter < wanted) ;
+}
 
 void main()
 {
@@ -462,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 //
@@ -478,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;