Merge branch 'master' of https://archives.plil.fr/amoreau/skam_projet

Speedclocker
2 parents b159f2fa 99a83ce4
Showing 9 changed files with 51 additions and 7 deletions Show diff stats
Tangible/ethernet.o
Tangible/iic.o
Tangible/serial.h
Tangible/serial.o
Tangible/socket.h
Tangible/socket.o
Tangible/tangibleInterface.c
Tangible/tangibleInterface.o
Tangible/w5100.o
 /** Definitions for serial port **/
  
+void init_printf(void); // Met le BD à 9600  
+
 void init_serial(int speed);
-void send_serial(char c);
-char get_serial(void);
-void init_printf(void);
+
+void send_serial(char c); //Envoi via UDR0
+char get_serial(void); // Recupère UDR0
+
@@ -10,11 +10,16 @@
  
 extern uint8 socket(SOCKET s, uint8 protocol, uint16 port, uint8 flag); // Opens a socket(TCP or UDP or IP_RAW mode)
 extern void close(SOCKET s); // Close socket
+
+
 extern uint8 connect(SOCKET s, uint8 * addr, uint16 port); // Establish TCP connection (Active connection)
-extern void disconnect(SOCKET s); // disconnect the connection
+extern void disconnect(SOCKET s); // Disconnect the connection
+
 extern uint8 listen(SOCKET s);	// Establish TCP connection (Passive connection)
 extern uint16 send(SOCKET s, const uint8 * buf, uint16 len); // Send data (TCP)
 extern uint16 recv(SOCKET s, uint8 * buf, uint16 len);	// Receive data (TCP)
+
+
 extern uint16 sendto(SOCKET s, const uint8 * buf, uint16 len, uint8 * addr, uint16 port); // Send data (UDP/IP RAW)
 extern uint16 recvfrom(SOCKET s, uint8 * buf, uint16 len, uint8 * addr, uint16  *port); // Receive data (UDP/IP RAW)
  
@@ -12,7 +12,43 @@
  
 int main(void)
 {
-init_printf();
-// Your code here !!
-return 0;
+  uint8_t mac[MAC_SIZE] = {0xAD,0xBD,0xCD,0xDD,0xED,0xFD};
+  uint8_t ip[IPV4_SIZE] = {172,26,145,205};
+  uint8_t gateway[4] = {172,26,145,35};
+  uint8_t mask[4] = {255,255,255,0};
+
+  const char * answer = "I'm ok";
+  
+  char buf[16]; // Message à stocker.
+  uint8_t addr[IPV4_SIZE]; // Adresse source du message reçu.
+  uint16_t port; // Port source du message reçu.
+  
+  SOCKET sUDP;
+  SOCKET sTCP;
+
+  init_printf(); // On active la liaison série (9600 BD).
+  ethernet_init(mac,ip,gateway,mask); // On assimile une adresse MAC et IP au shield + Indication de la passerelle et du masque de sous-réseau.
+  if (!socket(sUDP,Sn_MR_UDP,2020,0))
+    {
+      return -1;
+    }
+    if (!socket(sTCP,Sn_MR_TCP,2020,0))
+    {
+      return -1;
+    }
+  while(1)
+    {
+      if(listen(sTCP)) //Repondre je vais bien à un client
+	{
+	  send(sTCP,(uint8 *)answer,sizeof(answer));
+	}
+      
+      if (recvfrom(sUDP,buf,sizeof(buf),addr,&port) != -1) //Reception via UDP (infos de la sonde)
+	{
+	  
+	}
+    }
+  close(sTCP);
+  close(sUDP);
+  return 0;
 }