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

 // please modify the following two lines. mac and ip have to be unique
 // in your local area network. You can not have the same numbers in
 // two devices:
 static uint8_t mymac[6] = {0x54,0x55,0x58,0x10,0x00,0x24};
+//static uint8_t myip[4] = {192,168,0,50};
 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 locDumperPrt =1200; // listen port
 static uint16_t locCan2SerPrt =1100; // listen port for Can2Serial-data
 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 char sendbuf[SEND_BUFFER_SIZE+1];
 static uint8_t buffpoint;
 #define C2S_START_BYTE 253
 #define C2S_END_BYTE 250
+/* set to 0 for not sending timestamps on bus */
+#define SENDTIMESTAMP	1
 /*----------------------------------------------------------------------------
  * Putchar for udp
  * Implements a small buffer, sends packet over udp if buffer is full or
  * \n-char is sent.
  *---------------------------------------------------------------------------*/
 int main(void) {
 	//ethernet vars
     uint16_t plen = 0;
-    uint8_t ledi=0;
     uint8_t payloadlen=0;
 	buffpoint = 0;
 	//can vars
 	Can_Message_t txMsg;
 	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.
+	txMsg.ExtendedFlag = 1;
  	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) {
+	}
+    /* set output to gnd, reset the ethernet chip */
+    PORTC &= ~(1<<PC1);
+    /* set PC1 as output */
-//		printf(&quot;FAILED!\n&quot;);
+    DDRC |= (1&lt;&lt;DDC1);
-	}
-	else {
+    delay_ms(20);
+    /* set PC1 as input, resetpin pulled high */
-//		printf(&quot;OK!\n&quot;);
+    DDRC &= ~(1&lt;&lt;DDC1);
-	}
+    delay_ms(100);
-    /* 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
-    /* enable PB1, LED as output */
-    DDRD|= (1<<DDD6);
-    /* set output to Vcc, LED off */
-    PORTD|= (1<<PD6);
-	//printf("Init enc\n");
     /*initialize enc28j60*/
     enc28j60Init(mymac);
     delay_ms(20);
     /* Magjack leds configuration, see enc28j60 datasheet, page 11 */
     // LEDB=yellow LEDA=green
     //
     // 0x476 is PHLCON LEDA=links status, LEDB=receive/transmit
     enc28j60PhyWrite(PHLCON,0x476);
     delay_ms(20);
-    /* set output to GND, red LED on */
-    PORTD &= ~(1<<PD6);
-    ledi=1;
     //init the ethernet/ip layer:
     init_ip_arp_udp_tcp(mymac,myip,80);
 	/* main loop */
 	while (1) {
 		/* service the CAN routines */
 		Can_Service();
+#if SENDTIMESTAMP == 1
 		/* send CAN message and check for CAN errors once every second */
-		if (Timebase_PassedTimeMillis(timeStamp) >= 2000) {
+		if (Timebase_PassedTimeMillis(timeStamp) >= 1000) {
 			timeStamp = Timebase_CurrentTime();
-			/* send txMsg */
+			/* send timestamp, to keep network alive */
-			//txMsg.Id++;
+			txMsg.Id = 0;
-			//txMsg.Id = 3;
+			txMsg.DataLength = 0;
-			//Can_Send(&txMsg);
+			Can_Send(&txMsg);
+		}
+#endif
 		/* check if any messages have been received */
 		while (Can_Receive(&rxMsg) == CAN_OK) {
 			uint8_t i;
-			if (gotdumpserver != 0) {
+			/*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("data={ ");
 	    		for (i=0; i<rxMsg.DataLength; i++) {
 	    			printf("%x ", rxMsg.Data.bytes[i]);
 	    		}
 		   		printf("}\n");
-			}
+			}*/
 	   		if (gotcan2serserver != 0) {
 				//skicka ocks� som udppaket till rmCan2SerPrt
 				char sendbuf2[17];
+		}
 		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
 								for (i = 0; i < cm.DataLength; i++) {
 									cm.Data.bytes[i] = buf[UDP_DATA_P+8+i];
+								}
 								Can_Send(&cm);
-								if (gotdumpserver != 0) {
+								/*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");
-								}
+								}*/
+							}
 						//om port 1200 (dumparporten)
-                        } else if ((buf[UDP_DST_PORT_H_P]==((locDumperPrt>>8) & 0xff)) && (buf[UDP_DST_PORT_L_P] == (locDumperPrt & 0xff))) {
+                        } /*else if ((buf[UDP_DST_PORT_H_P]==((locDumperPrt>>8) & 0xff)) && (buf[UDP_DST_PORT_L_P] == (locDumperPrt & 0xff))) {
                 	        if (gotdumpserver == 0) {
 				                while(i<6){
 					                remotemac[i]=buf[ETH_SRC_MAC +i];
 					                i++;
+						        }
 						        i=0;
 				                while(i<4){
 					                remoteip[i]=buf[IP_SRC_P +i];
 					                i++;
 						        }
 	                        	i=0;
 	                        	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 389 → 541