Cleanup

simondlevy · Nov 20, 2024 · de1e979 · de1e979
1 parent 1c6a3a4
commit de1e979
Show file tree

Hide file tree

Showing 19 changed files with 10 additions and 271 deletions.
diff --git a/media/sim.odp b/media/sim.odp
diff --git a/media/sim.png b/media/sim.png
diff --git a/newsim/.gitignore b/newsim/.gitignore
diff --git a/newsim/Makefile b/newsim/Makefile
diff --git a/newsim/main.cpp b/newsim/main.cpp
diff --git a/webots/README.md b/webots/README.md
@@ -2,7 +2,7 @@
 <img src="../media/webots2.png" width=450>
 </p>
 
-# Hackflight simulator instructions
+## Hackflight simulator instructions
 
 1. [Install Webots](https://cyberbotics.com/doc/guide/installation-procedure#installation-on-linux)
 on your computer.  
@@ -16,7 +16,9 @@ on your computer.
 3. From the hackflight main directory, do the following:
 
 ```
-cd webots/controllers/cplusplus
+cd webots/plugins/physics/standard
+make
+cd ../../../controllers/standard
 make
 make run
 ```
@@ -32,3 +34,8 @@ are currently supported:
 * [FrSky XSR-SIM USB Dongle](https://www.amazon.com/gp/product/B07GD6ZLW7)
 * [Spektrum Ws2000 Wireless USB RC Flight Simulator Dongle](https://www.amazon.com/gp/product/B07ZK1R32H)
 * Nyko 83069 Playstation(R)3 Core Wired Controller
+
+## Design principles
+
+
+<img src="../media/simp.png" width=450>
diff --git a/webots/controllers/cplusplus/.gitignore b/webots/controllers/cplusplus/.gitignore
diff --git a/webots/controllers/cplusplus/Makefile b/webots/controllers/cplusplus/Makefile
diff --git a/webots/controllers/cplusplus/main.cpp b/webots/controllers/cplusplus/main.cpp
diff --git a/webots/controllers/cplusplus/plot.py b/webots/controllers/cplusplus/plot.py
diff --git a/webots/controllers/snn/.gitignore → webots/controllers/oldsnn/.gitignore b/webots/controllers/snn/.gitignore → webots/controllers/oldsnn/.gitignore
diff --git a/webots/controllers/snn/Makefile → webots/controllers/oldsnn/Makefile b/webots/controllers/snn/Makefile → webots/controllers/oldsnn/Makefile
@@ -35,7 +35,7 @@ LIBRARIES = $(FDIR)/lib/libframework.a \
 		    $(PDIR)/lib/libproc1.a \
 		    $(PDIR)/lib/libproc2.a
 
-NAME = snn
+NAME = oldsnn
 
 CXX_SOURCES = main.cpp
 

diff --git a/webots/controllers/snn/main.cpp → webots/controllers/oldsnn/main.cpp b/webots/controllers/snn/main.cpp → webots/controllers/oldsnn/main.cpp
diff --git a/...rollers/snn/networks/difference3_risp.txt → ...lers/oldsnn/networks/difference3_risp.txt b/...rollers/snn/networks/difference3_risp.txt → ...lers/oldsnn/networks/difference3_risp.txt
diff --git a/...rs/snn/networks/difference_risp_train.txt → ...oldsnn/networks/difference_risp_train.txt b/...rs/snn/networks/difference_risp_train.txt → ...oldsnn/networks/difference_risp_train.txt
diff --git a/...ts/controllers/snn/networks/dydt_risp.txt → ...controllers/oldsnn/networks/dydt_risp.txt b/...ts/controllers/snn/networks/dydt_risp.txt → ...controllers/oldsnn/networks/dydt_risp.txt
diff --git a/webots/controllers/oldsnn/oldsnn b/webots/controllers/oldsnn/oldsnn
diff --git a/webots/controllers/cplusplus/cplusplus.h → webots/controllers/oldsnn/oldsnn.h b/webots/controllers/cplusplus/cplusplus.h → webots/controllers/oldsnn/oldsnn.h
diff --git a/webots/controllers/snn/snn.h b/webots/controllers/snn/snn.h