--- trunk/Embedded/main.c	2007/12/06 14:12:36	177
+++ 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
@@ -33,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;
@@ -183,7 +181,7 @@
 
 	sprintf(global_serial_send,"%s", "at+cpin?\r");
 	serial_send();
-	DelayMs(100);		// To give the modem a chance to answer.
+	DelayMs(100);		// Delay to give the modem a chance to answer.
 	
 	if (strstr(global_message_buffer1, "+CPIN: SIM PIN") != 0)
 	{
@@ -217,7 +215,28 @@
 	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)
 {
@@ -319,7 +338,7 @@
 	sprintf(global_serial_send, "%s%c", payload, 0x1A);
 	serial_send();
 	DelayMs(150);
-	if(global_sms_counter % 3 == 0)
+	if(global_sms_counter % 4 == 0)
 	{
 		eeprom_writer();
 		sprintf(global_serial_send, "at+cmgd=1,3\r");
@@ -328,7 +347,7 @@
 	}
 }	
 
-void convertTemp()
+void convert_temp()
 {
 	short adVal;
 	adVal = (global_Pot_Hi << 8) | global_Pot_Lo;
@@ -373,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)
 {
@@ -525,7 +525,7 @@
 		{
 			global_Pot_Hi = ADRESH;
 			global_Pot_Lo = ADRESL;
-			convertTemp();
+			convert_temp();
 			update_lcd();
 			GODONE = 1;
 		}