kopia lustrzana https://github.com/cyoung/stratux
Merge branch 'master' into ahrs_dev_protocolfun
commit
04e6d6af36
|
@ -40,11 +40,10 @@ cp image/rc.local work/bin/
|
|||
cp image/dhcpd.conf work/bin/
|
||||
cp image/interfaces work/bin/
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
cp test-data/ahrs/ahrs_table.log work/bin/
|
||||
cp ahrs_approx work/bin/
|
||||
|
||||
=======
|
||||
>>>>>>> master
|
||||
|
||||
#TODO: librtlsdr.
|
||||
cd work/
|
||||
|
|
|
@ -70,14 +70,11 @@ chmod 755 /usr/bin/fancontrol
|
|||
|
||||
cp -f dump1090 /usr/bin/
|
||||
|
||||
<<<<<<< HEAD
|
||||
# AHRS approx data.
|
||||
cp -f ahrs_table.log /root/
|
||||
cp -f ahrs_approx /usr/bin/
|
||||
chmod 755 /usr/bin/ahrs_approx
|
||||
|
||||
=======
|
||||
>>>>>>> master
|
||||
# DHCPD Config.
|
||||
cp -f dhcpd.conf /etc/dhcp/dhcpd.conf
|
||||
|
||||
|
|
Ładowanie…
Reference in New Issue