Move fw into direct subdir

53 files changed, 4 insertions, 4 deletions

diff --git a/.gitmodules b/.gitmodules
index 298c4f3..7bb2c67 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,15 +3,15 @@
 	url = git@github.com:Jan--Henrik/KiCAD-libs.git
 	noref = true
 [submodule "fw/hid-dials/upstream/st-usb-device"]
-	path = fw/hid-dials/upstream/st-usb-device
+	path = fw/upstream/st-usb-device
 	url = https://github.com/STMicroelectronics/stm32_mw_usb_device
 [submodule "fw/hid-dials/upstream/st-hal-f0"]
-	path = fw/hid-dials/upstream/st-hal-f0
+	path = fw/upstream/st-hal-f0
 	url = https://github.com/STMicroelectronics/stm32f0xx_hal_driver
 [submodule "fw/hid-dials/upstream/st-cmsis-f0"]
-	path = fw/hid-dials/upstream/st-cmsis-f0
+	path = fw/upstream/st-cmsis-f0
 	url = https://github.com/STMicroelectronics/cmsis_device_f0
 [submodule "fw/hid-dials/upstream/cmsis-core"]
-	path = fw/hid-dials/upstream/cmsis-core
+	path = fw/upstream/cmsis-core
 	url = https://git.jaseg.de/straumli/pub/st-cmsis-core-lowfat.git
     branch = master-subtree-include
diff --git a/fw/hid-dials/Makefile b/fw/Makefile
index b8f3ad4..b8f3ad4 100644
--- a/fw/hid-dials/Makefile
+++ b/fw/Makefile
diff --git a/fw/hid-dials/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_core.h b/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_core.h
index 6550cd7..6550cd7 100644
--- a/fw/hid-dials/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_core.h
+++ b/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_core.h
diff --git a/fw/hid-dials/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ctlreq.h b/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ctlreq.h
index 66380fd..66380fd 100644
--- a/fw/hid-dials/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ctlreq.h
+++ b/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ctlreq.h
diff --git a/fw/hid-dials/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_def.h b/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_def.h
index 969e324..969e324 100644
--- a/fw/hid-dials/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_def.h
+++ b/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_def.h
diff --git a/fw/hid-dials/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ioreq.h b/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ioreq.h
index dbf8ca1..dbf8ca1 100644
--- a/fw/hid-dials/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ioreq.h
+++ b/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ioreq.h
diff --git a/fw/hid-dials/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_core.c b/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_core.c
index 86fc2de..86fc2de 100644
--- a/fw/hid-dials/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_core.c
+++ b/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_core.c
diff --git a/fw/hid-dials/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ctlreq.c b/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ctlreq.c
index 7701a6d..7701a6d 100644
--- a/fw/hid-dials/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ctlreq.c
+++ b/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ctlreq.c
diff --git a/fw/hid-dials/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ioreq.c b/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ioreq.c
index d66d777..d66d777 100644
--- a/fw/hid-dials/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ioreq.c
+++ b/fw/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ioreq.c
diff --git a/fw/hid-dials/README.md b/fw/README.md
index a6f5438..a6f5438 100644
--- a/fw/hid-dials/README.md
+++ b/fw/README.md
diff --git a/fw/hid-dials/STM32F072CBUx_FLASH.ld b/fw/STM32F072CBUx_FLASH.ld
index ea1b89e..ea1b89e 100644
--- a/fw/hid-dials/STM32F072CBUx_FLASH.ld
+++ b/fw/STM32F072CBUx_FLASH.ld
diff --git a/fw/hid-dials/src/main.c b/fw/src/main.c
index b84e24b..b84e24b 100644
--- a/fw/hid-dials/src/main.c
+++ b/fw/src/main.c
diff --git a/fw/hid-dials/src/main.h b/fw/src/main.h
index a80f8f4..a80f8f4 100644
--- a/fw/hid-dials/src/main.h
+++ b/fw/src/main.h
diff --git a/fw/hid-dials/src/startup_stm32f072xb.s b/fw/src/startup_stm32f072xb.s
index 9d431a9..9d431a9 100644
--- a/fw/hid-dials/src/startup_stm32f072xb.s
+++ b/fw/src/startup_stm32f072xb.s
diff --git a/fw/hid-dials/src/stm32f0xx_hal_conf.h b/fw/src/stm32f0xx_hal_conf.h
index 78c43f6..78c43f6 100644
--- a/fw/hid-dials/src/stm32f0xx_hal_conf.h
+++ b/fw/src/stm32f0xx_hal_conf.h
diff --git a/fw/hid-dials/src/stm32f0xx_hal_msp.c b/fw/src/stm32f0xx_hal_msp.c
index 8695580..8695580 100644
--- a/fw/hid-dials/src/stm32f0xx_hal_msp.c
+++ b/fw/src/stm32f0xx_hal_msp.c
diff --git a/fw/hid-dials/src/stm32f0xx_it.c b/fw/src/stm32f0xx_it.c
index 3d94908..3d94908 100644
--- a/fw/hid-dials/src/stm32f0xx_it.c
+++ b/fw/src/stm32f0xx_it.c
diff --git a/fw/hid-dials/src/stm32f0xx_it.h b/fw/src/stm32f0xx_it.h
index daef239..daef239 100644
--- a/fw/hid-dials/src/stm32f0xx_it.h
+++ b/fw/src/stm32f0xx_it.h
diff --git a/fw/hid-dials/src/system_stm32f0xx.c b/fw/src/system_stm32f0xx.c
index 6a3202b..6a3202b 100644
--- a/fw/hid-dials/src/system_stm32f0xx.c
+++ b/fw/src/system_stm32f0xx.c
diff --git a/fw/hid-dials/src/usb_device.c b/fw/src/usb_device.c
index dc6a44f..dc6a44f 100644
--- a/fw/hid-dials/src/usb_device.c
+++ b/fw/src/usb_device.c
diff --git a/fw/hid-dials/src/usb_device.h b/fw/src/usb_device.h
index 5437462..5437462 100644
--- a/fw/hid-dials/src/usb_device.h
+++ b/fw/src/usb_device.h
diff --git a/fw/hid-dials/src/usbd_conf.c b/fw/src/usbd_conf.c
index ccc4b16..ccc4b16 100644
--- a/fw/hid-dials/src/usbd_conf.c
+++ b/fw/src/usbd_conf.c
diff --git a/fw/hid-dials/src/usbd_conf.h b/fw/src/usbd_conf.h
index c194c70..c194c70 100644
--- a/fw/hid-dials/src/usbd_conf.h
+++ b/fw/src/usbd_conf.h
diff --git a/fw/hid-dials/src/usbd_desc.c b/fw/src/usbd_desc.c
index bdcaca4..bdcaca4 100644
--- a/fw/hid-dials/src/usbd_desc.c
+++ b/fw/src/usbd_desc.c
diff --git a/fw/hid-dials/src/usbd_desc.h b/fw/src/usbd_desc.h
index 9abf0af..9abf0af 100644
--- a/fw/hid-dials/src/usbd_desc.h
+++ b/fw/src/usbd_desc.h
diff --git a/fw/hid-dials/src/usbd_hid.c b/fw/src/usbd_hid.c
index 4d313b4..4d313b4 100644
--- a/fw/hid-dials/src/usbd_hid.c
+++ b/fw/src/usbd_hid.c
diff --git a/fw/hid-dials/src/usbd_hid.h b/fw/src/usbd_hid.h
index fa2f0a2..fa2f0a2 100644
--- a/fw/hid-dials/src/usbd_hid.h
+++ b/fw/src/usbd_hid.h
diff --git a/fw/hid-dials/tools/butter_filter_gen.py b/fw/tools/butter_filter_gen.py
index 0bb81bc..0bb81bc 100644
--- a/fw/hid-dials/tools/butter_filter_gen.py
+++ b/fw/tools/butter_filter_gen.py
diff --git a/fw/hid-dials/tools/crypto_test.c b/fw/tools/crypto_test.c
index 410fac2..410fac2 100644
--- a/fw/hid-dials/tools/crypto_test.c
+++ b/fw/tools/crypto_test.c
diff --git a/fw/hid-dials/tools/crypto_test_runner.py b/fw/tools/crypto_test_runner.py
index 34c8b59..34c8b59 100644
--- a/fw/hid-dials/tools/crypto_test_runner.py
+++ b/fw/tools/crypto_test_runner.py
diff --git a/fw/hid-dials/tools/cwt_wavelet_header_gen.py b/fw/tools/cwt_wavelet_header_gen.py
index 8be785b..8be785b 100644
--- a/fw/hid-dials/tools/cwt_wavelet_header_gen.py
+++ b/fw/tools/cwt_wavelet_header_gen.py
diff --git a/fw/hid-dials/tools/dsss_demod_test.c b/fw/tools/dsss_demod_test.c
index f7df111..f7df111 100644
--- a/fw/hid-dials/tools/dsss_demod_test.c
+++ b/fw/tools/dsss_demod_test.c
diff --git a/fw/hid-dials/tools/dsss_demod_test_runner.py b/fw/tools/dsss_demod_test_runner.py
index d3c3cfc..d3c3cfc 100644
--- a/fw/hid-dials/tools/dsss_demod_test_runner.py
+++ b/fw/tools/dsss_demod_test_runner.py
diff --git a/fw/hid-dials/tools/dsss_demod_test_waveform_gen.py b/fw/tools/dsss_demod_test_waveform_gen.py
index 414c553..414c553 100644
--- a/fw/hid-dials/tools/dsss_demod_test_waveform_gen.py
+++ b/fw/tools/dsss_demod_test_waveform_gen.py
diff --git a/fw/hid-dials/tools/e2e_test.c b/fw/tools/e2e_test.c
index 935f70d..935f70d 100644
--- a/fw/hid-dials/tools/e2e_test.c
+++ b/fw/tools/e2e_test.c
diff --git a/fw/hid-dials/tools/fft_window_header_gen.py b/fw/tools/fft_window_header_gen.py
index 7df2ee3..7df2ee3 100644
--- a/fw/hid-dials/tools/fft_window_header_gen.py
+++ b/fw/tools/fft_window_header_gen.py
diff --git a/fw/hid-dials/tools/fmeas_export_ocxo_2day.bin b/fw/tools/fmeas_export_ocxo_2day.bin
index c0cd8a8..c0cd8a8 100644
--- a/fw/hid-dials/tools/fmeas_export_ocxo_2day.bin
+++ b/fw/tools/fmeas_export_ocxo_2day.bin
diff --git a/fw/hid-dials/tools/freq_meas_test.c b/fw/tools/freq_meas_test.c
index e2900ad..e2900ad 100644
--- a/fw/hid-dials/tools/freq_meas_test.c
+++ b/fw/tools/freq_meas_test.c
diff --git a/fw/hid-dials/tools/freq_meas_test_runner.py b/fw/tools/freq_meas_test_runner.py
index 779922a..779922a 100644
--- a/fw/hid-dials/tools/freq_meas_test_runner.py
+++ b/fw/tools/freq_meas_test_runner.py
diff --git a/fw/hid-dials/tools/gold_code_header_gen.py b/fw/tools/gold_code_header_gen.py
index fa98fce..fa98fce 100644
--- a/fw/hid-dials/tools/gold_code_header_gen.py
+++ b/fw/tools/gold_code_header_gen.py
diff --git a/fw/hid-dials/tools/grid_freq_psd_spl_108pt.json b/fw/tools/grid_freq_psd_spl_108pt.json
index 5a0ff41..5a0ff41 100644
--- a/fw/hid-dials/tools/grid_freq_psd_spl_108pt.json
+++ b/fw/tools/grid_freq_psd_spl_108pt.json
diff --git a/fw/hid-dials/tools/hum_generator.py b/fw/tools/hum_generator.py
index fbcabac..fbcabac 100755
--- a/fw/hid-dials/tools/hum_generator.py
+++ b/fw/tools/hum_generator.py
diff --git a/fw/hid-dials/tools/ldparser.py b/fw/tools/ldparser.py
index c620fe2..c620fe2 100644
--- a/fw/hid-dials/tools/ldparser.py
+++ b/fw/tools/ldparser.py
diff --git a/fw/hid-dials/tools/linkmem.py b/fw/tools/linkmem.py
index 934a571..934a571 100644
--- a/fw/hid-dials/tools/linkmem.py
+++ b/fw/tools/linkmem.py
diff --git a/fw/hid-dials/tools/linksize.py b/fw/tools/linksize.py
index c41a951..c41a951 100644
--- a/fw/hid-dials/tools/linksize.py
+++ b/fw/tools/linksize.py
diff --git a/fw/hid-dials/tools/linktracer.py b/fw/tools/linktracer.py
index 0c53a60..0c53a60 100644
--- a/fw/hid-dials/tools/linktracer.py
+++ b/fw/tools/linktracer.py
diff --git a/fw/hid-dials/tools/mapparse.py b/fw/tools/mapparse.py
index c1f460a..c1f460a 100644
--- a/fw/hid-dials/tools/mapparse.py
+++ b/fw/tools/mapparse.py
diff --git a/fw/hid-dials/tools/presig_gen.py b/fw/tools/presig_gen.py
index c5dafe7..c5dafe7 100644
--- a/fw/hid-dials/tools/presig_gen.py
+++ b/fw/tools/presig_gen.py
diff --git a/fw/hid-dials/tools/reed_solomon.py b/fw/tools/reed_solomon.py
index c4ca6e4..c4ca6e4 100644
--- a/fw/hid-dials/tools/reed_solomon.py
+++ b/fw/tools/reed_solomon.py
diff --git a/fw/hid-dials/upstream/cmsis-core b/fw/upstream/cmsis-core
-Subproject 84a7bf753760ad7442d8762d2780560e6a734d9
+Subproject 84a7bf753760ad7442d8762d2780560e6a734d9
diff --git a/fw/hid-dials/upstream/st-cmsis-f0 b/fw/upstream/st-cmsis-f0
-Subproject 20e23a96fe294368389655878c44813c989b7a9
+Subproject 20e23a96fe294368389655878c44813c989b7a9
diff --git a/fw/hid-dials/upstream/st-hal-f0 b/fw/upstream/st-hal-f0
-Subproject 5eeaad10dc3816830abd9b3bfd74c6974453e90
+Subproject 5eeaad10dc3816830abd9b3bfd74c6974453e90
diff --git a/fw/hid-dials/upstream/st-usb-device b/fw/upstream/st-usb-device
-Subproject 60d163f271987fd322e22f63c095836e1dc703f
+Subproject 60d163f271987fd322e22f63c095836e1dc703f