Merge branch 'master' of ssh://git.recherche.enac.fr/interne-ihm-aero/eye-tracking/argaze

1 files changed, 30 insertions, 24 deletions

diff --git a/src/argaze/TobiiGlassesPro2/README.md b/src/argaze/TobiiGlassesPro2/README.md
index 4d8e9a2..45f9924 100644
--- a/src/argaze/TobiiGlassesPro2/README.md
+++ b/src/argaze/TobiiGlassesPro2/README.md
@@ -9,16 +9,40 @@ Print **A4_calibration_target.pdf** onto A4 paper sheet to get calibration targe
 
 ## Local network configuration
 
-If the tobii Glasses aren't connected to a router, here is how to configure a local DHCP server to enable device connection.
+If the tobii Glasses aren't connected to a router, here is how to configure a local DHCP server to enable IPv4 device connection.
+
+### Linux (Ubuntu)
+
+* Setup static eth0 interface
+
+**/etc/network/interfaces**
+
+```
+auto eth0
+iface eth0 inet static
+  address 192.168.1.1
+  netmask 255.255.255.0
+  network 192.168.1.0
+  gateway 192.168.1.254
+```
 
 * Install DHCP server: 
+
 ```
-brew install isc-dhcp
+sudo apt-get install isc-dhcp
 ```
 
 * Setup DHCP server:
 
-**/usr/local/etc/dhcpd.conf**
+**/etc/default/isc-dhcp-server**
+
+```
+# On what interfaces should the DHCP server (dhcpd) serve DHCP requests?
+INTERFACESv4="eth0"
+INTERFACESv6=""
+```
+
+**/etc/dhcp/dhcpd.conf**
 
 ```
 # NECESSARY TO BE A DHCP SERVER
@@ -36,7 +60,7 @@ option domain-name-servers 192.168.1.1;
 option domain-name "robotron.lan";
 
 # DHCP STATIC IP ASSIGNMENTS FILE
-include "/usr/local/etc/master.conf";
+include "/etc/dhcp/master.conf";
 
 # SUBNET FOR IP ADDRESSES MANUALLY/STATICALLY ASSIGNED ONLY
 subnet 192.168.1.0 netmask 255.255.255.0 {
@@ -46,7 +70,7 @@ subnet 192.168.1.0 netmask 255.255.255.0 {
 }
 ```
 
-**/usr/local/etc/master.conf**
+**/etc/dhcp/master.conf**
 
 ```
 # Static IP assignments 
@@ -55,26 +79,8 @@ host tobiiglasses { hardware ethernet 74:fe:48:34:7c:92; fixed-address 192.168.1
 ```
 Replace 74:fe:48:34:7c:92 by the correct MAC address.
 
-* Setup USB LAN Interface:
-```
-ip: 192.168.1.1
-subnet: 255.255.255.0
-router: 192.168.1.254
-```
-
 * Monitor DHCP server activity:
-```
-sudo log stream --info --debug --predicate "process == 'dhcpd'"
-```
-
-* On Mac: Launch Tobii glasses interface to enable USB LAN Interface before to launch DHCP server.
-
-* Launch DHCP server: 
-```
-sudo /usr/local/sbin/dhcpd
-```
 
-* Kill DHCP server: 
 ```
-sudo kill `cat /usr/local/var/dhcpd/dhcpd.pid`
+journalctl | grep -Ei 'dhcp'
 ```