Changeset 11679 for firmware

Timestamp:

07/28/11 09:14:47 (13 years ago)

Author:

weitzel

Message:

 

File:

• firmware/FTM/ftm_definitions.vhd (modified) (1 diff)

firmware/FTM/ftm_definitions.vhd

@@ -177 +177 @@
 
   -- network settings Zuerich, for backup/test FTM
-  constant MAC_ADDRESS : mac_type := (X"FAC7", X"0FAD", X"1101");
-  constant NETMASK     : ip_type  := (255, 255, 248, 0);
-  constant IP_ADDRESS  : ip_type  := (192, 33, 99, 246);  --registered as ftmboard1.ethz.ch
-  constant GATEWAY     : ip_type  := (192, 33, 96, 1);
+  -- constant MAC_ADDRESS : mac_type := (X"FAC7", X"0FAD", X"1101");
+  -- constant NETMASK     : ip_type  := (255, 255, 248, 0);
+  -- constant IP_ADDRESS  : ip_type  := (192, 33, 99, 246);  --registered as ftmboard1.ethz.ch
+  -- constant GATEWAY     : ip_type  := (192, 33, 96, 1);
+  -- constant FIRST_PORT  : integer  := 5000;
+
+  -- network settings La Palma (internal subnet), for FTM in camera
+  constant MAC_ADDRESS : mac_type := (X"FAC7", X"1FAD", X"1102");
+  constant NETMASK     : ip_type  := (255, 255, 255, 0);
+  constant IP_ADDRESS  : ip_type  := (10, 0, 100, 140);
+  constant GATEWAY     : ip_type  := (10, 0, 100, 1);
   constant FIRST_PORT  : integer  := 5000;
-
-  -- network settings La Palma (internal subnet), for FTM in camera
-  -- constant MAC_ADDRESS : mac_type := (X"FAC7", X"1FAD", X"1102");
-  -- constant NETMASK     : ip_type  := (255, 255, 255, 0);
-  -- constant IP_ADDRESS  : ip_type  := (10, 0, 100, 140);
-  -- constant GATEWAY     : ip_type  := (10, 0, 100, 1);
-  -- constant FIRST_PORT  : integer  := 5000;
   
   -- W5300 settings