diff --git a/.gitmodules b/.gitmodules index d8f92a4..9d3198f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,27 +1,27 @@ [submodule "controller/fw/libopencm3"] - path = controller/fw/libopencm3 + path = reset-controller/fw/libopencm3 url = https://github.com/libopencm3/libopencm3 [submodule "controller/fw/mspdebug"] - path = controller/fw/mspdebug + path = reset-controller/fw/mspdebug url = https://github.com/dlbeer/mspdebug [submodule "controller/fw/cmsis"] - path = controller/fw/cmsis + path = reset-controller/fw/cmsis url = https://git.jaseg.net/bigdata/pub/safety-reset-cmsis.git [submodule "controller/fw/libsodium"] - path = controller/fw/libsodium + path = reset-controller/fw/libsodium url = git@git.jaseg.net:bigdata/pub/libsodium-safety-reset.git [submodule "controller/fw/tinyaes"] - path = controller/fw/tinyaes + path = reset-controller/fw/tinyaes url = https://github.com/kokke/tiny-AES-c [submodule "controller/fw/musl"] - path = controller/fw/musl + path = reset-controller/fw/musl url = git://git.musl-libc.org/musl [submodule "controller/fw/crypto-algorithms"] - path = controller/fw/crypto-algorithms + path = reset-controller/fw/crypto-algorithms url = https://github.com/B-Con/crypto-algorithms [submodule "controller/fw/tinyprintf"] - path = controller/fw/tinyprintf + path = reset-controller/fw/tinyprintf url = https://github.com/cjlano/tinyprintf [submodule "controller/fw/reed_solomon"] - path = controller/fw/reed_solomon + path = reset-controller/fw/reed_solomon url = git@git.jaseg.net:bigdata/pub/reed_solomon_c.git diff --git a/decoder_prototype.grc b/data/decoder_prototype.grc similarity index 100% rename from decoder_prototype.grc rename to data/decoder_prototype.grc diff --git a/decoder_prototype10.grc b/data/decoder_prototype10.grc similarity index 100% rename from decoder_prototype10.grc rename to data/decoder_prototype10.grc diff --git a/decoder_prototype10_am_ber_working.grc b/data/decoder_prototype10_am_ber_working.grc similarity index 100% rename from decoder_prototype10_am_ber_working.grc rename to data/decoder_prototype10_am_ber_working.grc diff --git a/decoder_prototype11.grc b/data/decoder_prototype11.grc similarity index 100% rename from decoder_prototype11.grc rename to data/decoder_prototype11.grc diff --git a/decoder_prototype12_snr_calc.grc b/data/decoder_prototype12_snr_calc.grc similarity index 100% rename from decoder_prototype12_snr_calc.grc rename to data/decoder_prototype12_snr_calc.grc diff --git a/decoder_prototype2.grc b/data/decoder_prototype2.grc similarity index 100% rename from decoder_prototype2.grc rename to data/decoder_prototype2.grc diff --git a/decoder_prototype3.grc b/data/decoder_prototype3.grc similarity index 100% rename from decoder_prototype3.grc rename to data/decoder_prototype3.grc diff --git a/decoder_prototype3_1mhz_20s_working.grc b/data/decoder_prototype3_1mhz_20s_working.grc similarity index 100% rename from decoder_prototype3_1mhz_20s_working.grc rename to data/decoder_prototype3_1mhz_20s_working.grc diff --git a/decoder_prototype4.grc b/data/decoder_prototype4.grc similarity index 100% rename from decoder_prototype4.grc rename to data/decoder_prototype4.grc diff --git a/decoder_prototype4_5s_2mHz.grc b/data/decoder_prototype4_5s_2mHz.grc similarity index 100% rename from decoder_prototype4_5s_2mHz.grc rename to data/decoder_prototype4_5s_2mHz.grc diff --git a/decoder_prototype5.grc b/data/decoder_prototype5.grc similarity index 100% rename from decoder_prototype5.grc rename to data/decoder_prototype5.grc diff --git a/decoder_prototype5_ber_working.grc b/data/decoder_prototype5_ber_working.grc similarity index 100% rename from decoder_prototype5_ber_working.grc rename to data/decoder_prototype5_ber_working.grc diff --git a/decoder_prototype6.grc b/data/decoder_prototype6.grc similarity index 100% rename from decoder_prototype6.grc rename to data/decoder_prototype6.grc diff --git a/decoder_prototype7.grc b/data/decoder_prototype7.grc similarity index 100% rename from decoder_prototype7.grc rename to data/decoder_prototype7.grc diff --git a/decoder_prototype7_preamble_tagging.grc b/data/decoder_prototype7_preamble_tagging.grc similarity index 100% rename from decoder_prototype7_preamble_tagging.grc rename to data/decoder_prototype7_preamble_tagging.grc diff --git a/decoder_prototype8.grc b/data/decoder_prototype8.grc similarity index 100% rename from decoder_prototype8.grc rename to data/decoder_prototype8.grc diff --git a/decoder_prototype8_ber_working.grc b/data/decoder_prototype8_ber_working.grc similarity index 100% rename from decoder_prototype8_ber_working.grc rename to data/decoder_prototype8_ber_working.grc diff --git a/decoder_prototype9.grc b/data/decoder_prototype9.grc similarity index 100% rename from decoder_prototype9.grc rename to data/decoder_prototype9.grc diff --git a/decoder_prototype9_am_dc_ber.grc b/data/decoder_prototype9_am_dc_ber.grc similarity index 100% rename from decoder_prototype9_am_dc_ber.grc rename to data/decoder_prototype9_am_dc_ber.grc diff --git a/decoder_prototype_working.grc b/data/decoder_prototype_working.grc similarity index 100% rename from decoder_prototype_working.grc rename to data/decoder_prototype_working.grc diff --git a/gnuradio-safety-reset-01-flowgraph.png b/data/gnuradio-safety-reset-01-flowgraph.png similarity index 100% rename from gnuradio-safety-reset-01-flowgraph.png rename to data/gnuradio-safety-reset-01-flowgraph.png diff --git a/gnuradio-safety-reset-02-flowgraph.png b/data/gnuradio-safety-reset-02-flowgraph.png similarity index 100% rename from gnuradio-safety-reset-02-flowgraph.png rename to data/gnuradio-safety-reset-02-flowgraph.png diff --git a/gnuradio-safety-reset-02-waveforms.png b/data/gnuradio-safety-reset-02-waveforms.png similarity index 100% rename from gnuradio-safety-reset-02-waveforms.png rename to data/gnuradio-safety-reset-02-waveforms.png diff --git a/gr_sweep_results.json b/data/gr_sweep_results.json similarity index 100% rename from gr_sweep_results.json rename to data/gr_sweep_results.json diff --git a/gr_sweep_results2.json b/data/gr_sweep_results2.json similarity index 100% rename from gr_sweep_results2.json rename to data/gr_sweep_results2.json diff --git a/results_digitalocean.json b/data/results_digitalocean.json similarity index 100% rename from results_digitalocean.json rename to data/results_digitalocean.json diff --git a/results_digitalocean2.json b/data/results_digitalocean2.json similarity index 100% rename from results_digitalocean2.json rename to data/results_digitalocean2.json diff --git a/results_digitalocean_undercommitted.json b/data/results_digitalocean_undercommitted.json similarity index 100% rename from results_digitalocean_undercommitted.json rename to data/results_digitalocean_undercommitted.json diff --git a/results_digitalocean_undercommitted2.json b/data/results_digitalocean_undercommitted2.json similarity index 100% rename from results_digitalocean_undercommitted2.json rename to data/results_digitalocean_undercommitted2.json diff --git a/gm_platform/fw/.gitignore b/hardware/fw/.gitignore similarity index 100% rename from gm_platform/fw/.gitignore rename to hardware/fw/.gitignore diff --git a/gm_platform/fw/Makefile b/hardware/fw/Makefile similarity index 100% rename from gm_platform/fw/Makefile rename to hardware/fw/Makefile diff --git a/gm_platform/fw/Scope.ipynb b/hardware/fw/Scope.ipynb similarity index 100% rename from gm_platform/fw/Scope.ipynb rename to hardware/fw/Scope.ipynb diff --git a/gm_platform/fw/adc.c b/hardware/fw/adc.c similarity index 100% rename from gm_platform/fw/adc.c rename to hardware/fw/adc.c diff --git a/gm_platform/fw/adc.h b/hardware/fw/adc.h similarity index 100% rename from gm_platform/fw/adc.h rename to hardware/fw/adc.h diff --git a/gm_platform/fw/base.c b/hardware/fw/base.c similarity index 100% rename from gm_platform/fw/base.c rename to hardware/fw/base.c diff --git a/gm_platform/fw/cmsis_exports.c b/hardware/fw/cmsis_exports.c similarity index 100% rename from gm_platform/fw/cmsis_exports.c rename to hardware/fw/cmsis_exports.c diff --git a/gm_platform/fw/cobs.c b/hardware/fw/cobs.c similarity index 100% rename from gm_platform/fw/cobs.c rename to hardware/fw/cobs.c diff --git a/gm_platform/fw/cobs.h b/hardware/fw/cobs.h similarity index 100% rename from gm_platform/fw/cobs.h rename to hardware/fw/cobs.h diff --git a/gm_platform/fw/crctest.py b/hardware/fw/crctest.py similarity index 100% rename from gm_platform/fw/crctest.py rename to hardware/fw/crctest.py diff --git a/gm_platform/fw/global.h b/hardware/fw/global.h similarity index 100% rename from gm_platform/fw/global.h rename to hardware/fw/global.h diff --git a/gm_platform/fw/grid_scope.ipynb b/hardware/fw/grid_scope.ipynb similarity index 100% rename from gm_platform/fw/grid_scope.ipynb rename to hardware/fw/grid_scope.ipynb diff --git a/gm_platform/fw/main.c b/hardware/fw/main.c similarity index 100% rename from gm_platform/fw/main.c rename to hardware/fw/main.c diff --git a/gm_platform/fw/main.c.bak b/hardware/fw/main.c.bak similarity index 100% rename from gm_platform/fw/main.c.bak rename to hardware/fw/main.c.bak diff --git a/gm_platform/fw/openocd.cfg b/hardware/fw/openocd.cfg similarity index 100% rename from gm_platform/fw/openocd.cfg rename to hardware/fw/openocd.cfg diff --git a/gm_platform/fw/packet_interface.c b/hardware/fw/packet_interface.c similarity index 100% rename from gm_platform/fw/packet_interface.c rename to hardware/fw/packet_interface.c diff --git a/gm_platform/fw/packet_interface.h b/hardware/fw/packet_interface.h similarity index 100% rename from gm_platform/fw/packet_interface.h rename to hardware/fw/packet_interface.h diff --git a/gm_platform/fw/reader.py b/hardware/fw/reader.py similarity index 100% rename from gm_platform/fw/reader.py rename to hardware/fw/reader.py diff --git a/gm_platform/fw/scope.gdb b/hardware/fw/scope.gdb similarity index 100% rename from gm_platform/fw/scope.gdb rename to hardware/fw/scope.gdb diff --git a/gm_platform/fw/serial.c b/hardware/fw/serial.c similarity index 100% rename from gm_platform/fw/serial.c rename to hardware/fw/serial.c diff --git a/gm_platform/fw/serial.h b/hardware/fw/serial.h similarity index 100% rename from gm_platform/fw/serial.h rename to hardware/fw/serial.h diff --git a/gm_platform/fw/startup_stm32f030x6.s b/hardware/fw/startup_stm32f030x6.s similarity index 100% rename from gm_platform/fw/startup_stm32f030x6.s rename to hardware/fw/startup_stm32f030x6.s diff --git a/gm_platform/fw/stm32_flash.ld b/hardware/fw/stm32_flash.ld similarity index 100% rename from gm_platform/fw/stm32_flash.ld rename to hardware/fw/stm32_flash.ld diff --git a/gm_platform/fw/system_stm32f0xx.c b/hardware/fw/system_stm32f0xx.c similarity index 100% rename from gm_platform/fw/system_stm32f0xx.c rename to hardware/fw/system_stm32f0xx.c diff --git a/gm_platform/fw/test.py b/hardware/fw/test.py similarity index 100% rename from gm_platform/fw/test.py rename to hardware/fw/test.py diff --git a/gm_platform/fw/tools/gen_cmsis_exports.py b/hardware/fw/tools/gen_cmsis_exports.py similarity index 100% rename from gm_platform/fw/tools/gen_cmsis_exports.py rename to hardware/fw/tools/gen_cmsis_exports.py diff --git a/gm_platform/fw/tw_test.c b/hardware/fw/tw_test.c similarity index 100% rename from gm_platform/fw/tw_test.c rename to hardware/fw/tw_test.c diff --git a/gm_platform/fw/tw_test.py b/hardware/fw/tw_test.py similarity index 100% rename from gm_platform/fw/tw_test.py rename to hardware/fw/tw_test.py diff --git a/gm_platform/platform/board_shape.dxf b/hardware/grid-recorder/board_shape.dxf similarity index 100% rename from gm_platform/platform/board_shape.dxf rename to hardware/grid-recorder/board_shape.dxf diff --git a/gm_platform/platform/board_shape.slvs b/hardware/grid-recorder/board_shape.slvs similarity index 100% rename from gm_platform/platform/board_shape.slvs rename to hardware/grid-recorder/board_shape.slvs diff --git a/gm_platform/platform/bottom_overlay.png b/hardware/grid-recorder/bottom_overlay.png similarity index 100% rename from gm_platform/platform/bottom_overlay.png rename to hardware/grid-recorder/bottom_overlay.png diff --git a/gm_platform/platform/case_label.pdf b/hardware/grid-recorder/case_label.pdf similarity index 100% rename from gm_platform/platform/case_label.pdf rename to hardware/grid-recorder/case_label.pdf diff --git a/gm_platform/platform/case_label.svg b/hardware/grid-recorder/case_label.svg similarity index 100% rename from gm_platform/platform/case_label.svg rename to hardware/grid-recorder/case_label.svg diff --git a/gm_platform/platform/case_label_print.pdf b/hardware/grid-recorder/case_label_print.pdf similarity index 100% rename from gm_platform/platform/case_label_print.pdf rename to hardware/grid-recorder/case_label_print.pdf diff --git a/gm_platform/platform/case_label_print.svg b/hardware/grid-recorder/case_label_print.svg similarity index 100% rename from gm_platform/platform/case_label_print.svg rename to hardware/grid-recorder/case_label_print.svg diff --git a/gm_platform/platform/case_side_iec_socket_helper.pdf b/hardware/grid-recorder/case_side_iec_socket_helper.pdf similarity index 100% rename from gm_platform/platform/case_side_iec_socket_helper.pdf rename to hardware/grid-recorder/case_side_iec_socket_helper.pdf diff --git a/gm_platform/platform/case_side_iec_socket_helper.svg b/hardware/grid-recorder/case_side_iec_socket_helper.svg similarity index 100% rename from gm_platform/platform/case_side_iec_socket_helper.svg rename to hardware/grid-recorder/case_side_iec_socket_helper.svg diff --git a/gm_platform/platform/case_side_usb_socket_helper.pdf b/hardware/grid-recorder/case_side_usb_socket_helper.pdf similarity index 100% rename from gm_platform/platform/case_side_usb_socket_helper.pdf rename to hardware/grid-recorder/case_side_usb_socket_helper.pdf diff --git a/gm_platform/platform/case_side_usb_socket_helper.svg b/hardware/grid-recorder/case_side_usb_socket_helper.svg similarity index 100% rename from gm_platform/platform/case_side_usb_socket_helper.svg rename to hardware/grid-recorder/case_side_usb_socket_helper.svg diff --git a/gm_platform/platform/components.dcm b/hardware/grid-recorder/components.dcm similarity index 100% rename from gm_platform/platform/components.dcm rename to hardware/grid-recorder/components.dcm diff --git a/gm_platform/platform/components.lib b/hardware/grid-recorder/components.lib similarity index 100% rename from gm_platform/platform/components.lib rename to hardware/grid-recorder/components.lib diff --git a/gm_platform/platform/converter_clip.scad b/hardware/grid-recorder/converter_clip.scad similarity index 100% rename from gm_platform/platform/converter_clip.scad rename to hardware/grid-recorder/converter_clip.scad diff --git a/gm_platform/platform/converter_clip.stl b/hardware/grid-recorder/converter_clip.stl similarity index 100% rename from gm_platform/platform/converter_clip.stl rename to hardware/grid-recorder/converter_clip.stl diff --git a/gm_platform/platform/fp-info-cache b/hardware/grid-recorder/fp-info-cache similarity index 100% rename from gm_platform/platform/fp-info-cache rename to hardware/grid-recorder/fp-info-cache diff --git a/gm_platform/platform/fp-lib-table b/hardware/grid-recorder/fp-lib-table similarity index 100% rename from gm_platform/platform/fp-lib-table rename to hardware/grid-recorder/fp-lib-table diff --git a/gm_platform/platform/gerber_grid_meas_platform_v01.zip b/hardware/grid-recorder/gerber_grid_meas_platform_v01.zip similarity index 100% rename from gm_platform/platform/gerber_grid_meas_platform_v01.zip rename to hardware/grid-recorder/gerber_grid_meas_platform_v01.zip diff --git a/gm_platform/platform/hiig_logo_binary.png b/hardware/grid-recorder/hiig_logo_binary.png similarity index 100% rename from gm_platform/platform/hiig_logo_binary.png rename to hardware/grid-recorder/hiig_logo_binary.png diff --git a/gm_platform/platform/lid_switch_plunger.scad b/hardware/grid-recorder/lid_switch_plunger.scad similarity index 100% rename from gm_platform/platform/lid_switch_plunger.scad rename to hardware/grid-recorder/lid_switch_plunger.scad diff --git a/gm_platform/platform/lid_switch_plunger.stl b/hardware/grid-recorder/lid_switch_plunger.stl similarity index 100% rename from gm_platform/platform/lid_switch_plunger.stl rename to hardware/grid-recorder/lid_switch_plunger.stl diff --git a/gm_platform/platform/lid_switch_plunger_flex.scad b/hardware/grid-recorder/lid_switch_plunger_flex.scad similarity index 100% rename from gm_platform/platform/lid_switch_plunger_flex.scad rename to hardware/grid-recorder/lid_switch_plunger_flex.scad diff --git a/gm_platform/platform/lid_switch_plunger_flex.stl b/hardware/grid-recorder/lid_switch_plunger_flex.stl similarity index 100% rename from gm_platform/platform/lid_switch_plunger_flex.stl rename to hardware/grid-recorder/lid_switch_plunger_flex.stl diff --git a/gm_platform/platform/line_meas_divider.asc b/hardware/grid-recorder/line_meas_divider.asc similarity index 100% rename from gm_platform/platform/line_meas_divider.asc rename to hardware/grid-recorder/line_meas_divider.asc diff --git a/gm_platform/platform/line_pol_det.asc b/hardware/grid-recorder/line_pol_det.asc similarity index 100% rename from gm_platform/platform/line_pol_det.asc rename to hardware/grid-recorder/line_pol_det.asc diff --git a/gm_platform/platform/platform-cache.lib b/hardware/grid-recorder/platform-cache.lib similarity index 100% rename from gm_platform/platform/platform-cache.lib rename to hardware/grid-recorder/platform-cache.lib diff --git a/gm_platform/platform/platform.csv b/hardware/grid-recorder/platform.csv similarity index 100% rename from gm_platform/platform/platform.csv rename to hardware/grid-recorder/platform.csv diff --git a/gm_platform/platform/platform.kicad_pcb b/hardware/grid-recorder/platform.kicad_pcb similarity index 100% rename from gm_platform/platform/platform.kicad_pcb rename to hardware/grid-recorder/platform.kicad_pcb diff --git a/gm_platform/platform/platform.pretty/Panasonic_AV32143AT.kicad_mod b/hardware/grid-recorder/platform.pretty/Panasonic_AV32143AT.kicad_mod similarity index 100% rename from gm_platform/platform/platform.pretty/Panasonic_AV32143AT.kicad_mod rename to hardware/grid-recorder/platform.pretty/Panasonic_AV32143AT.kicad_mod diff --git a/gm_platform/platform/platform.pro b/hardware/grid-recorder/platform.pro similarity index 100% rename from gm_platform/platform/platform.pro rename to hardware/grid-recorder/platform.pro diff --git a/gm_platform/platform/platform.sch b/hardware/grid-recorder/platform.sch similarity index 100% rename from gm_platform/platform/platform.sch rename to hardware/grid-recorder/platform.sch diff --git a/gm_platform/platform/platform.xml b/hardware/grid-recorder/platform.xml similarity index 100% rename from gm_platform/platform/platform.xml rename to hardware/grid-recorder/platform.xml diff --git a/gm_platform/platform/sym-lib-table b/hardware/grid-recorder/sym-lib-table similarity index 100% rename from gm_platform/platform/sym-lib-table rename to hardware/grid-recorder/sym-lib-table diff --git a/gm_platform/platform/top_overlay.png b/hardware/grid-recorder/top_overlay.png similarity index 100% rename from gm_platform/platform/top_overlay.png rename to hardware/grid-recorder/top_overlay.png diff --git a/gm_platform/platform/zip_tie_anchor.scad b/hardware/grid-recorder/zip_tie_anchor.scad similarity index 100% rename from gm_platform/platform/zip_tie_anchor.scad rename to hardware/grid-recorder/zip_tie_anchor.scad diff --git a/gm_platform/platform/zip_tie_anchor.stl b/hardware/grid-recorder/zip_tie_anchor.stl similarity index 100% rename from gm_platform/platform/zip_tie_anchor.stl rename to hardware/grid-recorder/zip_tie_anchor.stl diff --git a/lab-windows/cryptography_experiments.ipynb b/notebooks/cryptography_experiments.ipynb similarity index 100% rename from lab-windows/cryptography_experiments.ipynb rename to notebooks/cryptography_experiments.ipynb diff --git a/lab-windows/data/.gitignore b/notebooks/data/.gitignore similarity index 100% rename from lab-windows/data/.gitignore rename to notebooks/data/.gitignore diff --git a/lab-windows/data/dsss_experiments_res-2020-02-19 16:45:45.json b/notebooks/data/dsss_experiments_res-2020-02-19 16:45:45.json similarity index 100% rename from lab-windows/data/dsss_experiments_res-2020-02-19 16:45:45.json rename to notebooks/data/dsss_experiments_res-2020-02-19 16:45:45.json diff --git a/lab-windows/data/dsss_experiments_res-2020-02-19 16:46:32.json b/notebooks/data/dsss_experiments_res-2020-02-19 16:46:32.json similarity index 100% rename from lab-windows/data/dsss_experiments_res-2020-02-19 16:46:32.json rename to notebooks/data/dsss_experiments_res-2020-02-19 16:46:32.json diff --git a/lab-windows/data/dsss_experiments_res-2020-02-19 16:47:31.json b/notebooks/data/dsss_experiments_res-2020-02-19 16:47:31.json similarity index 100% rename from lab-windows/data/dsss_experiments_res-2020-02-19 16:47:31.json rename to notebooks/data/dsss_experiments_res-2020-02-19 16:47:31.json diff --git a/lab-windows/data/dsss_experiments_res-2020-02-19-19-30-05.json b/notebooks/data/dsss_experiments_res-2020-02-19-19-30-05.json similarity index 100% rename from lab-windows/data/dsss_experiments_res-2020-02-19-19-30-05.json rename to notebooks/data/dsss_experiments_res-2020-02-19-19-30-05.json diff --git a/lab-windows/data/dsss_experiments_res-2020-02-20-11-21-07.json b/notebooks/data/dsss_experiments_res-2020-02-20-11-21-07.json similarity index 100% rename from lab-windows/data/dsss_experiments_res-2020-02-20-11-21-07.json rename to notebooks/data/dsss_experiments_res-2020-02-20-11-21-07.json diff --git a/lab-windows/data/dsss_experiments_res-2020-02-20-11-30-03.json b/notebooks/data/dsss_experiments_res-2020-02-20-11-30-03.json similarity index 100% rename from lab-windows/data/dsss_experiments_res-2020-02-20-11-30-03.json rename to notebooks/data/dsss_experiments_res-2020-02-20-11-30-03.json diff --git a/lab-windows/data/dsss_experiments_res-2020-02-20-12-18-35.json b/notebooks/data/dsss_experiments_res-2020-02-20-12-18-35.json similarity index 100% rename from lab-windows/data/dsss_experiments_res-2020-02-20-12-18-35.json rename to notebooks/data/dsss_experiments_res-2020-02-20-12-18-35.json diff --git a/lab-windows/data/dsss_experiments_res-2020-02-20-12-26-07.json b/notebooks/data/dsss_experiments_res-2020-02-20-12-26-07.json similarity index 100% rename from lab-windows/data/dsss_experiments_res-2020-02-20-12-26-07.json rename to notebooks/data/dsss_experiments_res-2020-02-20-12-26-07.json diff --git a/lab-windows/data/dsss_experiments_res-2020-02-20-12-29-02.json b/notebooks/data/dsss_experiments_res-2020-02-20-12-29-02.json similarity index 100% rename from lab-windows/data/dsss_experiments_res-2020-02-20-12-29-02.json rename to notebooks/data/dsss_experiments_res-2020-02-20-12-29-02.json diff --git a/lab-windows/data/dsss_experiments_res-2020-02-20-13-21-57.json b/notebooks/data/dsss_experiments_res-2020-02-20-13-21-57.json similarity index 100% rename from lab-windows/data/dsss_experiments_res-2020-02-20-13-21-57.json rename to notebooks/data/dsss_experiments_res-2020-02-20-13-21-57.json diff --git a/lab-windows/data/dsss_experiments_res-2020-02-20-13-23-47.json b/notebooks/data/dsss_experiments_res-2020-02-20-13-23-47.json similarity index 100% rename from lab-windows/data/dsss_experiments_res-2020-02-20-13-23-47.json rename to notebooks/data/dsss_experiments_res-2020-02-20-13-23-47.json diff --git a/lab-windows/data/dsss_experiments_res-2020-02-20-14-10-13.json b/notebooks/data/dsss_experiments_res-2020-02-20-14-10-13.json similarity index 100% rename from lab-windows/data/dsss_experiments_res-2020-02-20-14-10-13.json rename to notebooks/data/dsss_experiments_res-2020-02-20-14-10-13.json diff --git a/lab-windows/data/dsss_experiments_res-2020-02-20-19-51-21.json b/notebooks/data/dsss_experiments_res-2020-02-20-19-51-21.json similarity index 100% rename from lab-windows/data/dsss_experiments_res-2020-02-20-19-51-21.json rename to notebooks/data/dsss_experiments_res-2020-02-20-19-51-21.json diff --git a/lab-windows/data/dsss_experiments_res-2020-02-20-20-43-32.json b/notebooks/data/dsss_experiments_res-2020-02-20-20-43-32.json similarity index 100% rename from lab-windows/data/dsss_experiments_res-2020-02-20-20-43-32.json rename to notebooks/data/dsss_experiments_res-2020-02-20-20-43-32.json diff --git a/lab-windows/data/dsss_experiments_res-2020-02-20-21-36-42.json b/notebooks/data/dsss_experiments_res-2020-02-20-21-36-42.json similarity index 100% rename from lab-windows/data/dsss_experiments_res-2020-02-20-21-36-42.json rename to notebooks/data/dsss_experiments_res-2020-02-20-21-36-42.json diff --git a/lab-windows/data/dsss_experiments_res-2020-02-21-13-43-41.json b/notebooks/data/dsss_experiments_res-2020-02-21-13-43-41.json similarity index 100% rename from lab-windows/data/dsss_experiments_res-2020-02-21-13-43-41.json rename to notebooks/data/dsss_experiments_res-2020-02-21-13-43-41.json diff --git a/lab-windows/data/dsss_experiments_res-2020-02-21-15-08-51.json b/notebooks/data/dsss_experiments_res-2020-02-21-15-08-51.json similarity index 100% rename from lab-windows/data/dsss_experiments_res-2020-02-21-15-08-51.json rename to notebooks/data/dsss_experiments_res-2020-02-21-15-08-51.json diff --git a/lab-windows/data/dsss_experiments_res-2020-02-21-15-14-00.json b/notebooks/data/dsss_experiments_res-2020-02-21-15-14-00.json similarity index 100% rename from lab-windows/data/dsss_experiments_res-2020-02-21-15-14-00.json rename to notebooks/data/dsss_experiments_res-2020-02-21-15-14-00.json diff --git a/lab-windows/data/dsss_test_demod_fixed_01.log b/notebooks/data/dsss_test_demod_fixed_01.log similarity index 100% rename from lab-windows/data/dsss_test_demod_fixed_01.log rename to notebooks/data/dsss_test_demod_fixed_01.log diff --git a/lab-windows/data/dsss_test_demod_fixed_02.log b/notebooks/data/dsss_test_demod_fixed_02.log similarity index 100% rename from lab-windows/data/dsss_test_demod_fixed_02.log rename to notebooks/data/dsss_test_demod_fixed_02.log diff --git a/lab-windows/data/dsss_test_demod_fixed_03.log b/notebooks/data/dsss_test_demod_fixed_03.log similarity index 100% rename from lab-windows/data/dsss_test_demod_fixed_03.log rename to notebooks/data/dsss_test_demod_fixed_03.log diff --git a/lab-windows/data/raw_freq.bin b/notebooks/data/raw_freq.bin similarity index 100% rename from lab-windows/data/raw_freq.bin rename to notebooks/data/raw_freq.bin diff --git a/lab-windows/data/rawlog_50hz_clean.log b/notebooks/data/rawlog_50hz_clean.log similarity index 100% rename from lab-windows/data/rawlog_50hz_clean.log rename to notebooks/data/rawlog_50hz_clean.log diff --git a/lab-windows/data/rawlog_silence_clean.log b/notebooks/data/rawlog_silence_clean.log similarity index 100% rename from lab-windows/data/rawlog_silence_clean.log rename to notebooks/data/rawlog_silence_clean.log diff --git a/lab-windows/data/rawlog_silence_clean2.log b/notebooks/data/rawlog_silence_clean2.log similarity index 100% rename from lab-windows/data/rawlog_silence_clean2.log rename to notebooks/data/rawlog_silence_clean2.log diff --git a/lab-windows/data/rawlog_test_a.log b/notebooks/data/rawlog_test_a.log similarity index 100% rename from lab-windows/data/rawlog_test_a.log rename to notebooks/data/rawlog_test_a.log diff --git a/lab-windows/data/rawlog_test_b.log b/notebooks/data/rawlog_test_b.log similarity index 100% rename from lab-windows/data/rawlog_test_b.log rename to notebooks/data/rawlog_test_b.log diff --git a/lab-windows/data/rawlog_test_c.log b/notebooks/data/rawlog_test_c.log similarity index 100% rename from lab-windows/data/rawlog_test_c.log rename to notebooks/data/rawlog_test_c.log diff --git a/lab-windows/data/rawlog_test_d.log b/notebooks/data/rawlog_test_d.log similarity index 100% rename from lab-windows/data/rawlog_test_d.log rename to notebooks/data/rawlog_test_d.log diff --git a/lab-windows/data/rawlog_test_e.log b/notebooks/data/rawlog_test_e.log similarity index 100% rename from lab-windows/data/rawlog_test_e.log rename to notebooks/data/rawlog_test_e.log diff --git a/lab-windows/dsss_experiments-ber.ipynb b/notebooks/dsss_experiments-ber.ipynb similarity index 100% rename from lab-windows/dsss_experiments-ber.ipynb rename to notebooks/dsss_experiments-ber.ipynb diff --git a/lab-windows/dsss_experiments.ipynb b/notebooks/dsss_experiments.ipynb similarity index 100% rename from lab-windows/dsss_experiments.ipynb rename to notebooks/dsss_experiments.ipynb diff --git a/lab-windows/dsss_prototype_symbol_error_rate_5-8_bit.svg b/notebooks/dsss_prototype_symbol_error_rate_5-8_bit.svg similarity index 100% rename from lab-windows/dsss_prototype_symbol_error_rate_5-8_bit.svg rename to notebooks/dsss_prototype_symbol_error_rate_5-8_bit.svg diff --git a/lab-windows/dsss_prototype_symbol_error_rate_5_6_bit.svg b/notebooks/dsss_prototype_symbol_error_rate_5_6_bit.svg similarity index 100% rename from lab-windows/dsss_prototype_symbol_error_rate_5_6_bit.svg rename to notebooks/dsss_prototype_symbol_error_rate_5_6_bit.svg diff --git a/lab-windows/dsss_test_signals/dsss_test_noiseless_2000mHz.bin b/notebooks/dsss_test_signals/dsss_test_noiseless_2000mHz.bin similarity index 100% rename from lab-windows/dsss_test_signals/dsss_test_noiseless_2000mHz.bin rename to notebooks/dsss_test_signals/dsss_test_noiseless_2000mHz.bin diff --git a/lab-windows/dsss_test_signals/dsss_test_noiseless_200mHz.bin b/notebooks/dsss_test_signals/dsss_test_noiseless_200mHz.bin similarity index 100% rename from lab-windows/dsss_test_signals/dsss_test_noiseless_200mHz.bin rename to notebooks/dsss_test_signals/dsss_test_noiseless_200mHz.bin diff --git a/lab-windows/dsss_test_signals/dsss_test_noiseless_20mHz.bin b/notebooks/dsss_test_signals/dsss_test_noiseless_20mHz.bin similarity index 100% rename from lab-windows/dsss_test_signals/dsss_test_noiseless_20mHz.bin rename to notebooks/dsss_test_signals/dsss_test_noiseless_20mHz.bin diff --git a/lab-windows/dsss_test_signals/dsss_test_noiseless_2mHz.bin b/notebooks/dsss_test_signals/dsss_test_noiseless_2mHz.bin similarity index 100% rename from lab-windows/dsss_test_signals/dsss_test_noiseless_2mHz.bin rename to notebooks/dsss_test_signals/dsss_test_noiseless_2mHz.bin diff --git a/lab-windows/fec_experiments.ipynb b/notebooks/fec_experiments.ipynb similarity index 100% rename from lab-windows/fec_experiments.ipynb rename to notebooks/fec_experiments.ipynb diff --git a/lab-windows/fig_out/chip_duration_sensitivity_5.pdf b/notebooks/fig_out/chip_duration_sensitivity_5.pdf similarity index 100% rename from lab-windows/fig_out/chip_duration_sensitivity_5.pdf rename to notebooks/fig_out/chip_duration_sensitivity_5.pdf diff --git a/lab-windows/fig_out/chip_duration_sensitivity_6.pdf b/notebooks/fig_out/chip_duration_sensitivity_6.pdf similarity index 100% rename from lab-windows/fig_out/chip_duration_sensitivity_6.pdf rename to notebooks/fig_out/chip_duration_sensitivity_6.pdf diff --git a/lab-windows/fig_out/chip_duration_sensitivity_cmp_meas_6.pdf b/notebooks/fig_out/chip_duration_sensitivity_cmp_meas_6.pdf similarity index 100% rename from lab-windows/fig_out/chip_duration_sensitivity_cmp_meas_6.pdf rename to notebooks/fig_out/chip_duration_sensitivity_cmp_meas_6.pdf diff --git a/lab-windows/fig_out/chip_duration_sensitivity_cmp_synth_6.pdf b/notebooks/fig_out/chip_duration_sensitivity_cmp_synth_6.pdf similarity index 100% rename from lab-windows/fig_out/chip_duration_sensitivity_cmp_synth_6.pdf rename to notebooks/fig_out/chip_duration_sensitivity_cmp_synth_6.pdf diff --git a/lab-windows/fig_out/dsss_gold_nbits_overview.pdf b/notebooks/fig_out/dsss_gold_nbits_overview.pdf similarity index 100% rename from lab-windows/fig_out/dsss_gold_nbits_overview.pdf rename to notebooks/fig_out/dsss_gold_nbits_overview.pdf diff --git a/lab-windows/fig_out/dsss_gold_nbits_sensitivity.pdf b/notebooks/fig_out/dsss_gold_nbits_sensitivity.pdf similarity index 100% rename from lab-windows/fig_out/dsss_gold_nbits_sensitivity.pdf rename to notebooks/fig_out/dsss_gold_nbits_sensitivity.pdf diff --git a/lab-windows/fig_out/dsss_thf_amplitude_56.pdf b/notebooks/fig_out/dsss_thf_amplitude_56.pdf similarity index 100% rename from lab-windows/fig_out/dsss_thf_amplitude_56.pdf rename to notebooks/fig_out/dsss_thf_amplitude_56.pdf diff --git a/lab-windows/fig_out/dsss_thf_amplitude_5678.pdf b/notebooks/fig_out/dsss_thf_amplitude_5678.pdf similarity index 100% rename from lab-windows/fig_out/dsss_thf_amplitude_5678.pdf rename to notebooks/fig_out/dsss_thf_amplitude_5678.pdf diff --git a/lab-windows/fig_out/dsss_thf_amplitude_56_fw_impl.pdf b/notebooks/fig_out/dsss_thf_amplitude_56_fw_impl.pdf similarity index 100% rename from lab-windows/fig_out/dsss_thf_amplitude_56_fw_impl.pdf rename to notebooks/fig_out/dsss_thf_amplitude_56_fw_impl.pdf diff --git a/lab-windows/fig_out/dsss_thf_amplitude_56_jupyter_impl.pdf b/notebooks/fig_out/dsss_thf_amplitude_56_jupyter_impl.pdf similarity index 100% rename from lab-windows/fig_out/dsss_thf_amplitude_56_jupyter_impl.pdf rename to notebooks/fig_out/dsss_thf_amplitude_56_jupyter_impl.pdf diff --git a/lab-windows/fig_out/dsss_thf_sensitivity_56.pdf b/notebooks/fig_out/dsss_thf_sensitivity_56.pdf similarity index 100% rename from lab-windows/fig_out/dsss_thf_sensitivity_56.pdf rename to notebooks/fig_out/dsss_thf_sensitivity_56.pdf diff --git a/lab-windows/fig_out/dsss_thf_sensitivity_5678.pdf b/notebooks/fig_out/dsss_thf_sensitivity_5678.pdf similarity index 100% rename from lab-windows/fig_out/dsss_thf_sensitivity_5678.pdf rename to notebooks/fig_out/dsss_thf_sensitivity_5678.pdf diff --git a/lab-windows/fig_out/dsss_thf_sensitivity_56_fw_impl.pdf b/notebooks/fig_out/dsss_thf_sensitivity_56_fw_impl.pdf similarity index 100% rename from lab-windows/fig_out/dsss_thf_sensitivity_56_fw_impl.pdf rename to notebooks/fig_out/dsss_thf_sensitivity_56_fw_impl.pdf diff --git a/lab-windows/fig_out/freq_meas_feedback.pdf b/notebooks/fig_out/freq_meas_feedback.pdf similarity index 100% rename from lab-windows/fig_out/freq_meas_feedback.pdf rename to notebooks/fig_out/freq_meas_feedback.pdf diff --git a/lab-windows/fig_out/freq_meas_rocof_reference.pdf b/notebooks/fig_out/freq_meas_rocof_reference.pdf similarity index 100% rename from lab-windows/fig_out/freq_meas_rocof_reference.pdf rename to notebooks/fig_out/freq_meas_rocof_reference.pdf diff --git a/lab-windows/fig_out/freq_meas_spectrum.pdf b/notebooks/fig_out/freq_meas_spectrum.pdf similarity index 100% rename from lab-windows/fig_out/freq_meas_spectrum.pdf rename to notebooks/fig_out/freq_meas_spectrum.pdf diff --git a/lab-windows/fig_out/freq_meas_trace_24h.pdf b/notebooks/fig_out/freq_meas_trace_24h.pdf similarity index 100% rename from lab-windows/fig_out/freq_meas_trace_24h.pdf rename to notebooks/fig_out/freq_meas_trace_24h.pdf diff --git a/lab-windows/fig_out/freq_meas_trace_2h_1.pdf b/notebooks/fig_out/freq_meas_trace_2h_1.pdf similarity index 100% rename from lab-windows/fig_out/freq_meas_trace_2h_1.pdf rename to notebooks/fig_out/freq_meas_trace_2h_1.pdf diff --git a/lab-windows/fig_out/freq_meas_trace_2h_2.pdf b/notebooks/fig_out/freq_meas_trace_2h_2.pdf similarity index 100% rename from lab-windows/fig_out/freq_meas_trace_2h_2.pdf rename to notebooks/fig_out/freq_meas_trace_2h_2.pdf diff --git a/lab-windows/fig_out/mains_voltage_spectrum-eps-converted-to.pdf b/notebooks/fig_out/mains_voltage_spectrum-eps-converted-to.pdf similarity index 100% rename from lab-windows/fig_out/mains_voltage_spectrum-eps-converted-to.pdf rename to notebooks/fig_out/mains_voltage_spectrum-eps-converted-to.pdf diff --git a/lab-windows/fig_out/mains_voltage_spectrum.pdf b/notebooks/fig_out/mains_voltage_spectrum.pdf similarity index 100% rename from lab-windows/fig_out/mains_voltage_spectrum.pdf rename to notebooks/fig_out/mains_voltage_spectrum.pdf diff --git a/lab-windows/fig_out/ocxo_freq_stability-eps-converted-to.pdf b/notebooks/fig_out/ocxo_freq_stability-eps-converted-to.pdf similarity index 100% rename from lab-windows/fig_out/ocxo_freq_stability-eps-converted-to.pdf rename to notebooks/fig_out/ocxo_freq_stability-eps-converted-to.pdf diff --git a/lab-windows/fig_out/ocxo_freq_stability.pdf b/notebooks/fig_out/ocxo_freq_stability.pdf similarity index 100% rename from lab-windows/fig_out/ocxo_freq_stability.pdf rename to notebooks/fig_out/ocxo_freq_stability.pdf diff --git a/lab-windows/fig_out/simulated_noise_spectrum.pdf b/notebooks/fig_out/simulated_noise_spectrum.pdf similarity index 100% rename from lab-windows/fig_out/simulated_noise_spectrum.pdf rename to notebooks/fig_out/simulated_noise_spectrum.pdf diff --git a/lab-windows/freq_meas_validation_rocof_testsuite.ipynb b/notebooks/freq_meas_validation_rocof_testsuite.ipynb similarity index 100% rename from lab-windows/freq_meas_validation_rocof_testsuite.ipynb rename to notebooks/freq_meas_validation_rocof_testsuite.ipynb diff --git a/lab-windows/gauss_derivations.ipynb b/notebooks/gauss_derivations.ipynb similarity index 100% rename from lab-windows/gauss_derivations.ipynb rename to notebooks/gauss_derivations.ipynb diff --git a/lab-windows/gps_clock_jitter_analysis.ipynb b/notebooks/gps_clock_jitter_analysis.ipynb similarity index 100% rename from lab-windows/gps_clock_jitter_analysis.ipynb rename to notebooks/gps_clock_jitter_analysis.ipynb diff --git a/lab-windows/grid_freq_estimation.ipynb b/notebooks/grid_freq_estimation.ipynb similarity index 100% rename from lab-windows/grid_freq_estimation.ipynb rename to notebooks/grid_freq_estimation.ipynb diff --git a/lab-windows/grid_frequency_spectra.ipynb b/notebooks/grid_frequency_spectra.ipynb similarity index 100% rename from lab-windows/grid_frequency_spectra.ipynb rename to notebooks/grid_frequency_spectra.ipynb diff --git a/lab-windows/grid_scope.ipynb b/notebooks/grid_scope.ipynb similarity index 100% rename from lab-windows/grid_scope.ipynb rename to notebooks/grid_scope.ipynb diff --git a/lab-windows/impl_test_out.json b/notebooks/impl_test_out.json similarity index 100% rename from lab-windows/impl_test_out.json rename to notebooks/impl_test_out.json diff --git a/lab-windows/rocof_test_data.py b/notebooks/rocof_test_data.py similarity index 100% rename from lab-windows/rocof_test_data.py rename to notebooks/rocof_test_data.py diff --git a/lab-windows/rocof_test_data/rocof_test_amplitude_and_phase_steps_1kHz.bin b/notebooks/rocof_test_data/rocof_test_amplitude_and_phase_steps_1kHz.bin similarity index 100% rename from lab-windows/rocof_test_data/rocof_test_amplitude_and_phase_steps_1kHz.bin rename to notebooks/rocof_test_data/rocof_test_amplitude_and_phase_steps_1kHz.bin diff --git a/lab-windows/rocof_test_data/rocof_test_amplitude_steps_1kHz.bin b/notebooks/rocof_test_data/rocof_test_amplitude_steps_1kHz.bin similarity index 100% rename from lab-windows/rocof_test_data/rocof_test_amplitude_steps_1kHz.bin rename to notebooks/rocof_test_data/rocof_test_amplitude_steps_1kHz.bin diff --git a/lab-windows/rocof_test_data/rocof_test_close_interharmonics_and_flicker_1kHz.bin b/notebooks/rocof_test_data/rocof_test_close_interharmonics_and_flicker_1kHz.bin similarity index 100% rename from lab-windows/rocof_test_data/rocof_test_close_interharmonics_and_flicker_1kHz.bin rename to notebooks/rocof_test_data/rocof_test_close_interharmonics_and_flicker_1kHz.bin diff --git a/lab-windows/rocof_test_data/rocof_test_harmonics_1kHz.bin b/notebooks/rocof_test_data/rocof_test_harmonics_1kHz.bin similarity index 100% rename from lab-windows/rocof_test_data/rocof_test_harmonics_1kHz.bin rename to notebooks/rocof_test_data/rocof_test_harmonics_1kHz.bin diff --git a/lab-windows/rocof_test_data/rocof_test_interharmonics_1kHz.bin b/notebooks/rocof_test_data/rocof_test_interharmonics_1kHz.bin similarity index 100% rename from lab-windows/rocof_test_data/rocof_test_interharmonics_1kHz.bin rename to notebooks/rocof_test_data/rocof_test_interharmonics_1kHz.bin diff --git a/lab-windows/rocof_test_data/rocof_test_noise_1kHz.bin b/notebooks/rocof_test_data/rocof_test_noise_1kHz.bin similarity index 100% rename from lab-windows/rocof_test_data/rocof_test_noise_1kHz.bin rename to notebooks/rocof_test_data/rocof_test_noise_1kHz.bin diff --git a/lab-windows/rocof_test_data/rocof_test_noise_loud_1kHz.bin b/notebooks/rocof_test_data/rocof_test_noise_loud_1kHz.bin similarity index 100% rename from lab-windows/rocof_test_data/rocof_test_noise_loud_1kHz.bin rename to notebooks/rocof_test_data/rocof_test_noise_loud_1kHz.bin diff --git a/lab-windows/rocof_test_data/rocof_test_off_frequency_1kHz.bin b/notebooks/rocof_test_data/rocof_test_off_frequency_1kHz.bin similarity index 100% rename from lab-windows/rocof_test_data/rocof_test_off_frequency_1kHz.bin rename to notebooks/rocof_test_data/rocof_test_off_frequency_1kHz.bin diff --git a/lab-windows/rocof_test_data/rocof_test_phase_steps_1kHz.bin b/notebooks/rocof_test_data/rocof_test_phase_steps_1kHz.bin similarity index 100% rename from lab-windows/rocof_test_data/rocof_test_phase_steps_1kHz.bin rename to notebooks/rocof_test_data/rocof_test_phase_steps_1kHz.bin diff --git a/lab-windows/rocof_test_data/rocof_test_sweep_phase_steps_1kHz.bin b/notebooks/rocof_test_data/rocof_test_sweep_phase_steps_1kHz.bin similarity index 100% rename from lab-windows/rocof_test_data/rocof_test_sweep_phase_steps_1kHz.bin rename to notebooks/rocof_test_data/rocof_test_sweep_phase_steps_1kHz.bin diff --git a/lab-windows/scratch.ipynb b/notebooks/scratch.ipynb similarity index 100% rename from lab-windows/scratch.ipynb rename to notebooks/scratch.ipynb diff --git a/lab-windows/signal_gen.ipynb b/notebooks/signal_gen.ipynb similarity index 100% rename from lab-windows/signal_gen.ipynb rename to notebooks/signal_gen.ipynb diff --git a/bom.ods b/proposal/bom.ods similarity index 100% rename from bom.ods rename to proposal/bom.ods diff --git a/project_proposal.pdf b/proposal/project_proposal.pdf similarity index 100% rename from project_proposal.pdf rename to proposal/project_proposal.pdf diff --git a/project_proposal.tex b/proposal/project_proposal.tex similarity index 100% rename from project_proposal.tex rename to proposal/project_proposal.tex diff --git a/smart_reset_bom_v01.ods b/proposal/smart_reset_bom_v01.ods similarity index 100% rename from smart_reset_bom_v01.ods rename to proposal/smart_reset_bom_v01.ods diff --git a/smart_reset_overview_v01.pdf b/proposal/smart_reset_overview_v01.pdf similarity index 100% rename from smart_reset_overview_v01.pdf rename to proposal/smart_reset_overview_v01.pdf diff --git a/smart_reset_overview_v02.pdf b/proposal/smart_reset_overview_v02.pdf similarity index 100% rename from smart_reset_overview_v02.pdf rename to proposal/smart_reset_overview_v02.pdf diff --git a/controller/fw/Makefile b/reset-controller/fw/Makefile similarity index 100% rename from controller/fw/Makefile rename to reset-controller/fw/Makefile diff --git a/controller/fw/cmsis b/reset-controller/fw/cmsis similarity index 100% rename from controller/fw/cmsis rename to reset-controller/fw/cmsis diff --git a/controller/fw/crypto-algorithms b/reset-controller/fw/crypto-algorithms similarity index 100% rename from controller/fw/crypto-algorithms rename to reset-controller/fw/crypto-algorithms diff --git a/controller/fw/levmarq/LICENSE b/reset-controller/fw/levmarq/LICENSE similarity index 100% rename from controller/fw/levmarq/LICENSE rename to reset-controller/fw/levmarq/LICENSE diff --git a/controller/fw/levmarq/levmarq.c b/reset-controller/fw/levmarq/levmarq.c similarity index 100% rename from controller/fw/levmarq/levmarq.c rename to reset-controller/fw/levmarq/levmarq.c diff --git a/controller/fw/levmarq/levmarq.h b/reset-controller/fw/levmarq/levmarq.h similarity index 100% rename from controller/fw/levmarq/levmarq.h rename to reset-controller/fw/levmarq/levmarq.h diff --git a/controller/fw/libopencm3 b/reset-controller/fw/libopencm3 similarity index 100% rename from controller/fw/libopencm3 rename to reset-controller/fw/libopencm3 diff --git a/controller/fw/libsodium b/reset-controller/fw/libsodium similarity index 100% rename from controller/fw/libsodium rename to reset-controller/fw/libsodium diff --git a/controller/fw/mspdebug b/reset-controller/fw/mspdebug similarity index 100% rename from controller/fw/mspdebug rename to reset-controller/fw/mspdebug diff --git a/controller/fw/musl b/reset-controller/fw/musl similarity index 100% rename from controller/fw/musl rename to reset-controller/fw/musl diff --git a/controller/fw/musl_include_shims/bits/alltypes.h b/reset-controller/fw/musl_include_shims/bits/alltypes.h similarity index 100% rename from controller/fw/musl_include_shims/bits/alltypes.h rename to reset-controller/fw/musl_include_shims/bits/alltypes.h diff --git a/controller/fw/musl_include_shims/endian.h b/reset-controller/fw/musl_include_shims/endian.h similarity index 100% rename from controller/fw/musl_include_shims/endian.h rename to reset-controller/fw/musl_include_shims/endian.h diff --git a/controller/fw/musl_include_shims/features.h b/reset-controller/fw/musl_include_shims/features.h similarity index 100% rename from controller/fw/musl_include_shims/features.h rename to reset-controller/fw/musl_include_shims/features.h diff --git a/controller/fw/musl_include_shims/fp_arch.h b/reset-controller/fw/musl_include_shims/fp_arch.h similarity index 100% rename from controller/fw/musl_include_shims/fp_arch.h rename to reset-controller/fw/musl_include_shims/fp_arch.h diff --git a/controller/fw/musl_include_shims/libm.h b/reset-controller/fw/musl_include_shims/libm.h similarity index 100% rename from controller/fw/musl_include_shims/libm.h rename to reset-controller/fw/musl_include_shims/libm.h diff --git a/controller/fw/reed_solomon b/reset-controller/fw/reed_solomon similarity index 100% rename from controller/fw/reed_solomon rename to reset-controller/fw/reed_solomon diff --git a/controller/fw/src/adc.c b/reset-controller/fw/src/adc.c similarity index 100% rename from controller/fw/src/adc.c rename to reset-controller/fw/src/adc.c diff --git a/controller/fw/src/adc.h b/reset-controller/fw/src/adc.h similarity index 100% rename from controller/fw/src/adc.h rename to reset-controller/fw/src/adc.h diff --git a/controller/fw/src/con_usart.c b/reset-controller/fw/src/con_usart.c similarity index 100% rename from controller/fw/src/con_usart.c rename to reset-controller/fw/src/con_usart.c diff --git a/controller/fw/src/con_usart.h b/reset-controller/fw/src/con_usart.h similarity index 100% rename from controller/fw/src/con_usart.h rename to reset-controller/fw/src/con_usart.h diff --git a/controller/fw/src/crypto.c b/reset-controller/fw/src/crypto.c similarity index 100% rename from controller/fw/src/crypto.c rename to reset-controller/fw/src/crypto.c diff --git a/controller/fw/src/crypto.h b/reset-controller/fw/src/crypto.h similarity index 100% rename from controller/fw/src/crypto.h rename to reset-controller/fw/src/crypto.h diff --git a/controller/fw/src/dma_util.c b/reset-controller/fw/src/dma_util.c similarity index 100% rename from controller/fw/src/dma_util.c rename to reset-controller/fw/src/dma_util.c diff --git a/controller/fw/src/dma_util.h b/reset-controller/fw/src/dma_util.h similarity index 100% rename from controller/fw/src/dma_util.h rename to reset-controller/fw/src/dma_util.h diff --git a/controller/fw/src/dsss_demod.c b/reset-controller/fw/src/dsss_demod.c similarity index 100% rename from controller/fw/src/dsss_demod.c rename to reset-controller/fw/src/dsss_demod.c diff --git a/controller/fw/src/dsss_demod.h b/reset-controller/fw/src/dsss_demod.h similarity index 100% rename from controller/fw/src/dsss_demod.h rename to reset-controller/fw/src/dsss_demod.h diff --git a/controller/fw/src/freq_meas.c b/reset-controller/fw/src/freq_meas.c similarity index 100% rename from controller/fw/src/freq_meas.c rename to reset-controller/fw/src/freq_meas.c diff --git a/controller/fw/src/freq_meas.h b/reset-controller/fw/src/freq_meas.h similarity index 100% rename from controller/fw/src/freq_meas.h rename to reset-controller/fw/src/freq_meas.h diff --git a/controller/fw/src/gold_code.h b/reset-controller/fw/src/gold_code.h similarity index 100% rename from controller/fw/src/gold_code.h rename to reset-controller/fw/src/gold_code.h diff --git a/controller/fw/src/gpio_helpers.c b/reset-controller/fw/src/gpio_helpers.c similarity index 100% rename from controller/fw/src/gpio_helpers.c rename to reset-controller/fw/src/gpio_helpers.c diff --git a/controller/fw/src/gpio_helpers.h b/reset-controller/fw/src/gpio_helpers.h similarity index 100% rename from controller/fw/src/gpio_helpers.h rename to reset-controller/fw/src/gpio_helpers.h diff --git a/controller/fw/src/main.c b/reset-controller/fw/src/main.c similarity index 100% rename from controller/fw/src/main.c rename to reset-controller/fw/src/main.c diff --git a/controller/fw/src/mspdebug_wrapper.c b/reset-controller/fw/src/mspdebug_wrapper.c similarity index 100% rename from controller/fw/src/mspdebug_wrapper.c rename to reset-controller/fw/src/mspdebug_wrapper.c diff --git a/controller/fw/src/mspdebug_wrapper.h b/reset-controller/fw/src/mspdebug_wrapper.h similarity index 100% rename from controller/fw/src/mspdebug_wrapper.h rename to reset-controller/fw/src/mspdebug_wrapper.h diff --git a/controller/fw/src/protocol.c b/reset-controller/fw/src/protocol.c similarity index 100% rename from controller/fw/src/protocol.c rename to reset-controller/fw/src/protocol.c diff --git a/controller/fw/src/rscode-config.h b/reset-controller/fw/src/rscode-config.h similarity index 100% rename from controller/fw/src/rscode-config.h rename to reset-controller/fw/src/rscode-config.h diff --git a/controller/fw/src/rslib.c b/reset-controller/fw/src/rslib.c similarity index 100% rename from controller/fw/src/rslib.c rename to reset-controller/fw/src/rslib.c diff --git a/controller/fw/src/rslib.h b/reset-controller/fw/src/rslib.h similarity index 100% rename from controller/fw/src/rslib.h rename to reset-controller/fw/src/rslib.h diff --git a/controller/fw/src/serial.c b/reset-controller/fw/src/serial.c similarity index 100% rename from controller/fw/src/serial.c rename to reset-controller/fw/src/serial.c diff --git a/controller/fw/src/serial.h b/reset-controller/fw/src/serial.h similarity index 100% rename from controller/fw/src/serial.h rename to reset-controller/fw/src/serial.h diff --git a/controller/fw/src/signal_processing.c b/reset-controller/fw/src/signal_processing.c similarity index 100% rename from controller/fw/src/signal_processing.c rename to reset-controller/fw/src/signal_processing.c diff --git a/controller/fw/src/simulation.h b/reset-controller/fw/src/simulation.h similarity index 100% rename from controller/fw/src/simulation.h rename to reset-controller/fw/src/simulation.h diff --git a/controller/fw/src/spi_flash.c b/reset-controller/fw/src/spi_flash.c similarity index 100% rename from controller/fw/src/spi_flash.c rename to reset-controller/fw/src/spi_flash.c diff --git a/controller/fw/src/spi_flash.h b/reset-controller/fw/src/spi_flash.h similarity index 100% rename from controller/fw/src/spi_flash.h rename to reset-controller/fw/src/spi_flash.h diff --git a/controller/fw/src/sr_global.h b/reset-controller/fw/src/sr_global.h similarity index 100% rename from controller/fw/src/sr_global.h rename to reset-controller/fw/src/sr_global.h diff --git a/controller/fw/src/startup_stm32f407xx.s b/reset-controller/fw/src/startup_stm32f407xx.s similarity index 100% rename from controller/fw/src/startup_stm32f407xx.s rename to reset-controller/fw/src/startup_stm32f407xx.s diff --git a/controller/fw/src/stm32f4_isr.h b/reset-controller/fw/src/stm32f4_isr.h similarity index 100% rename from controller/fw/src/stm32f4_isr.h rename to reset-controller/fw/src/stm32f4_isr.h diff --git a/controller/fw/src/system_stm32f4xx.c b/reset-controller/fw/src/system_stm32f4xx.c similarity index 100% rename from controller/fw/src/system_stm32f4xx.c rename to reset-controller/fw/src/system_stm32f4xx.c diff --git a/controller/fw/src/test_decoder.py b/reset-controller/fw/src/test_decoder.py similarity index 100% rename from controller/fw/src/test_decoder.py rename to reset-controller/fw/src/test_decoder.py diff --git a/controller/fw/src/test_pyldpc_utils.py b/reset-controller/fw/src/test_pyldpc_utils.py similarity index 100% rename from controller/fw/src/test_pyldpc_utils.py rename to reset-controller/fw/src/test_pyldpc_utils.py diff --git a/controller/fw/src/tinyaes_adaptor.c b/reset-controller/fw/src/tinyaes_adaptor.c similarity index 100% rename from controller/fw/src/tinyaes_adaptor.c rename to reset-controller/fw/src/tinyaes_adaptor.c diff --git a/controller/fw/stm32f407.ld b/reset-controller/fw/stm32f407.ld similarity index 100% rename from controller/fw/stm32f407.ld rename to reset-controller/fw/stm32f407.ld diff --git a/controller/fw/tinyaes b/reset-controller/fw/tinyaes similarity index 100% rename from controller/fw/tinyaes rename to reset-controller/fw/tinyaes diff --git a/controller/fw/tinyprintf b/reset-controller/fw/tinyprintf similarity index 100% rename from controller/fw/tinyprintf rename to reset-controller/fw/tinyprintf diff --git a/controller/fw/tools/butter_filter_gen.py b/reset-controller/fw/tools/butter_filter_gen.py similarity index 100% rename from controller/fw/tools/butter_filter_gen.py rename to reset-controller/fw/tools/butter_filter_gen.py diff --git a/controller/fw/tools/crypto_test.c b/reset-controller/fw/tools/crypto_test.c similarity index 100% rename from controller/fw/tools/crypto_test.c rename to reset-controller/fw/tools/crypto_test.c diff --git a/controller/fw/tools/crypto_test_runner.py b/reset-controller/fw/tools/crypto_test_runner.py similarity index 100% rename from controller/fw/tools/crypto_test_runner.py rename to reset-controller/fw/tools/crypto_test_runner.py diff --git a/controller/fw/tools/cwt_wavelet_header_gen.py b/reset-controller/fw/tools/cwt_wavelet_header_gen.py similarity index 100% rename from controller/fw/tools/cwt_wavelet_header_gen.py rename to reset-controller/fw/tools/cwt_wavelet_header_gen.py diff --git a/controller/fw/tools/dsss_demod_test.c b/reset-controller/fw/tools/dsss_demod_test.c similarity index 100% rename from controller/fw/tools/dsss_demod_test.c rename to reset-controller/fw/tools/dsss_demod_test.c diff --git a/controller/fw/tools/dsss_demod_test_runner.py b/reset-controller/fw/tools/dsss_demod_test_runner.py similarity index 100% rename from controller/fw/tools/dsss_demod_test_runner.py rename to reset-controller/fw/tools/dsss_demod_test_runner.py diff --git a/controller/fw/tools/dsss_demod_test_waveform_gen.py b/reset-controller/fw/tools/dsss_demod_test_waveform_gen.py similarity index 100% rename from controller/fw/tools/dsss_demod_test_waveform_gen.py rename to reset-controller/fw/tools/dsss_demod_test_waveform_gen.py diff --git a/controller/fw/tools/e2e_test.c b/reset-controller/fw/tools/e2e_test.c similarity index 100% rename from controller/fw/tools/e2e_test.c rename to reset-controller/fw/tools/e2e_test.c diff --git a/controller/fw/tools/fft_window_header_gen.py b/reset-controller/fw/tools/fft_window_header_gen.py similarity index 100% rename from controller/fw/tools/fft_window_header_gen.py rename to reset-controller/fw/tools/fft_window_header_gen.py diff --git a/controller/fw/tools/fmeas_export_ocxo_2day.bin b/reset-controller/fw/tools/fmeas_export_ocxo_2day.bin similarity index 100% rename from controller/fw/tools/fmeas_export_ocxo_2day.bin rename to reset-controller/fw/tools/fmeas_export_ocxo_2day.bin diff --git a/controller/fw/tools/freq_meas_test.c b/reset-controller/fw/tools/freq_meas_test.c similarity index 100% rename from controller/fw/tools/freq_meas_test.c rename to reset-controller/fw/tools/freq_meas_test.c diff --git a/controller/fw/tools/freq_meas_test_runner.py b/reset-controller/fw/tools/freq_meas_test_runner.py similarity index 100% rename from controller/fw/tools/freq_meas_test_runner.py rename to reset-controller/fw/tools/freq_meas_test_runner.py diff --git a/controller/fw/tools/gold_code_header_gen.py b/reset-controller/fw/tools/gold_code_header_gen.py similarity index 100% rename from controller/fw/tools/gold_code_header_gen.py rename to reset-controller/fw/tools/gold_code_header_gen.py diff --git a/controller/fw/tools/grid_freq_psd_spl_108pt.json b/reset-controller/fw/tools/grid_freq_psd_spl_108pt.json similarity index 100% rename from controller/fw/tools/grid_freq_psd_spl_108pt.json rename to reset-controller/fw/tools/grid_freq_psd_spl_108pt.json diff --git a/controller/fw/tools/hum_generator.py b/reset-controller/fw/tools/hum_generator.py similarity index 100% rename from controller/fw/tools/hum_generator.py rename to reset-controller/fw/tools/hum_generator.py diff --git a/controller/fw/tools/ldparser.py b/reset-controller/fw/tools/ldparser.py similarity index 100% rename from controller/fw/tools/ldparser.py rename to reset-controller/fw/tools/ldparser.py diff --git a/controller/fw/tools/linkmem.py b/reset-controller/fw/tools/linkmem.py similarity index 100% rename from controller/fw/tools/linkmem.py rename to reset-controller/fw/tools/linkmem.py diff --git a/controller/fw/tools/linksize.py b/reset-controller/fw/tools/linksize.py similarity index 100% rename from controller/fw/tools/linksize.py rename to reset-controller/fw/tools/linksize.py diff --git a/controller/fw/tools/linktracer.py b/reset-controller/fw/tools/linktracer.py similarity index 100% rename from controller/fw/tools/linktracer.py rename to reset-controller/fw/tools/linktracer.py diff --git a/controller/fw/tools/mapparse.py b/reset-controller/fw/tools/mapparse.py similarity index 100% rename from controller/fw/tools/mapparse.py rename to reset-controller/fw/tools/mapparse.py diff --git a/controller/fw/tools/presig_gen.py b/reset-controller/fw/tools/presig_gen.py similarity index 100% rename from controller/fw/tools/presig_gen.py rename to reset-controller/fw/tools/presig_gen.py diff --git a/controller/fw/tools/reed_solomon.py b/reset-controller/fw/tools/reed_solomon.py similarity index 100% rename from controller/fw/tools/reed_solomon.py rename to reset-controller/fw/tools/reed_solomon.py diff --git a/BER Plots.ipynb b/tools/BER Plots.ipynb similarity index 100% rename from BER Plots.ipynb rename to tools/BER Plots.ipynb diff --git a/Phase Measurement Prototype.ipynb b/tools/Phase Measurement Prototype.ipynb similarity index 100% rename from Phase Measurement Prototype.ipynb rename to tools/Phase Measurement Prototype.ipynb diff --git a/ROCOF test data generator.ipynb b/tools/ROCOF test data generator.ipynb similarity index 100% rename from ROCOF test data generator.ipynb rename to tools/ROCOF test data generator.ipynb diff --git a/dec_proto_am_ber_top.py b/tools/dec_proto_am_ber_top.py similarity index 100% rename from dec_proto_am_ber_top.py rename to tools/dec_proto_am_ber_top.py diff --git a/dec_proto_am_dc_ber_top.py b/tools/dec_proto_am_dc_ber_top.py similarity index 100% rename from dec_proto_am_dc_ber_top.py rename to tools/dec_proto_am_dc_ber_top.py diff --git a/dec_proto_fm_ber_top.py b/tools/dec_proto_fm_ber_top.py similarity index 100% rename from dec_proto_fm_ber_top.py rename to tools/dec_proto_fm_ber_top.py diff --git a/grid_frequency_spectra.ipynb b/tools/grid_frequency_spectra.ipynb similarity index 100% rename from grid_frequency_spectra.ipynb rename to tools/grid_frequency_spectra.ipynb diff --git a/rocof_test_data.py b/tools/rocof_test_data.py similarity index 100% rename from rocof_test_data.py rename to tools/rocof_test_data.py diff --git a/sweep_gr_sims.py b/tools/sweep_gr_sims.py similarity index 100% rename from sweep_gr_sims.py rename to tools/sweep_gr_sims.py