From 7b85ba8d4fb34e76d34a2d581e89e856aa471cf5 Mon Sep 17 00:00:00 2001 From: jaseg Date: Mon, 21 Dec 2020 16:26:57 +0100 Subject: [PATCH] Move fw into direct subdir --- .gitmodules | 8 ++++---- fw/{hid-dials => }/Makefile | 0 .../STM32_USB_Device_Library/Core/Inc/usbd_core.h | 0 .../STM32_USB_Device_Library/Core/Inc/usbd_ctlreq.h | 0 .../ST/STM32_USB_Device_Library/Core/Inc/usbd_def.h | 0 .../STM32_USB_Device_Library/Core/Inc/usbd_ioreq.h | 0 .../STM32_USB_Device_Library/Core/Src/usbd_core.c | 0 .../STM32_USB_Device_Library/Core/Src/usbd_ctlreq.c | 0 .../STM32_USB_Device_Library/Core/Src/usbd_ioreq.c | 0 fw/{hid-dials => }/README.md | 0 fw/{hid-dials => }/STM32F072CBUx_FLASH.ld | 0 fw/{hid-dials => }/src/main.c | 0 fw/{hid-dials => }/src/main.h | 0 fw/{hid-dials => }/src/startup_stm32f072xb.s | 0 fw/{hid-dials => }/src/stm32f0xx_hal_conf.h | 0 fw/{hid-dials => }/src/stm32f0xx_hal_msp.c | 0 fw/{hid-dials => }/src/stm32f0xx_it.c | 0 fw/{hid-dials => }/src/stm32f0xx_it.h | 0 fw/{hid-dials => }/src/system_stm32f0xx.c | 0 fw/{hid-dials => }/src/usb_device.c | 0 fw/{hid-dials => }/src/usb_device.h | 0 fw/{hid-dials => }/src/usbd_conf.c | 0 fw/{hid-dials => }/src/usbd_conf.h | 0 fw/{hid-dials => }/src/usbd_desc.c | 0 fw/{hid-dials => }/src/usbd_desc.h | 0 fw/{hid-dials => }/src/usbd_hid.c | 0 fw/{hid-dials => }/src/usbd_hid.h | 0 fw/{hid-dials => }/tools/butter_filter_gen.py | 0 fw/{hid-dials => }/tools/crypto_test.c | 0 fw/{hid-dials => }/tools/crypto_test_runner.py | 0 fw/{hid-dials => }/tools/cwt_wavelet_header_gen.py | 0 fw/{hid-dials => }/tools/dsss_demod_test.c | 0 fw/{hid-dials => }/tools/dsss_demod_test_runner.py | 0 .../tools/dsss_demod_test_waveform_gen.py | 0 fw/{hid-dials => }/tools/e2e_test.c | 0 fw/{hid-dials => }/tools/fft_window_header_gen.py | 0 fw/{hid-dials => }/tools/fmeas_export_ocxo_2day.bin | Bin fw/{hid-dials => }/tools/freq_meas_test.c | 0 fw/{hid-dials => }/tools/freq_meas_test_runner.py | 0 fw/{hid-dials => }/tools/gold_code_header_gen.py | 0 .../tools/grid_freq_psd_spl_108pt.json | 0 fw/{hid-dials => }/tools/hum_generator.py | 0 fw/{hid-dials => }/tools/ldparser.py | 0 fw/{hid-dials => }/tools/linkmem.py | 0 fw/{hid-dials => }/tools/linksize.py | 0 fw/{hid-dials => }/tools/linktracer.py | 0 fw/{hid-dials => }/tools/mapparse.py | 0 fw/{hid-dials => }/tools/presig_gen.py | 0 fw/{hid-dials => }/tools/reed_solomon.py | 0 fw/{hid-dials => }/upstream/cmsis-core | 0 fw/{hid-dials => }/upstream/st-cmsis-f0 | 0 fw/{hid-dials => }/upstream/st-hal-f0 | 0 fw/{hid-dials => }/upstream/st-usb-device | 0 53 files changed, 4 insertions(+), 4 deletions(-) rename fw/{hid-dials => }/Makefile (100%) rename fw/{hid-dials => }/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_core.h (100%) rename fw/{hid-dials => }/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ctlreq.h (100%) rename fw/{hid-dials => }/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_def.h (100%) rename fw/{hid-dials => }/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ioreq.h (100%) rename fw/{hid-dials => }/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_core.c (100%) rename fw/{hid-dials => }/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ctlreq.c (100%) rename fw/{hid-dials => }/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ioreq.c (100%) rename fw/{hid-dials => }/README.md (100%) rename fw/{hid-dials => }/STM32F072CBUx_FLASH.ld (100%) rename fw/{hid-dials => }/src/main.c (100%) rename fw/{hid-dials => }/src/main.h (100%) rename fw/{hid-dials => }/src/startup_stm32f072xb.s (100%) rename fw/{hid-dials => }/src/stm32f0xx_hal_conf.h (100%) rename fw/{hid-dials => }/src/stm32f0xx_hal_msp.c (100%) rename fw/{hid-dials => }/src/stm32f0xx_it.c (100%) rename fw/{hid-dials => }/src/stm32f0xx_it.h (100%) rename fw/{hid-dials => }/src/system_stm32f0xx.c (100%) rename fw/{hid-dials => }/src/usb_device.c (100%) rename fw/{hid-dials => }/src/usb_device.h (100%) rename fw/{hid-dials => }/src/usbd_conf.c (100%) rename fw/{hid-dials => }/src/usbd_conf.h (100%) rename fw/{hid-dials => }/src/usbd_desc.c (100%) rename fw/{hid-dials => }/src/usbd_desc.h (100%) rename fw/{hid-dials => }/src/usbd_hid.c (100%) rename fw/{hid-dials => }/src/usbd_hid.h (100%) rename fw/{hid-dials => }/tools/butter_filter_gen.py (100%) rename fw/{hid-dials => }/tools/crypto_test.c (100%) rename fw/{hid-dials => }/tools/crypto_test_runner.py (100%) rename fw/{hid-dials => }/tools/cwt_wavelet_header_gen.py (100%) rename fw/{hid-dials => }/tools/dsss_demod_test.c (100%) rename fw/{hid-dials => }/tools/dsss_demod_test_runner.py (100%) rename fw/{hid-dials => }/tools/dsss_demod_test_waveform_gen.py (100%) rename fw/{hid-dials => }/tools/e2e_test.c (100%) rename fw/{hid-dials => }/tools/fft_window_header_gen.py (100%) rename fw/{hid-dials => }/tools/fmeas_export_ocxo_2day.bin (100%) rename fw/{hid-dials => }/tools/freq_meas_test.c (100%) rename fw/{hid-dials => }/tools/freq_meas_test_runner.py (100%) rename fw/{hid-dials => }/tools/gold_code_header_gen.py (100%) rename fw/{hid-dials => }/tools/grid_freq_psd_spl_108pt.json (100%) rename fw/{hid-dials => }/tools/hum_generator.py (100%) rename fw/{hid-dials => }/tools/ldparser.py (100%) rename fw/{hid-dials => }/tools/linkmem.py (100%) rename fw/{hid-dials => }/tools/linksize.py (100%) rename fw/{hid-dials => }/tools/linktracer.py (100%) rename fw/{hid-dials => }/tools/mapparse.py (100%) rename fw/{hid-dials => }/tools/presig_gen.py (100%) rename fw/{hid-dials => }/tools/reed_solomon.py (100%) rename fw/{hid-dials => }/upstream/cmsis-core (100%) rename fw/{hid-dials => }/upstream/st-cmsis-f0 (100%) rename fw/{hid-dials => }/upstream/st-hal-f0 (100%) rename fw/{hid-dials => }/upstream/st-usb-device (100%) 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 similarity index 100% rename from fw/hid-dials/Makefile rename to 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 similarity index 100% rename from fw/hid-dials/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_core.h rename to 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 similarity index 100% rename from fw/hid-dials/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ctlreq.h rename to 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 similarity index 100% rename from fw/hid-dials/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_def.h rename to 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 similarity index 100% rename from fw/hid-dials/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ioreq.h rename to 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 similarity index 100% rename from fw/hid-dials/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_core.c rename to 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 similarity index 100% rename from fw/hid-dials/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ctlreq.c rename to 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 similarity index 100% rename from fw/hid-dials/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ioreq.c rename to fw/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ioreq.c diff --git a/fw/hid-dials/README.md b/fw/README.md similarity index 100% rename from fw/hid-dials/README.md rename to fw/README.md diff --git a/fw/hid-dials/STM32F072CBUx_FLASH.ld b/fw/STM32F072CBUx_FLASH.ld similarity index 100% rename from fw/hid-dials/STM32F072CBUx_FLASH.ld rename to fw/STM32F072CBUx_FLASH.ld diff --git a/fw/hid-dials/src/main.c b/fw/src/main.c similarity index 100% rename from fw/hid-dials/src/main.c rename to fw/src/main.c diff --git a/fw/hid-dials/src/main.h b/fw/src/main.h similarity index 100% rename from fw/hid-dials/src/main.h rename to fw/src/main.h diff --git a/fw/hid-dials/src/startup_stm32f072xb.s b/fw/src/startup_stm32f072xb.s similarity index 100% rename from fw/hid-dials/src/startup_stm32f072xb.s rename to fw/src/startup_stm32f072xb.s diff --git a/fw/hid-dials/src/stm32f0xx_hal_conf.h b/fw/src/stm32f0xx_hal_conf.h similarity index 100% rename from fw/hid-dials/src/stm32f0xx_hal_conf.h rename to fw/src/stm32f0xx_hal_conf.h diff --git a/fw/hid-dials/src/stm32f0xx_hal_msp.c b/fw/src/stm32f0xx_hal_msp.c similarity index 100% rename from fw/hid-dials/src/stm32f0xx_hal_msp.c rename to fw/src/stm32f0xx_hal_msp.c diff --git a/fw/hid-dials/src/stm32f0xx_it.c b/fw/src/stm32f0xx_it.c similarity index 100% rename from fw/hid-dials/src/stm32f0xx_it.c rename to fw/src/stm32f0xx_it.c diff --git a/fw/hid-dials/src/stm32f0xx_it.h b/fw/src/stm32f0xx_it.h similarity index 100% rename from fw/hid-dials/src/stm32f0xx_it.h rename to fw/src/stm32f0xx_it.h diff --git a/fw/hid-dials/src/system_stm32f0xx.c b/fw/src/system_stm32f0xx.c similarity index 100% rename from fw/hid-dials/src/system_stm32f0xx.c rename to fw/src/system_stm32f0xx.c diff --git a/fw/hid-dials/src/usb_device.c b/fw/src/usb_device.c similarity index 100% rename from fw/hid-dials/src/usb_device.c rename to fw/src/usb_device.c diff --git a/fw/hid-dials/src/usb_device.h b/fw/src/usb_device.h similarity index 100% rename from fw/hid-dials/src/usb_device.h rename to fw/src/usb_device.h diff --git a/fw/hid-dials/src/usbd_conf.c b/fw/src/usbd_conf.c similarity index 100% rename from fw/hid-dials/src/usbd_conf.c rename to fw/src/usbd_conf.c diff --git a/fw/hid-dials/src/usbd_conf.h b/fw/src/usbd_conf.h similarity index 100% rename from fw/hid-dials/src/usbd_conf.h rename to fw/src/usbd_conf.h diff --git a/fw/hid-dials/src/usbd_desc.c b/fw/src/usbd_desc.c similarity index 100% rename from fw/hid-dials/src/usbd_desc.c rename to fw/src/usbd_desc.c diff --git a/fw/hid-dials/src/usbd_desc.h b/fw/src/usbd_desc.h similarity index 100% rename from fw/hid-dials/src/usbd_desc.h rename to fw/src/usbd_desc.h diff --git a/fw/hid-dials/src/usbd_hid.c b/fw/src/usbd_hid.c similarity index 100% rename from fw/hid-dials/src/usbd_hid.c rename to fw/src/usbd_hid.c diff --git a/fw/hid-dials/src/usbd_hid.h b/fw/src/usbd_hid.h similarity index 100% rename from fw/hid-dials/src/usbd_hid.h rename to fw/src/usbd_hid.h diff --git a/fw/hid-dials/tools/butter_filter_gen.py b/fw/tools/butter_filter_gen.py similarity index 100% rename from fw/hid-dials/tools/butter_filter_gen.py rename to fw/tools/butter_filter_gen.py diff --git a/fw/hid-dials/tools/crypto_test.c b/fw/tools/crypto_test.c similarity index 100% rename from fw/hid-dials/tools/crypto_test.c rename to fw/tools/crypto_test.c diff --git a/fw/hid-dials/tools/crypto_test_runner.py b/fw/tools/crypto_test_runner.py similarity index 100% rename from fw/hid-dials/tools/crypto_test_runner.py rename to 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 similarity index 100% rename from fw/hid-dials/tools/cwt_wavelet_header_gen.py rename to 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 similarity index 100% rename from fw/hid-dials/tools/dsss_demod_test.c rename to 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 similarity index 100% rename from fw/hid-dials/tools/dsss_demod_test_runner.py rename to 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 similarity index 100% rename from fw/hid-dials/tools/dsss_demod_test_waveform_gen.py rename to fw/tools/dsss_demod_test_waveform_gen.py diff --git a/fw/hid-dials/tools/e2e_test.c b/fw/tools/e2e_test.c similarity index 100% rename from fw/hid-dials/tools/e2e_test.c rename to 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 similarity index 100% rename from fw/hid-dials/tools/fft_window_header_gen.py rename to 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 similarity index 100% rename from fw/hid-dials/tools/fmeas_export_ocxo_2day.bin rename to 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 similarity index 100% rename from fw/hid-dials/tools/freq_meas_test.c rename to 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 similarity index 100% rename from fw/hid-dials/tools/freq_meas_test_runner.py rename to 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 similarity index 100% rename from fw/hid-dials/tools/gold_code_header_gen.py rename to 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 similarity index 100% rename from fw/hid-dials/tools/grid_freq_psd_spl_108pt.json rename to fw/tools/grid_freq_psd_spl_108pt.json diff --git a/fw/hid-dials/tools/hum_generator.py b/fw/tools/hum_generator.py similarity index 100% rename from fw/hid-dials/tools/hum_generator.py rename to fw/tools/hum_generator.py diff --git a/fw/hid-dials/tools/ldparser.py b/fw/tools/ldparser.py similarity index 100% rename from fw/hid-dials/tools/ldparser.py rename to fw/tools/ldparser.py diff --git a/fw/hid-dials/tools/linkmem.py b/fw/tools/linkmem.py similarity index 100% rename from fw/hid-dials/tools/linkmem.py rename to fw/tools/linkmem.py diff --git a/fw/hid-dials/tools/linksize.py b/fw/tools/linksize.py similarity index 100% rename from fw/hid-dials/tools/linksize.py rename to fw/tools/linksize.py diff --git a/fw/hid-dials/tools/linktracer.py b/fw/tools/linktracer.py similarity index 100% rename from fw/hid-dials/tools/linktracer.py rename to fw/tools/linktracer.py diff --git a/fw/hid-dials/tools/mapparse.py b/fw/tools/mapparse.py similarity index 100% rename from fw/hid-dials/tools/mapparse.py rename to fw/tools/mapparse.py diff --git a/fw/hid-dials/tools/presig_gen.py b/fw/tools/presig_gen.py similarity index 100% rename from fw/hid-dials/tools/presig_gen.py rename to fw/tools/presig_gen.py diff --git a/fw/hid-dials/tools/reed_solomon.py b/fw/tools/reed_solomon.py similarity index 100% rename from fw/hid-dials/tools/reed_solomon.py rename to fw/tools/reed_solomon.py diff --git a/fw/hid-dials/upstream/cmsis-core b/fw/upstream/cmsis-core similarity index 100% rename from fw/hid-dials/upstream/cmsis-core rename to fw/upstream/cmsis-core diff --git a/fw/hid-dials/upstream/st-cmsis-f0 b/fw/upstream/st-cmsis-f0 similarity index 100% rename from fw/hid-dials/upstream/st-cmsis-f0 rename to fw/upstream/st-cmsis-f0 diff --git a/fw/hid-dials/upstream/st-hal-f0 b/fw/upstream/st-hal-f0 similarity index 100% rename from fw/hid-dials/upstream/st-hal-f0 rename to fw/upstream/st-hal-f0 diff --git a/fw/hid-dials/upstream/st-usb-device b/fw/upstream/st-usb-device similarity index 100% rename from fw/hid-dials/upstream/st-usb-device rename to fw/upstream/st-usb-device