WebSVN – HomeAutomation – Diff – /trunk/EmbeddedSoftware/AVR/standalone/CanSimpleEthernet/main.c.bak

 static uint8_t myip[4] = {193,11,254,22};
 static uint16_t rmDumperPrt =1200; // remote port for dumping data
 static uint16_t rmCan2SerPrt =1100; // remote port for Can2Serial-data
 static uint16_t locDumperPrt =1200; // listen port
 static uint16_t locCan2SerPrt =1100; // listen port for Can2Serial-data
-static uint8_t gotserver = 0;
+static uint8_t gotdumpserver = 0;
+static uint8_t gotcan2serserver = 0;
 // how did I get the mac addr? Translate the first 3 numbers into ascii is: TUX
 static uint8_t remotemac[6];
 static uint8_t remoteip[4];
+static uint8_t prgremotemac[6];
+static uint8_t prgremoteip[4];
 #define BUFFER_SIZE 250
 static uint8_t buf[BUFFER_SIZE+1];
 #define SEND_BUFFER_SIZE 20
  * Implements a small buffer, sends packet over udp if buffer is full or
  * \n-char is sent.
  * Needs a timeout to force send.
  *--------------------------------------------------------------------------*/
 int udp_putchar(char c, FILE* stream) {
-	if (gotserver != 0) {
+	if (gotdumpserver != 0) {
         sendbuf[buffpoint] = c;
         buffpoint++;
         if (c == '\n' || buffpoint > SEND_BUFFER_SIZE) {
         	send_udp(buf, sendbuf, buffpoint, rmDumperPrt, remotemac, remoteip);
         	buffpoint = 0;
         }
 	}
 	return 0;
+}
 static FILE mystdout = FDEV_SETUP_STREAM(udp_putchar, NULL, _FDEV_SETUP_WRITE);
 /*-----------------------------------------------------------------------------
  * Main Program
  *---------------------------------------------------------------------------*/
 int main(void) {
 	//ethernet vars
     uint16_t plen = 0;
     uint8_t ledi=0;
     uint8_t payloadlen=0;
 	buffpoint = 0;
 	Can_Message_t rxMsg;
 	txMsg.Id = 3;
 	txMsg.DataLength = 0;
 	txMsg.RemoteFlag = 0;
 	txMsg.ExtendedFlag = 1; //DataLength and the databytes are just what happens to be in the memory. They are never set.
  	uint32_t timeStamp = 0;
 	Mcu_Init();
 	Timebase_Init();
 	//Serial_Init();
     //alla printf ska skriva till udp
     stdout = &mystdout;    //set the output stream
 	sei();
 //	printf("CanInit...");
 	if (Can_Init() != CAN_OK) {
 //		printf("FAILED!\n");
 	}
 	else {
 //		printf("OK!\n");
+	}
     /* enable PB0, reset as output */
     DDRB|= (1<<DDB0);
     /* set output to gnd, reset the ethernet chip */
     PORTB &= ~(1<<PB0);
     delay_ms(20);
     /* set output to Vcc, reset inactive */
     PORTB|= (1<<PB0);
     delay_ms(100);
     // LED
+		}
 		/* check if any messages have been received */
 		while (Can_Receive(&rxMsg) == CAN_OK) {
 			uint8_t i;
+			if (gotdumpserver != 0) {
-			printf("MSG Received: ID=%lx, DLC=%u, EXT=%u, RTR=%u, ", rxMsg.Id, (uint16_t)(rxMsg.DataLength), (uint16_t)(rxMsg.ExtendedFlag), (uint16_t)(rxMsg.RemoteFlag));
+				printf("MSG Received: ID=%lx, DLC=%u, EXT=%u, RTR=%u, ", rxMsg.Id, (uint16_t)(rxMsg.DataLength), (uint16_t)(rxMsg.ExtendedFlag), (uint16_t)(rxMsg.RemoteFlag));
-    		printf("data={ ");
+	    		printf("data={ ");
-    		for (i=0; i<rxMsg.DataLength; i++) {
+	    		for (i=0; i<rxMsg.DataLength; i++) {
-    			printf("%x ", rxMsg.Data.bytes[i]);
+	    			printf("%x ", rxMsg.Data.bytes[i]);
+	    		}
-	   		printf("}\n");
+		   		printf("}\n");
+			}
+	   		if (gotcan2serserver != 0) {
-			//skicka också som udppaket till rmCan2SerPrt
+				//skicka ocks� som udppaket till rmCan2SerPrt
-			char sendbuf2[17];
+				char sendbuf2[17];
-			sendbuf2[0] = C2S_START_BYTE;
+				sendbuf2[0] = C2S_START_BYTE;
-			sendbuf2[1] = (uint8_t)rxMsg.Id;
+				sendbuf2[1] = (uint8_t)rxMsg.Id;
-			sendbuf2[2] = (uint8_t)(rxMsg.Id>>8);
+				sendbuf2[2] = (uint8_t)(rxMsg.Id>>8);
-			sendbuf2[3] = (uint8_t)(rxMsg.Id>>16);
+				sendbuf2[3] = (uint8_t)(rxMsg.Id>>16);
-			sendbuf2[4] = (uint8_t)(rxMsg.Id>>24);
+				sendbuf2[4] = (uint8_t)(rxMsg.Id>>24);
-			sendbuf2[5] = rxMsg.ExtendedFlag;
+				sendbuf2[5] = rxMsg.ExtendedFlag;
-			sendbuf2[6] = rxMsg.RemoteFlag;
+				sendbuf2[6] = rxMsg.RemoteFlag;
-			sendbuf2[7] = rxMsg.DataLength;
+				sendbuf2[7] = rxMsg.DataLength;
-    		for (uint8_t i=0; i<8; i++) {
+	    		for (i=0; i<8; i++) {
-    			sendbuf2[8+i] = rxMsg.Data.bytes[i];
+	    			sendbuf2[8+i] = rxMsg.Data.bytes[i];
+	    		}
-			sendbuf2[16] = C2S_END_BYTE;
+				sendbuf2[16] = C2S_END_BYTE;
-			send_udp(buf, sendbuf2, 17, rmCan2SerPrt, remotemac, remoteip);
+				send_udp(buf, sendbuf2, 18, rmCan2SerPrt, prgremotemac, prgremoteip);
+	   		}
+		}
 		//test-debug-kod
 		if ((enc28j60Read(EIR) & EIR_TXERIF)) {
 			//printf("EIR_TXERIF set!\n");
 			if ((enc28j60Read(ECON1) & ECON1_TXRTS)) {
 				//printf("ECON1_TXRTS set!\n");
+			}
 		}
 		if ((enc28j60Read(EIR) & EIR_TXIF)) {
 			//printf("EIR_TXIF set! ");
 		}
 		if ((enc28j60Read(ESTAT) & ESTAT_TXABRT)) {
 			//printf("ESTAT_TXABRT set!\n");
 			//printf("MACLCON1: %i\n", enc28j60Read(MACLCON1));
 			enc28j60WriteOp(ENC28J60_BIT_FIELD_CLR, ESTAT, ESTAT_TXABRT);
+		}
         // get the next new packet:
         plen = enc28j60PacketReceive(BUFFER_SIZE, buf);
         /*plen will ne unequal to zero if there is a valid
          * packet (without crc error) */
 	        if(eth_type_is_arp_and_my_ip(buf,plen)){
 	                make_arp_answer_from_request(buf);
 	        } else {
 			    // check if ip packets (icmp or udp) are for us:
 			    if(eth_type_is_ip_and_my_ip(buf,plen)!=0){
 			        if(buf[IP_PROTO_P]==IP_PROTO_ICMP_V && buf[ICMP_TYPE_P]==ICMP_TYPE_ECHOREQUEST_V){
 			                // a ping packet, let's send pong
 			                make_echo_reply_from_request(buf,plen);
 			                //txMsg.Id = 6;
 			                //Can_Send(&txMsg);
+			        }
 	                if (buf[IP_PROTO_P]==IP_PROTO_UDP_V){
                         payloadlen=buf[UDP_LEN_L_P]-UDP_HEADER_LEN;
+						uint8_t i = 0;
-                        //printf("hej %x %x\n", buf[UDP_DST_PORT_H_P], buf[UDP_DST_PORT_L_P]);
+                        //om port 1100 (programmeringsporten)
                         if ((buf[UDP_DST_PORT_H_P]==((locCan2SerPrt>>8) & 0xff)) && (buf[UDP_DST_PORT_L_P] == (locCan2SerPrt & 0xff))) {
+			                while(i<6){
-							if (payloadlen==17) {	//ifsats ska in i ovan eller nedan ifsats kanske? nedan
+				                prgremotemac[i]=buf[ETH_SRC_MAC +i];
+				                i++;
+					        }
+					        i=0;
+			                while(i<4){
+				                prgremoteip[i]=buf[IP_SRC_P +i];
+				                i++;
+					        }
+					        gotcan2serserver = 1;
-								if (buf[UDP_DATA_P]==C2S_START_BYTE && buf[UDP_DATA_P+16]==C2S_END_BYTE) {
+							if ((buf[UDP_DATA_P]==C2S_START_BYTE) && (buf[UDP_DATA_P+16]==C2S_END_BYTE) && (payloadlen==17)) {
-									Can_Message_t cm;
+								Can_Message_t cm;
-									//cm.Id = 0;
+								//cm.Id = 0;
-									cm.DataLength = buf[UDP_DATA_P+7];
+								cm.DataLength = buf[UDP_DATA_P+7];
-									cm.RemoteFlag = buf[UDP_DATA_P+6];
+								cm.RemoteFlag = buf[UDP_DATA_P+6];
-									cm.ExtendedFlag = buf[UDP_DATA_P+5];
+								cm.ExtendedFlag = buf[UDP_DATA_P+5];
-									cm.Id = (uint32_t)buf[UDP_DATA_P+1] + ((uint32_t)buf[UDP_DATA_P+2] << 8) + ((uint32_t)buf[UDP_DATA_P+3] << 16) + ((uint32_t)buf[UDP_DATA_P+4] << 24);
+								cm.Id = (uint32_t)buf[UDP_DATA_P+1] + ((uint32_t)buf[UDP_DATA_P+2] << 8) + ((uint32_t)buf[UDP_DATA_P+3] << 16) + ((uint32_t)buf[UDP_DATA_P+4] << 24);
-									uint8_t i;
+								uint8_t i;
-									for (i = 0; i < cm.DataLength; i++) {
+								for (i = 0; i < cm.DataLength; i++) {
-										cm.Data.bytes[i] = buf[UDP_DATA_P+8+i];
+									cm.Data.bytes[i] = buf[UDP_DATA_P+8+i];
+								}
-									Can_Send(&cm);
+								Can_Send(&cm);
+								if (gotdumpserver != 0) {
+									printf("MSG Received: ID=%lx, DLC=%u, EXT=%u, RTR=%u, ", cm.Id, (uint16_t)(cm.DataLength), (uint16_t)(cm.ExtendedFlag), (uint16_t)(cm.RemoteFlag));
+									printf("data={ ");
+									for (i=0; i<cm.DataLength; i++) {
+										printf("%x ", cm.Data.bytes[i]);
+									}
+	   								printf("}\n");
+								}
-								printf("hoj\n");
 							}
-                        } else if (buf[UDP_DATA_P]=='t' && payloadlen==5){
+						//om port 1200 (dumparporten)
-                	        uint8_t i=0;
+                        } else if ((buf[UDP_DST_PORT_H_P]==((locDumperPrt>>8) & 0xff)) && (buf[UDP_DST_PORT_L_P] == (locDumperPrt &; 0xff))) {
-                	        if (gotserver == 0) {
+                	        if (gotdumpserver == 0) {
 				                while(i<6){
 					                remotemac[i]=buf[ETH_SRC_MAC +i];
 					                i++;
+						        }
 						        i=0;
 					                remoteip[i]=buf[IP_SRC_P +i];
 					                i++;
+						        }
 	                        	i=0;
-	                        	gotserver = 1;
+	                        	gotdumpserver = 1;
 	                        	make_udp_reply_from_request(buf,"Got server",10,rmDumperPrt);
                 	        } else {
                 	        	make_udp_reply_from_request(buf,"Already got server",18,rmDumperPrt);
+                	        }
+                        }

Subversion Repositories HomeAutomation

(root)/trunk/EmbeddedSoftware/AVR/standalone/CanSimpleEthernet/main.c.bak @ 1663 – Rev 281 → 379