--- trunk/PIC/Demo trimmet/TFTPcDemo.c	2007/05/16 15:46:08	93
+++ trunk/PIC/Demo trimmet/TFTPcDemo.c	2007/05/27 16:32:30	105
@@ -2,7 +2,6 @@
 
 #include "stacktsk.h"
 #include "dhcp.h"
-#include "xlcd.h"
 #include "tick.h"
 #include "delay.h"
 #include "udp.h"
@@ -10,15 +9,19 @@
 #include "arptsk.h"
 #include "tcp.h"
 
+#include <string.h>
+
+bit bIsDhcpUp = 0;
+char netlevel = 0;
 
 // All TFTP command statuts display will be done on first line of LCD.
-#define TFTP_COMMAND_DISPLAY_LINE       0
+//#define TFTP_COMMAND_DISPLAY_LINE       0
 
 // Result will be displayed at y = 15.
 #define TFTP_COMMAND_RESULT_POSITION    15
 
 
-#define STARTUP_MSG "G1_Build_0x00"
+/*#define STARTUP_MSG "G1_Build_0x00"
 
 ROM char StartupMsg[] = STARTUP_MSG;
 
@@ -29,8 +32,8 @@
 ROM char SetupMsg[] = "Board Setup...";
 
 //                         1234567890123456
-ROM char blankLCDLine[] = "                ";
-
+//ROM char blankLCDLine[] = "                ";
+*/
 /*
  * This is used by other stack elements.
  * Main application must define this and initialize it with
@@ -66,71 +69,401 @@
  */
 static void InitAppConfig(void);
 static void InitializeBoard(void);
-static void DisplayIPValue(IP_ADDR *IPVal, BOOL bToLCD);
 static void SetConfig(void);
 
-/*void network_send_hello( unsigned char termid )
-{
-	   if (DHCPIsBound())
-        {
-        	RA3 =0;
-        	if (sock_open == 0)
-        	{
-	        	if (ARPIsTxReady())
-	        	{
-		        	if (is_resolved == 0)
-		        	{
-			        	ARPResolve( &rnode.IPAddr);
-			        	is_resolved = 1;
-			        }
-			        else
-			        {
-		        		if (ARPIsResolved( &rnode.IPAddr, &rnode.MACAddr))
-		        		//if (MyArp( &rnode))
-		        		{
-	        				usock1=UDPOpen(2000,&rnode,3000); // socket to send UDP
-	        				sock_open=1;
-	        			}
-	        		}	
-	        	}
-	        }
-	        
-        	if (UDPIsPutReady(usock1) && datagrams_to_send>0)
-        	{
-	        	UDPPut( rnode.MACAddr.v[0] );
-	       		UDPPut( rnode.MACAddr.v[1] );
-	       		UDPPut( rnode.MACAddr.v[2] );
-	       		UDPPut( rnode.MACAddr.v[3] );
-	       		UDPPut( rnode.MACAddr.v[4] );
-	       		UDPPut( rnode.MACAddr.v[5] );
-	        	UDPPut('D');
-	        	UDPPut('a');
-	        	UDPPut('w');
-	        	UDPPut(0);
-	        	UDPFlush();
-	        	datagrams_to_send--;
-	        }
+/*****************************
+ Enummerations 
+ ****************************/
+typedef enum _NetworkState
+{
+	off,
+	DhcpIsBound,
+	ArpIsTxReady,
+	ArpIsResolved,
+	SockOpening,
+	SockOpen,
+	TcpReadyToSend,
+	TcpSend,
+	HelloDone,
+	StregkodeSendDone,
+	ReadyToRecieve,
+	StregkodeRecieveDone,
+	TotalRequested,
+	TotalRequestedDone,
+	ChangeRequested,
+	ChangeRequestedDone,
+	Acknowledged,
+	CancelDone,
+	SockClosing,
+	SockClosed
+} NetworkState;
+ 
+/*****************************
+ GLOBAL INIT
+ ****************************/
+NODE_INFO rnode;
+NetworkState state;
+TCP_SOCKET tsock1;
+
+ 
+/*****************************
+ network funktions
+ ****************************/
+unsigned long global_network_amount;
+unsigned char global_network_char[16];
+unsigned char global_network_charlen;
+
+
+void network_init(void)
+{
+	state = off;
+}	
+
+
+void network_worker(void)
+{    
+	TickGet();
+    StackTask();    
+}	
+
+void network_parse_amount(unsigned char buf[])
+{
+	global_network_amount = buf[0]<<24 + buf[1]<<16 + buf[2]<<8 + buf[3];
+}	
+
+void network_read_amount(void)
+{
+	unsigned char buf[4];
+	TCPGetArray(tsock1, buf,4);
+	network_parse_amount(buf);
+}	
+
+void network_wait(unsigned char n)
+{
+	int i;
+	for (i=0; i<n; i++)
+	{
+		network_worker();
+		Delay10us(1);
+	}
+}	
+
+char network_read_ack(void)
+{
+	char ack;
+	while(state != Acknowledged)
+	{
+		if (TCPIsGetReady(tsock1))
+		{
+			TCPGet(tsock1, &ack);
+			TCPDiscard(tsock1);
+			state = Acknowledged;
 		}
-}
-*/
+		network_worker();
+	}
+	
+	state = TcpReadyToSend;
+	
+	if (ack == 1)
+		return 0;
+	else
+		return 4;
+}	
+
+//Request ID 0
+char network_send_hello( unsigned char termid )
+{
+	char gotArp = 0;		// if gotArp is 0, the embedded haven't talked to the server since boot.
+	static char isBound = 0;
+
+	while( !DHCPIsBound() && isBound == 0 )
+		network_worker();
+
+	if ( DHCPIsBound() && isBound == 0 ){
+		state = DhcpIsBound;
+		isBound = 1;
+	}
+	
+	while( state != HelloDone )
+	{
+		switch (state)
+		{
+			case DhcpIsBound:
+				if ( ARPIsTxReady() && gotArp == 0 )
+					state = ArpIsTxReady;
+				else 
+					state = ArpIsResolved;
+				break;
+			
+			case ArpIsTxReady:
+				ARPResolve(&rnode.IPAddr);
+				gotArp = 1;
+				state = ArpIsResolved;
+				break;
+						
+			case ArpIsResolved:
+				if ( ARPIsResolved(&rnode.IPAddr, &rnode.MACAddr) ){
+					state = SockOpening;
+				}
+				break;
+			
+			case SockOpening:
+				tsock1 = TCPConnect (&rnode, 3000);
+				state = SockOpen;
+				break;
+		
+			case SockOpen:
+				if ( TCPIsConnected(tsock1) && TCPIsPutReady(tsock1) )
+					state = TcpSend;
+				break;
+			
+			case TcpSend:
+				TCPPut( tsock1, 0x00 );
+				TCPPut( tsock1, termid );
+				TCPFlush(tsock1);
+				//TCPDiscard( tsock1 );
+				state = HelloDone;
+				break;
+		}
+		network_worker();
+	}
+	return network_read_ack();
+}
+
+//Request ID 1
+char network_send_scan_frame( unsigned char antal, unsigned char buflen )
+{
+	char i;
+	char ack;
+
+	while( state != StregkodeSendDone ) //Sender vare-request-info pakke
+	{
+		switch (state)
+		{
+			case TcpReadyToSend:
+				if ( TCPIsConnected(tsock1) && TCPIsPutReady(tsock1) )
+				state = TcpSend;
+			case TcpSend:
+				TCPPut( tsock1, 0x01 );
+				TCPPut( tsock1, antal );
+				TCPPut( tsock1, buflen );
+				for (i = 0; i < buflen; i++)
+				{ 
+					TCPPut(tsock1, global_network_char[i] );
+				}
+				TCPFlush(tsock1);
+				state = StregkodeSendDone;
+				break;
+		}
+		network_worker();
+	}
+	
+	while( state != StregkodeRecieveDone ) //venter på svar og parser denne
+	{
+		switch( state )
+		{
+			case StregkodeSendDone:
+				if( TCPIsGetReady(tsock1) )
+					state = ReadyToRecieve;
+				break;
+			case ReadyToRecieve:
+				TCPGet( tsock1, &ack );
+				
+				if (ack == 0)
+				{
+					state = TcpReadyToSend;
+					TCPDiscard(tsock1);
+					return 4;
+				}
+				
+				network_read_amount();
+				TCPGet( tsock1, &global_network_charlen);
+				TCPGetArray( tsock1, global_network_char, global_network_charlen);
+				TCPDiscard(tsock1);
+				
+				state = StregkodeRecieveDone;				
+					
+				break;
+		}
+		network_worker();
+	}
+	state = TcpReadyToSend;
+	return 0;
+}
+
+//Request ID 2
+char network_send_calc_total(void)
+{
+	unsigned char ack;
+	while(state != TotalRequested)
+	{
+		switch(state)
+		{
+			case TcpReadyToSend: 
+				if ( TCPIsConnected(tsock1) && TCPIsPutReady(tsock1) )
+					state = TcpSend;
+				break;
+				
+			case TcpSend:
+				TCPPut(tsock1, 0x02);
+				TCPFlush(tsock1);
+				state = TotalRequested;
+				break;
+		}
+		network_worker();
+	}
+	
+	while (state != TotalRequestedDone)
+	{
+		if (TCPIsGetReady(tsock1))
+		{
+			TCPGet(tsock1, &ack);
+			if (ack == 0)
+			{
+				TCPDiscard(tsock1);
+				state = TcpReadyToSend;
+				return 4;
+			}
+			network_read_amount();
+			TCPDiscard(tsock1);
+			state = TotalRequestedDone;
+		}
+		network_worker();
+	}
+	
+	state = TcpReadyToSend;
+	return 0;
+}	
+
+//Request ID 3
+char network_send_cash_payed(unsigned long amount)
+{
+	unsigned char ack;
+	while (state != ChangeRequested)
+	{
+		switch(state)
+		{
+			case TcpReadyToSend: 
+				if ( TCPIsConnected(tsock1) && TCPIsPutReady(tsock1) )
+					state = TcpSend;
+				break;
+			case TcpSend:
+				TCPPut(tsock1, 0x03);
+				TCPPut(tsock1, amount>>24);
+				TCPPut(tsock1, amount>>16);
+				TCPPut(tsock1, amount>>8);
+				TCPPut(tsock1, amount);
+				TCPFlush(tsock1);
+				state = ChangeRequested;	
+				break;
+		}
+		network_worker();
+	}
+	
+	while (state != ChangeRequestedDone)
+	{
+		if (TCPIsGetReady(tsock1))
+		{
+			TCPGet(tsock1, &ack);
+			if (ack == 0)
+			{
+				TCPFlush(tsock1);
+				state = TcpReadyToSend;
+				return 4;
+			}
+			network_read_amount(); 
+			TCPFlush(tsock1);
+			state = ChangeRequestedDone;
+			
+		}
+		network_worker();
+	}
+	state = TcpReadyToSend;
+	return 0;
+}
+
+//request 4+5
+char network_send_cancel_generic(char id)
+{
+	while(state != CancelDone)
+	{
+		switch (state)
+		{
+			case TcpReadyToSend: 
+				if ( TCPIsConnected(tsock1) && TCPIsPutReady(tsock1) )
+					state = TcpSend;
+				break;
+			case TcpSend:
+				TCPPut(tsock1, id);
+				TCPFlush(tsock1);
+				state = CancelDone;
 
-void WriteTcpStatus(char status)
-{
-	XLCDGoto(0,0);
-	status += 'a';
-	XLCDPut(status);
+		}
+		network_worker();
+	}
+	return network_read_ack();
+}	
+
+//Request ID 4
+char network_send_cancel_last(void)
+{
+	return network_send_cancel_generic(0x04);	
+}
+
+//Request ID 5
+char network_send_cancel_all(void)
+{
+	return network_send_cancel_generic(0x05);
+}	
+
+//Request ID 6
+char network_send_goodbye(void)
+{
+	char ack;
+	while( state != SockClosed)
+	{
+		switch (state)
+		{
+			case TcpReadyToSend: 
+				if ( TCPIsConnected(tsock1) && TCPIsPutReady(tsock1) )
+					state = TcpSend;
+				break;
+				
+			case TcpSend:
+				TCPPut( tsock1, 0x06 );
+				TCPFlush( tsock1 );
+				state = SockClosing;
+				break;
+			
+			case SockClosing:
+				ack = network_read_ack();
+				TCPDisconnect( tsock1 );
+				state = SockClosed;
+				break;
+		}
+		network_worker();
+	}
+	if( TCPIsConnected(tsock1))
+		return 3;				// Didn't close the socket properly;
+	else
+		return ack;
 	
-}
+}	
+void network_wait_for_dhcp()
+{
+	while (!DHCPIsBound())
+		network_worker();
+}	
 
 void main(void)
 {
     // Tick to blink SYSTEM led.
     static TICK t = 0;
     TCP_SOCKET usock1;
-    NODE_INFO rnode;
     char sock_state = 0;
     char is_resolved = 0;
     char has_arp = 0;
+
         
     TICK tick;
     TICK lastTick;
@@ -154,24 +487,9 @@
     InitAppConfig();
 
     StackInit();
+    
+    network_init();
 
-#if defined(STACK_USE_DHCP) || defined(STACK_USE_IP_GLEANING)
-    if ( AppConfig.Flags.bIsDHCPEnabled )
-    {
-        XLCDGoto(1, 0);
-        XLCDPutROMString(DHCPMsg);
-    }
-    else
-    {
-        /*
-         * Force IP address display update.
-         */
-        myDHCPBindCount = 1;
-#if defined(STACK_USE_DHCP)
-        DHCPDisable();
-#endif
-    }
-#endif
 
 
     /*
@@ -193,18 +511,11 @@
 	rnode.IPAddr.v[1] = 168;
 	rnode.IPAddr.v[2] = 1;
 	rnode.IPAddr.v[3] = 20;
-	/*rnode.MACAddr.v[0] = 0x00;
-	rnode.MACAddr.v[1] = 0x16;
-	rnode.MACAddr.v[2] = 0x76;
-	rnode.MACAddr.v[3] = 0x9F;
-	rnode.MACAddr.v[4] = 0xFE;
-	rnode.MACAddr.v[5] = 0xDA;*/
-	
-         
 
-    
     while(1)
     {
+	    unsigned char antal = 8;
+	    unsigned char stregkode[] = "12345678";
         /*
          * Blink SYSTEM LED every second.
          */
@@ -226,96 +537,30 @@
          * configuration since last reset.
          */
          
-        if ( DHCPBindCount != myDHCPBindCount )
-        {
-            DisplayIPValue(&AppConfig.MyIPAddr, TRUE);
-            myDHCPBindCount = DHCPBindCount;
-
-            if ( AppConfig.Flags.bIsDHCPEnabled )
-            {
-                XLCDGoto(1, 14);
-                if ( myDHCPBindCount < 0x0a )
-                    XLCDPut(myDHCPBindCount + '0');
-                else
-                    XLCDPut(myDHCPBindCount + 'A');
-            }
-        }
-        
-        WriteTcpStatus( TCB[usock1].smState );
-        
-        if (DHCPIsBound())
-        {
-        	RA3 =0;
-        	if (has_arp == 0)
-        	{
-	        	if (ARPIsTxReady())
-	        	{
-		        	if (is_resolved == 0)
-		        	{
-			        	ARPResolve( &rnode.IPAddr);
-			        	is_resolved = 1;
-			        }
-			        else
-			        {
-		        		if (ARPIsResolved( &rnode.IPAddr, &rnode.MACAddr))
-		        		{
-							has_arp = 1;
-	        			}
-	        		}
-	
-	        	}
-	        }
-	        
-	        if (has_arp == 1)
-	        {
-	        	if (sock_state == 0)
-	        	{
-	    	    	usock1=TCPConnect(&rnode,3000);
-		        	sock_state = 1;
-		        }
-	        	if (sock_state ==1 && TCPIsConnected(usock1) && TCPIsPutReady(usock1))
-        		{
-		        	TCPPut(usock1,'D');
-		        	TCPPut(usock1,'a');
-	        		TCPPut(usock1,'w');
-	        		TCPPut(usock1,0);
-	    	    	TCPFlush(usock1);
-		        	sock_state = 2;
-		        }
-	        
-	        	if (sock_state == 2 && TCPIsPutReady(usock1))
-	    	    {
-			        TCPDisconnect(usock1);
-			        lastTick = TickGet();
-			        sock_state =3;
-		    	}
-		    	tick = TickGet();
-		    	diffTicks = TickGetDiff(tick, lastTick);
-		    	
-		    	if ( sock_state == 3 && diffTicks > ((TICK)TICK_SECOND * (TICK)2) )
-		    		sock_state = 0;
-		    		
-		    }
-        } 
+         
+	   	    network_send_hello( 0x01 );
+	   	    
+	   	    strncpy(global_network_char, "12345678", 8);
+			network_send_scan_frame( 1, 8 ); //1x vare, stregkodelængde=8
+			
+			strncpy(global_network_char, "87654444", 8);
+			network_send_scan_frame( 1, 8 ); //1x vare, stregkodelængde=8
+			
+			network_send_calc_total();
+			
+			network_send_cash_payed(50000);
+			
+			network_send_cancel_last();
+			
+			network_send_cancel_all();
+						
+			network_send_goodbye();
     }
 }
 
-#if defined(MCHP_C18)
-    #pragma interrupt HighISR save=section(".tmpdata")
-    void HighISR(void)
-#elif defined(HITECH_C18)
-    #if defined(STACK_USE_SLIP)
-        extern void MACISR(void);
-    #endif
-    void interrupt HighISR(void)
-#endif
+void interrupt HighISR(void)
 {
     TickUpdate();
-/*
-#if defined(STACK_USE_SLIP)
-    MACISR();
-#endif
-*/
 }
 
 #if defined(MCHP_C18)
@@ -327,51 +572,6 @@
 #pragma code /* return to default code section */
 #endif
 
-static void DisplayIPValue(IP_ADDR *IPVal, BOOL bToLCD)
-{
-    char IPDigit[8];
-
-    if ( bToLCD )
-    {
-        /*
-         * Erase second line.
-         */
-        XLCDGoto(1, 0);
-        XLCDPutROMString(blankLCDLine);
-
-    }
-
-    /*
-     * Rewrite the second line.
-     */
-    XLCDGoto(1, 0);
-
-    itoa(IPVal->v[0], IPDigit);
-    if ( bToLCD )
-    {
-        XLCDPutString(IPDigit);
-        XLCDPut('.');
-    }
-
-    itoa(IPVal->v[1], IPDigit);
-    if ( bToLCD )
-    {
-        XLCDPutString(IPDigit);
-        XLCDPut('.');
-    }
-
-    itoa(IPVal->v[2], IPDigit);
-    if ( bToLCD )
-    {
-        XLCDPutString(IPDigit);
-        XLCDPut('.');
-    }
-
-    itoa(IPVal->v[3], IPDigit);
-    if ( bToLCD )
-        XLCDPutString(IPDigit);
-}
-
 /*********************************************************************
  * Function:        void InitializeBoard(void)
  *
@@ -399,7 +599,7 @@
     /*
      * LCD is enabled using RA5.
      */
-    PORTA_RA5 = 0;          // Disable LCD.
+//    PORTA_RA5 = 0;          // Disable LCD.
 
     /*
      * Turn off the LED's.
@@ -413,10 +613,6 @@
      */
     INTCON2_RBPU = 0;
 
-    XLCDInit();
-    XLCDGoto(0, 0);
-    XLCDPutROMString(StartupMsg);
-
     T0CON = 0;
     INTCON_GIEH = 1;
     INTCON_GIEL = 1;
@@ -500,21 +696,3 @@
     return (byteIndex == 3);
 }
 
-
-void XLCDDelay15ms(void)
-{
-    DelayMs(15);
-}
-void XLCDDelay4ms(void)
-{
-    DelayMs(4);
-}
-
-void XLCDDelay100us(void)
-{
-    INTCON_GIEH = 0;
-    Delay10us(1);
-    INTCON_GIEH = 1;
-}
-
-