From ba010a2137bdcfcb4c654716941a2feb00807bbc Mon Sep 17 00:00:00 2001 From: Robert Gawron Date: Thu, 22 Oct 2020 11:24:03 +0200 Subject: [PATCH 1/2] Unify folder name convention with my other repos (first upper letter singular nouns) --- .travis.yml | 8 ++++---- .../Diagrams}/ArchitectureOverview-1.png | Bin .../Diagrams}/ArchitectureOverview.tex | 0 .../Diagrams}/HostArchitecture-1.png | Bin .../Diagrams}/HostArchitecture.tex | 0 .../Diagrams}/UARTFrameFormat-1.png | Bin .../Diagrams}/UARTFrameFormat.tex | 0 .../Diagrams}/creatediagrams.sh | 0 .../Pictures}/pcb_01_09_2019.jpg | Bin .../Pictures}/pcb_04_08_2019.jpg | Bin .../Pictures}/pcb_13_07_2019.jpg | Bin .../Pictures}/pcb_20_07_2019.jpg | Bin .../Pictures}/render_26_05_2019.png | Bin .gitignore => Hardware/Sensor/.gitignore | 0 {hardware => Hardware}/Sensor/DataAcquisition.pro | 0 {hardware => Hardware}/Sensor/DataAcquisition.sch | 0 .../IonizationChamberHVShield.kicad_mod | 0 .../IonizationChamberSensor.kicad_mod | 0 .../IonizationChamberShield.kicad_mod | 0 .../SwitchButtonGeneric.kicad_mod | 0 {hardware => Hardware}/Sensor/chamber.kicad_pcb | 0 {hardware => Hardware}/Sensor/chamber.pro | 0 {hardware => Hardware}/Sensor/chamber.sch | 0 {hardware => Hardware}/Sensor/fp-info-cache | 0 {hardware => Hardware}/Sensor/sym-lib-table | 0 README.md | 4 ++-- {simulation => Simulation}/Electric/upperview.py | 0 .../DataAcquisition/IonizationChamber.py | 0 Software/DataAcquisition/README.md | 7 +++++++ {software => Software}/DataAcquisition/boxplot.R | 0 {software => Software}/DataAcquisition/config.py | 0 {software => Software}/DataAcquisition/dmm.py | 0 .../DataAcquisition/drawDiagramSingle.R | 0 {software => Software}/DataAcquisition/main.R | 0 {software => Software}/DataAcquisition/main.py | 0 {software => Software}/DataAcquisition/mcp3425.py | 0 {software => Software}/Firmware/.cproject | 0 {software => Software}/Firmware/.project | 0 {software => Software}/Firmware/CMakeLists.txt | 0 .../Firmware/Inc/ApplicationBuilder.h | 0 {software => Software}/Firmware/Inc/BitHandler.h | 0 .../Firmware/Inc/ClockConfigurator.h | 0 .../Firmware/Inc/CommonDataTypes.h | 0 {software => Software}/Firmware/Inc/Logger.h | 0 .../Firmware/Inc/MeasurementCollector.h | 0 .../Firmware/Inc/MeasurementFrame.h | 0 .../Firmware/Inc/PinoutConfiguration.h | 0 .../Firmware/Inc/TimerConfigurator.h | 0 {software => Software}/Firmware/Inc/UserInterface.h | 0 .../Firmware/Inc/VoltageSensorActualValue.h | 0 {software => Software}/Firmware/Inc/stm8s_conf.h | 0 {software => Software}/Firmware/Inc/stm8s_it.h | 0 Software/Firmware/README.md | 9 +++++++++ .../Firmware/STM8S_StdPeriph_Lib/inc/stm8s.h | 0 .../Firmware/STM8S_StdPeriph_Lib/inc/stm8s_adc1.h | 0 .../Firmware/STM8S_StdPeriph_Lib/inc/stm8s_adc2.h | 0 .../Firmware/STM8S_StdPeriph_Lib/inc/stm8s_awu.h | 0 .../Firmware/STM8S_StdPeriph_Lib/inc/stm8s_beep.h | 0 .../Firmware/STM8S_StdPeriph_Lib/inc/stm8s_can.h | 0 .../Firmware/STM8S_StdPeriph_Lib/inc/stm8s_clk.h | 0 .../Firmware/STM8S_StdPeriph_Lib/inc/stm8s_exti.h | 0 .../Firmware/STM8S_StdPeriph_Lib/inc/stm8s_flash.h | 0 .../Firmware/STM8S_StdPeriph_Lib/inc/stm8s_gpio.h | 0 .../Firmware/STM8S_StdPeriph_Lib/inc/stm8s_i2c.h | 0 .../Firmware/STM8S_StdPeriph_Lib/inc/stm8s_itc.h | 0 .../Firmware/STM8S_StdPeriph_Lib/inc/stm8s_iwdg.h | 0 .../Firmware/STM8S_StdPeriph_Lib/inc/stm8s_rst.h | 0 .../Firmware/STM8S_StdPeriph_Lib/inc/stm8s_spi.h | 0 .../Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim1.h | 0 .../Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim2.h | 0 .../Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim3.h | 0 .../Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim4.h | 0 .../Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim5.h | 0 .../Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim6.h | 0 .../Firmware/STM8S_StdPeriph_Lib/inc/stm8s_uart1.h | 0 .../Firmware/STM8S_StdPeriph_Lib/inc/stm8s_uart2.h | 0 .../Firmware/STM8S_StdPeriph_Lib/inc/stm8s_uart3.h | 0 .../Firmware/STM8S_StdPeriph_Lib/inc/stm8s_uart4.h | 0 .../Firmware/STM8S_StdPeriph_Lib/inc/stm8s_wwdg.h | 0 .../Firmware/STM8S_StdPeriph_Lib/src/stm8s_adc1.c | 0 .../Firmware/STM8S_StdPeriph_Lib/src/stm8s_adc2.c | 0 .../Firmware/STM8S_StdPeriph_Lib/src/stm8s_awu.c | 0 .../Firmware/STM8S_StdPeriph_Lib/src/stm8s_beep.c | 0 .../Firmware/STM8S_StdPeriph_Lib/src/stm8s_can.c | 0 .../Firmware/STM8S_StdPeriph_Lib/src/stm8s_clk.c | 0 .../Firmware/STM8S_StdPeriph_Lib/src/stm8s_exti.c | 0 .../Firmware/STM8S_StdPeriph_Lib/src/stm8s_flash.c | 0 .../Firmware/STM8S_StdPeriph_Lib/src/stm8s_gpio.c | 0 .../Firmware/STM8S_StdPeriph_Lib/src/stm8s_i2c.c | 0 .../Firmware/STM8S_StdPeriph_Lib/src/stm8s_itc.c | 0 .../Firmware/STM8S_StdPeriph_Lib/src/stm8s_iwdg.c | 0 .../Firmware/STM8S_StdPeriph_Lib/src/stm8s_rst.c | 0 .../Firmware/STM8S_StdPeriph_Lib/src/stm8s_spi.c | 0 .../Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim1.c | 0 .../Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim2.c | 0 .../Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim3.c | 0 .../Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim4.c | 0 .../Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim5.c | 0 .../Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim6.c | 0 .../Firmware/STM8S_StdPeriph_Lib/src/stm8s_uart1.c | 0 .../Firmware/STM8S_StdPeriph_Lib/src/stm8s_uart2.c | 0 .../Firmware/STM8S_StdPeriph_Lib/src/stm8s_uart3.c | 0 .../Firmware/STM8S_StdPeriph_Lib/src/stm8s_uart4.c | 0 .../Firmware/STM8S_StdPeriph_Lib/src/stm8s_wwdg.c | 0 .../Firmware/Src/ApplicationBuilder.c | 0 .../Firmware/Src/ClockConfigurator.c | 0 {software => Software}/Firmware/Src/Logger.c | 0 .../Firmware/Src/MeasurementCollector.c | 0 .../Firmware/Src/MeasurementFrame.c | 0 .../Firmware/Src/TimerConfigurator.c | 0 {software => Software}/Firmware/Src/UserInterface.c | 0 .../Firmware/Src/VoltageSensorActualValue.c | 0 {software => Software}/Firmware/Src/main.c | 0 {software => Software}/Firmware/Src/stm8s_it.c | 0 {software => Software}/Firmware/doxygen.cfg | 0 {software => Software}/Firmware/uncrustify.cfg | 0 Software/README.md | 5 +++++ 117 files changed, 27 insertions(+), 6 deletions(-) rename {documentation/diagrams => Documentation/Diagrams}/ArchitectureOverview-1.png (100%) rename {documentation/diagrams => Documentation/Diagrams}/ArchitectureOverview.tex (100%) rename {documentation/diagrams => Documentation/Diagrams}/HostArchitecture-1.png (100%) rename {documentation/diagrams => Documentation/Diagrams}/HostArchitecture.tex (100%) rename {documentation/diagrams => Documentation/Diagrams}/UARTFrameFormat-1.png (100%) rename {documentation/diagrams => Documentation/Diagrams}/UARTFrameFormat.tex (100%) rename {documentation/diagrams => Documentation/Diagrams}/creatediagrams.sh (100%) rename {documentation/pictures => Documentation/Pictures}/pcb_01_09_2019.jpg (100%) rename {documentation/pictures => Documentation/Pictures}/pcb_04_08_2019.jpg (100%) rename {documentation/pictures => Documentation/Pictures}/pcb_13_07_2019.jpg (100%) rename {documentation/pictures => Documentation/Pictures}/pcb_20_07_2019.jpg (100%) rename {documentation/pictures => Documentation/Pictures}/render_26_05_2019.png (100%) rename .gitignore => Hardware/Sensor/.gitignore (100%) rename {hardware => Hardware}/Sensor/DataAcquisition.pro (100%) rename {hardware => Hardware}/Sensor/DataAcquisition.sch (100%) rename {hardware => Hardware}/Sensor/IonizationChamber.pretty/IonizationChamberHVShield.kicad_mod (100%) rename {hardware => Hardware}/Sensor/IonizationChamber.pretty/IonizationChamberSensor.kicad_mod (100%) rename {hardware => Hardware}/Sensor/IonizationChamber.pretty/IonizationChamberShield.kicad_mod (100%) rename {hardware => Hardware}/Sensor/IonizationChamber.pretty/SwitchButtonGeneric.kicad_mod (100%) rename {hardware => Hardware}/Sensor/chamber.kicad_pcb (100%) rename {hardware => Hardware}/Sensor/chamber.pro (100%) rename {hardware => Hardware}/Sensor/chamber.sch (100%) rename {hardware => Hardware}/Sensor/fp-info-cache (100%) rename {hardware => Hardware}/Sensor/sym-lib-table (100%) rename {simulation => Simulation}/Electric/upperview.py (100%) rename {software => Software}/DataAcquisition/IonizationChamber.py (100%) create mode 100644 Software/DataAcquisition/README.md rename {software => Software}/DataAcquisition/boxplot.R (100%) rename {software => Software}/DataAcquisition/config.py (100%) rename {software => Software}/DataAcquisition/dmm.py (100%) rename {software => Software}/DataAcquisition/drawDiagramSingle.R (100%) rename {software => Software}/DataAcquisition/main.R (100%) rename {software => Software}/DataAcquisition/main.py (100%) rename {software => Software}/DataAcquisition/mcp3425.py (100%) rename {software => Software}/Firmware/.cproject (100%) rename {software => Software}/Firmware/.project (100%) rename {software => Software}/Firmware/CMakeLists.txt (100%) rename {software => Software}/Firmware/Inc/ApplicationBuilder.h (100%) rename {software => Software}/Firmware/Inc/BitHandler.h (100%) rename {software => Software}/Firmware/Inc/ClockConfigurator.h (100%) rename {software => Software}/Firmware/Inc/CommonDataTypes.h (100%) rename {software => Software}/Firmware/Inc/Logger.h (100%) rename {software => Software}/Firmware/Inc/MeasurementCollector.h (100%) rename {software => Software}/Firmware/Inc/MeasurementFrame.h (100%) rename {software => Software}/Firmware/Inc/PinoutConfiguration.h (100%) rename {software => Software}/Firmware/Inc/TimerConfigurator.h (100%) rename {software => Software}/Firmware/Inc/UserInterface.h (100%) rename {software => Software}/Firmware/Inc/VoltageSensorActualValue.h (100%) rename {software => Software}/Firmware/Inc/stm8s_conf.h (100%) rename {software => Software}/Firmware/Inc/stm8s_it.h (100%) create mode 100644 Software/Firmware/README.md rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/inc/stm8s.h (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_adc1.h (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_adc2.h (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_awu.h (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_beep.h (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_can.h (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_clk.h (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_exti.h (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_flash.h (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_gpio.h (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_i2c.h (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_itc.h (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_iwdg.h (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_rst.h (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_spi.h (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim1.h (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim2.h (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim3.h (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim4.h (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim5.h (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim6.h (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_uart1.h (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_uart2.h (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_uart3.h (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_uart4.h (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_wwdg.h (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/src/stm8s_adc1.c (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/src/stm8s_adc2.c (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/src/stm8s_awu.c (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/src/stm8s_beep.c (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/src/stm8s_can.c (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/src/stm8s_clk.c (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/src/stm8s_exti.c (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/src/stm8s_flash.c (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/src/stm8s_gpio.c (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/src/stm8s_i2c.c (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/src/stm8s_itc.c (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/src/stm8s_iwdg.c (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/src/stm8s_rst.c (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/src/stm8s_spi.c (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim1.c (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim2.c (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim3.c (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim4.c (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim5.c (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim6.c (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/src/stm8s_uart1.c (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/src/stm8s_uart2.c (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/src/stm8s_uart3.c (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/src/stm8s_uart4.c (100%) rename {software => Software}/Firmware/STM8S_StdPeriph_Lib/src/stm8s_wwdg.c (100%) rename {software => Software}/Firmware/Src/ApplicationBuilder.c (100%) rename {software => Software}/Firmware/Src/ClockConfigurator.c (100%) rename {software => Software}/Firmware/Src/Logger.c (100%) rename {software => Software}/Firmware/Src/MeasurementCollector.c (100%) rename {software => Software}/Firmware/Src/MeasurementFrame.c (100%) rename {software => Software}/Firmware/Src/TimerConfigurator.c (100%) rename {software => Software}/Firmware/Src/UserInterface.c (100%) rename {software => Software}/Firmware/Src/VoltageSensorActualValue.c (100%) rename {software => Software}/Firmware/Src/main.c (100%) rename {software => Software}/Firmware/Src/stm8s_it.c (100%) rename {software => Software}/Firmware/doxygen.cfg (100%) rename {software => Software}/Firmware/uncrustify.cfg (100%) create mode 100644 Software/README.md diff --git a/.travis.yml b/.travis.yml index c8314d2..49ac51a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ matrix: sudo: true before_install: - sudo apt-get install -y sdcc cmake - - cd ./software/Firmware + - cd ./Software/Firmware script: - sdcc --version - mkdir build_directory @@ -20,7 +20,7 @@ matrix: sudo: true before_install: - sudo apt-get install -y texlive-latex-base texlive-latex-extra texlive-extra-utils poppler-utils - - cd ./documentation/diagrams + - cd ./Documentation/Diagrams script: - chmod +x ./creatediagrams.sh - ./creatediagrams.sh @@ -31,7 +31,7 @@ matrix: sudo: true before_install: - sudo apt-get install -y cppcheck - - cd ./software/Firmware + - cd ./Software/Firmware script: - cppcheck --enable=all --inline-suppr --force --quiet --error-exitcode=1 Src/* Inc/* @@ -42,7 +42,7 @@ matrix: before_install: - sudo apt-get install -y python3-pip - pip3 install pyflakes - - cd ./software/DataAcquisition + - cd ./Software/DataAcquisition script: - pyflakes *.py diff --git a/documentation/diagrams/ArchitectureOverview-1.png b/Documentation/Diagrams/ArchitectureOverview-1.png similarity index 100% rename from documentation/diagrams/ArchitectureOverview-1.png rename to Documentation/Diagrams/ArchitectureOverview-1.png diff --git a/documentation/diagrams/ArchitectureOverview.tex b/Documentation/Diagrams/ArchitectureOverview.tex similarity index 100% rename from documentation/diagrams/ArchitectureOverview.tex rename to Documentation/Diagrams/ArchitectureOverview.tex diff --git a/documentation/diagrams/HostArchitecture-1.png b/Documentation/Diagrams/HostArchitecture-1.png similarity index 100% rename from documentation/diagrams/HostArchitecture-1.png rename to Documentation/Diagrams/HostArchitecture-1.png diff --git a/documentation/diagrams/HostArchitecture.tex b/Documentation/Diagrams/HostArchitecture.tex similarity index 100% rename from documentation/diagrams/HostArchitecture.tex rename to Documentation/Diagrams/HostArchitecture.tex diff --git a/documentation/diagrams/UARTFrameFormat-1.png b/Documentation/Diagrams/UARTFrameFormat-1.png similarity index 100% rename from documentation/diagrams/UARTFrameFormat-1.png rename to Documentation/Diagrams/UARTFrameFormat-1.png diff --git a/documentation/diagrams/UARTFrameFormat.tex b/Documentation/Diagrams/UARTFrameFormat.tex similarity index 100% rename from documentation/diagrams/UARTFrameFormat.tex rename to Documentation/Diagrams/UARTFrameFormat.tex diff --git a/documentation/diagrams/creatediagrams.sh b/Documentation/Diagrams/creatediagrams.sh similarity index 100% rename from documentation/diagrams/creatediagrams.sh rename to Documentation/Diagrams/creatediagrams.sh diff --git a/documentation/pictures/pcb_01_09_2019.jpg b/Documentation/Pictures/pcb_01_09_2019.jpg similarity index 100% rename from documentation/pictures/pcb_01_09_2019.jpg rename to Documentation/Pictures/pcb_01_09_2019.jpg diff --git a/documentation/pictures/pcb_04_08_2019.jpg b/Documentation/Pictures/pcb_04_08_2019.jpg similarity index 100% rename from documentation/pictures/pcb_04_08_2019.jpg rename to Documentation/Pictures/pcb_04_08_2019.jpg diff --git a/documentation/pictures/pcb_13_07_2019.jpg b/Documentation/Pictures/pcb_13_07_2019.jpg similarity index 100% rename from documentation/pictures/pcb_13_07_2019.jpg rename to Documentation/Pictures/pcb_13_07_2019.jpg diff --git a/documentation/pictures/pcb_20_07_2019.jpg b/Documentation/Pictures/pcb_20_07_2019.jpg similarity index 100% rename from documentation/pictures/pcb_20_07_2019.jpg rename to Documentation/Pictures/pcb_20_07_2019.jpg diff --git a/documentation/pictures/render_26_05_2019.png b/Documentation/Pictures/render_26_05_2019.png similarity index 100% rename from documentation/pictures/render_26_05_2019.png rename to Documentation/Pictures/render_26_05_2019.png diff --git a/.gitignore b/Hardware/Sensor/.gitignore similarity index 100% rename from .gitignore rename to Hardware/Sensor/.gitignore diff --git a/hardware/Sensor/DataAcquisition.pro b/Hardware/Sensor/DataAcquisition.pro similarity index 100% rename from hardware/Sensor/DataAcquisition.pro rename to Hardware/Sensor/DataAcquisition.pro diff --git a/hardware/Sensor/DataAcquisition.sch b/Hardware/Sensor/DataAcquisition.sch similarity index 100% rename from hardware/Sensor/DataAcquisition.sch rename to Hardware/Sensor/DataAcquisition.sch diff --git a/hardware/Sensor/IonizationChamber.pretty/IonizationChamberHVShield.kicad_mod b/Hardware/Sensor/IonizationChamber.pretty/IonizationChamberHVShield.kicad_mod similarity index 100% rename from hardware/Sensor/IonizationChamber.pretty/IonizationChamberHVShield.kicad_mod rename to Hardware/Sensor/IonizationChamber.pretty/IonizationChamberHVShield.kicad_mod diff --git a/hardware/Sensor/IonizationChamber.pretty/IonizationChamberSensor.kicad_mod b/Hardware/Sensor/IonizationChamber.pretty/IonizationChamberSensor.kicad_mod similarity index 100% rename from hardware/Sensor/IonizationChamber.pretty/IonizationChamberSensor.kicad_mod rename to Hardware/Sensor/IonizationChamber.pretty/IonizationChamberSensor.kicad_mod diff --git a/hardware/Sensor/IonizationChamber.pretty/IonizationChamberShield.kicad_mod b/Hardware/Sensor/IonizationChamber.pretty/IonizationChamberShield.kicad_mod similarity index 100% rename from hardware/Sensor/IonizationChamber.pretty/IonizationChamberShield.kicad_mod rename to Hardware/Sensor/IonizationChamber.pretty/IonizationChamberShield.kicad_mod diff --git a/hardware/Sensor/IonizationChamber.pretty/SwitchButtonGeneric.kicad_mod b/Hardware/Sensor/IonizationChamber.pretty/SwitchButtonGeneric.kicad_mod similarity index 100% rename from hardware/Sensor/IonizationChamber.pretty/SwitchButtonGeneric.kicad_mod rename to Hardware/Sensor/IonizationChamber.pretty/SwitchButtonGeneric.kicad_mod diff --git a/hardware/Sensor/chamber.kicad_pcb b/Hardware/Sensor/chamber.kicad_pcb similarity index 100% rename from hardware/Sensor/chamber.kicad_pcb rename to Hardware/Sensor/chamber.kicad_pcb diff --git a/hardware/Sensor/chamber.pro b/Hardware/Sensor/chamber.pro similarity index 100% rename from hardware/Sensor/chamber.pro rename to Hardware/Sensor/chamber.pro diff --git a/hardware/Sensor/chamber.sch b/Hardware/Sensor/chamber.sch similarity index 100% rename from hardware/Sensor/chamber.sch rename to Hardware/Sensor/chamber.sch diff --git a/hardware/Sensor/fp-info-cache b/Hardware/Sensor/fp-info-cache similarity index 100% rename from hardware/Sensor/fp-info-cache rename to Hardware/Sensor/fp-info-cache diff --git a/hardware/Sensor/sym-lib-table b/Hardware/Sensor/sym-lib-table similarity index 100% rename from hardware/Sensor/sym-lib-table rename to Hardware/Sensor/sym-lib-table diff --git a/README.md b/README.md index f826b35..2aa1ce0 100755 --- a/README.md +++ b/README.md @@ -10,14 +10,14 @@ When air's atoms are hit by radioactive particles, an ion-pair is produced. Ions They will try to "meet each other" (I don't know how to explain it) thus creating a current. This current can be measured. The current is proportional to amount of ion-pairs. Amount of ion-pairs is proportional to radioactivity level. -![architecture](https://raw.githubusercontent.com/RobertGawron/IonizationChamber/master/documentation/pictures/pcb_01_09_2019.jpg) +![architecture](https://raw.githubusercontent.com/RobertGawron/IonizationChamber/master/Documentation/Pictures/pcb_01_09_2019.jpg) ## System architecture It is designed in a way that the device can work remotely, e.g. no connection via USB cable to user’s PC is needed. -![architecture](https://raw.githubusercontent.com/RobertGawron/IonizationChamber/master/documentation/diagrams/ArchitectureOverview-1.png) +![architecture](https://raw.githubusercontent.com/RobertGawron/IonizationChamber/master/Documentation/Diagrams/ArchitectureOverview-1.png) Remarks: * Amplifier has three stages (first stage is transimpedance amplifier, not FET like most projects use). diff --git a/simulation/Electric/upperview.py b/Simulation/Electric/upperview.py similarity index 100% rename from simulation/Electric/upperview.py rename to Simulation/Electric/upperview.py diff --git a/software/DataAcquisition/IonizationChamber.py b/Software/DataAcquisition/IonizationChamber.py similarity index 100% rename from software/DataAcquisition/IonizationChamber.py rename to Software/DataAcquisition/IonizationChamber.py diff --git a/Software/DataAcquisition/README.md b/Software/DataAcquisition/README.md new file mode 100644 index 0000000..062ba94 --- /dev/null +++ b/Software/DataAcquisition/README.md @@ -0,0 +1,7 @@ +# Firmware + +* ["Data processing and firmware flashing" node architecture +](https://github.com/RobertGawron/IonizationChamber/wiki/%22Data-processing-and-firmware-flashing%22-node-architecture +) +* [Setting up development environment on Linux +](https://github.com/RobertGawron/IonizationChamber/wiki/Setting-up-development-environment-on-Linux) diff --git a/software/DataAcquisition/boxplot.R b/Software/DataAcquisition/boxplot.R similarity index 100% rename from software/DataAcquisition/boxplot.R rename to Software/DataAcquisition/boxplot.R diff --git a/software/DataAcquisition/config.py b/Software/DataAcquisition/config.py similarity index 100% rename from software/DataAcquisition/config.py rename to Software/DataAcquisition/config.py diff --git a/software/DataAcquisition/dmm.py b/Software/DataAcquisition/dmm.py similarity index 100% rename from software/DataAcquisition/dmm.py rename to Software/DataAcquisition/dmm.py diff --git a/software/DataAcquisition/drawDiagramSingle.R b/Software/DataAcquisition/drawDiagramSingle.R similarity index 100% rename from software/DataAcquisition/drawDiagramSingle.R rename to Software/DataAcquisition/drawDiagramSingle.R diff --git a/software/DataAcquisition/main.R b/Software/DataAcquisition/main.R similarity index 100% rename from software/DataAcquisition/main.R rename to Software/DataAcquisition/main.R diff --git a/software/DataAcquisition/main.py b/Software/DataAcquisition/main.py similarity index 100% rename from software/DataAcquisition/main.py rename to Software/DataAcquisition/main.py diff --git a/software/DataAcquisition/mcp3425.py b/Software/DataAcquisition/mcp3425.py similarity index 100% rename from software/DataAcquisition/mcp3425.py rename to Software/DataAcquisition/mcp3425.py diff --git a/software/Firmware/.cproject b/Software/Firmware/.cproject similarity index 100% rename from software/Firmware/.cproject rename to Software/Firmware/.cproject diff --git a/software/Firmware/.project b/Software/Firmware/.project similarity index 100% rename from software/Firmware/.project rename to Software/Firmware/.project diff --git a/software/Firmware/CMakeLists.txt b/Software/Firmware/CMakeLists.txt similarity index 100% rename from software/Firmware/CMakeLists.txt rename to Software/Firmware/CMakeLists.txt diff --git a/software/Firmware/Inc/ApplicationBuilder.h b/Software/Firmware/Inc/ApplicationBuilder.h similarity index 100% rename from software/Firmware/Inc/ApplicationBuilder.h rename to Software/Firmware/Inc/ApplicationBuilder.h diff --git a/software/Firmware/Inc/BitHandler.h b/Software/Firmware/Inc/BitHandler.h similarity index 100% rename from software/Firmware/Inc/BitHandler.h rename to Software/Firmware/Inc/BitHandler.h diff --git a/software/Firmware/Inc/ClockConfigurator.h b/Software/Firmware/Inc/ClockConfigurator.h similarity index 100% rename from software/Firmware/Inc/ClockConfigurator.h rename to Software/Firmware/Inc/ClockConfigurator.h diff --git a/software/Firmware/Inc/CommonDataTypes.h b/Software/Firmware/Inc/CommonDataTypes.h similarity index 100% rename from software/Firmware/Inc/CommonDataTypes.h rename to Software/Firmware/Inc/CommonDataTypes.h diff --git a/software/Firmware/Inc/Logger.h b/Software/Firmware/Inc/Logger.h similarity index 100% rename from software/Firmware/Inc/Logger.h rename to Software/Firmware/Inc/Logger.h diff --git a/software/Firmware/Inc/MeasurementCollector.h b/Software/Firmware/Inc/MeasurementCollector.h similarity index 100% rename from software/Firmware/Inc/MeasurementCollector.h rename to Software/Firmware/Inc/MeasurementCollector.h diff --git a/software/Firmware/Inc/MeasurementFrame.h b/Software/Firmware/Inc/MeasurementFrame.h similarity index 100% rename from software/Firmware/Inc/MeasurementFrame.h rename to Software/Firmware/Inc/MeasurementFrame.h diff --git a/software/Firmware/Inc/PinoutConfiguration.h b/Software/Firmware/Inc/PinoutConfiguration.h similarity index 100% rename from software/Firmware/Inc/PinoutConfiguration.h rename to Software/Firmware/Inc/PinoutConfiguration.h diff --git a/software/Firmware/Inc/TimerConfigurator.h b/Software/Firmware/Inc/TimerConfigurator.h similarity index 100% rename from software/Firmware/Inc/TimerConfigurator.h rename to Software/Firmware/Inc/TimerConfigurator.h diff --git a/software/Firmware/Inc/UserInterface.h b/Software/Firmware/Inc/UserInterface.h similarity index 100% rename from software/Firmware/Inc/UserInterface.h rename to Software/Firmware/Inc/UserInterface.h diff --git a/software/Firmware/Inc/VoltageSensorActualValue.h b/Software/Firmware/Inc/VoltageSensorActualValue.h similarity index 100% rename from software/Firmware/Inc/VoltageSensorActualValue.h rename to Software/Firmware/Inc/VoltageSensorActualValue.h diff --git a/software/Firmware/Inc/stm8s_conf.h b/Software/Firmware/Inc/stm8s_conf.h similarity index 100% rename from software/Firmware/Inc/stm8s_conf.h rename to Software/Firmware/Inc/stm8s_conf.h diff --git a/software/Firmware/Inc/stm8s_it.h b/Software/Firmware/Inc/stm8s_it.h similarity index 100% rename from software/Firmware/Inc/stm8s_it.h rename to Software/Firmware/Inc/stm8s_it.h diff --git a/Software/Firmware/README.md b/Software/Firmware/README.md new file mode 100644 index 0000000..1042de0 --- /dev/null +++ b/Software/Firmware/README.md @@ -0,0 +1,9 @@ +# Firmware + +* ["Data processing and firmware flashing" node architecture +](https://github.com/RobertGawron/IonizationChamber/wiki/%22Data-processing-and-firmware-flashing%22-node-architecture +) +* [Setting up development environment on Linux +](https://github.com/RobertGawron/IonizationChamber/wiki/Setting-up-development-environment-on-Linux) +* [Firmware compilation and hardware flashing +](https://github.com/RobertGawron/IonizationChamber/wiki/Firmware-compilation-and-hardware-flashing) \ No newline at end of file diff --git a/software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s.h b/Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s.h similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s.h rename to Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s.h diff --git a/software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_adc1.h b/Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_adc1.h similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_adc1.h rename to Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_adc1.h diff --git a/software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_adc2.h b/Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_adc2.h similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_adc2.h rename to Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_adc2.h diff --git a/software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_awu.h b/Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_awu.h similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_awu.h rename to Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_awu.h diff --git a/software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_beep.h b/Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_beep.h similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_beep.h rename to Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_beep.h diff --git a/software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_can.h b/Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_can.h similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_can.h rename to Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_can.h diff --git a/software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_clk.h b/Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_clk.h similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_clk.h rename to Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_clk.h diff --git a/software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_exti.h b/Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_exti.h similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_exti.h rename to Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_exti.h diff --git a/software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_flash.h b/Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_flash.h similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_flash.h rename to Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_flash.h diff --git a/software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_gpio.h b/Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_gpio.h similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_gpio.h rename to Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_gpio.h diff --git a/software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_i2c.h b/Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_i2c.h similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_i2c.h rename to Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_i2c.h diff --git a/software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_itc.h b/Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_itc.h similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_itc.h rename to Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_itc.h diff --git a/software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_iwdg.h b/Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_iwdg.h similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_iwdg.h rename to Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_iwdg.h diff --git a/software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_rst.h b/Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_rst.h similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_rst.h rename to Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_rst.h diff --git a/software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_spi.h b/Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_spi.h similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_spi.h rename to Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_spi.h diff --git a/software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim1.h b/Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim1.h similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim1.h rename to Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim1.h diff --git a/software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim2.h b/Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim2.h similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim2.h rename to Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim2.h diff --git a/software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim3.h b/Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim3.h similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim3.h rename to Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim3.h diff --git a/software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim4.h b/Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim4.h similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim4.h rename to Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim4.h diff --git a/software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim5.h b/Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim5.h similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim5.h rename to Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim5.h diff --git a/software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim6.h b/Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim6.h similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim6.h rename to Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_tim6.h diff --git a/software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_uart1.h b/Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_uart1.h similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_uart1.h rename to Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_uart1.h diff --git a/software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_uart2.h b/Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_uart2.h similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_uart2.h rename to Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_uart2.h diff --git a/software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_uart3.h b/Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_uart3.h similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_uart3.h rename to Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_uart3.h diff --git a/software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_uart4.h b/Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_uart4.h similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_uart4.h rename to Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_uart4.h diff --git a/software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_wwdg.h b/Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_wwdg.h similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_wwdg.h rename to Software/Firmware/STM8S_StdPeriph_Lib/inc/stm8s_wwdg.h diff --git a/software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_adc1.c b/Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_adc1.c similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_adc1.c rename to Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_adc1.c diff --git a/software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_adc2.c b/Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_adc2.c similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_adc2.c rename to Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_adc2.c diff --git a/software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_awu.c b/Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_awu.c similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_awu.c rename to Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_awu.c diff --git a/software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_beep.c b/Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_beep.c similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_beep.c rename to Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_beep.c diff --git a/software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_can.c b/Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_can.c similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_can.c rename to Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_can.c diff --git a/software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_clk.c b/Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_clk.c similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_clk.c rename to Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_clk.c diff --git a/software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_exti.c b/Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_exti.c similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_exti.c rename to Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_exti.c diff --git a/software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_flash.c b/Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_flash.c similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_flash.c rename to Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_flash.c diff --git a/software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_gpio.c b/Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_gpio.c similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_gpio.c rename to Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_gpio.c diff --git a/software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_i2c.c b/Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_i2c.c similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_i2c.c rename to Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_i2c.c diff --git a/software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_itc.c b/Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_itc.c similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_itc.c rename to Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_itc.c diff --git a/software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_iwdg.c b/Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_iwdg.c similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_iwdg.c rename to Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_iwdg.c diff --git a/software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_rst.c b/Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_rst.c similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_rst.c rename to Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_rst.c diff --git a/software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_spi.c b/Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_spi.c similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_spi.c rename to Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_spi.c diff --git a/software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim1.c b/Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim1.c similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim1.c rename to Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim1.c diff --git a/software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim2.c b/Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim2.c similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim2.c rename to Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim2.c diff --git a/software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim3.c b/Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim3.c similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim3.c rename to Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim3.c diff --git a/software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim4.c b/Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim4.c similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim4.c rename to Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim4.c diff --git a/software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim5.c b/Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim5.c similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim5.c rename to Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim5.c diff --git a/software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim6.c b/Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim6.c similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim6.c rename to Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_tim6.c diff --git a/software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_uart1.c b/Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_uart1.c similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_uart1.c rename to Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_uart1.c diff --git a/software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_uart2.c b/Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_uart2.c similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_uart2.c rename to Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_uart2.c diff --git a/software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_uart3.c b/Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_uart3.c similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_uart3.c rename to Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_uart3.c diff --git a/software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_uart4.c b/Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_uart4.c similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_uart4.c rename to Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_uart4.c diff --git a/software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_wwdg.c b/Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_wwdg.c similarity index 100% rename from software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_wwdg.c rename to Software/Firmware/STM8S_StdPeriph_Lib/src/stm8s_wwdg.c diff --git a/software/Firmware/Src/ApplicationBuilder.c b/Software/Firmware/Src/ApplicationBuilder.c similarity index 100% rename from software/Firmware/Src/ApplicationBuilder.c rename to Software/Firmware/Src/ApplicationBuilder.c diff --git a/software/Firmware/Src/ClockConfigurator.c b/Software/Firmware/Src/ClockConfigurator.c similarity index 100% rename from software/Firmware/Src/ClockConfigurator.c rename to Software/Firmware/Src/ClockConfigurator.c diff --git a/software/Firmware/Src/Logger.c b/Software/Firmware/Src/Logger.c similarity index 100% rename from software/Firmware/Src/Logger.c rename to Software/Firmware/Src/Logger.c diff --git a/software/Firmware/Src/MeasurementCollector.c b/Software/Firmware/Src/MeasurementCollector.c similarity index 100% rename from software/Firmware/Src/MeasurementCollector.c rename to Software/Firmware/Src/MeasurementCollector.c diff --git a/software/Firmware/Src/MeasurementFrame.c b/Software/Firmware/Src/MeasurementFrame.c similarity index 100% rename from software/Firmware/Src/MeasurementFrame.c rename to Software/Firmware/Src/MeasurementFrame.c diff --git a/software/Firmware/Src/TimerConfigurator.c b/Software/Firmware/Src/TimerConfigurator.c similarity index 100% rename from software/Firmware/Src/TimerConfigurator.c rename to Software/Firmware/Src/TimerConfigurator.c diff --git a/software/Firmware/Src/UserInterface.c b/Software/Firmware/Src/UserInterface.c similarity index 100% rename from software/Firmware/Src/UserInterface.c rename to Software/Firmware/Src/UserInterface.c diff --git a/software/Firmware/Src/VoltageSensorActualValue.c b/Software/Firmware/Src/VoltageSensorActualValue.c similarity index 100% rename from software/Firmware/Src/VoltageSensorActualValue.c rename to Software/Firmware/Src/VoltageSensorActualValue.c diff --git a/software/Firmware/Src/main.c b/Software/Firmware/Src/main.c similarity index 100% rename from software/Firmware/Src/main.c rename to Software/Firmware/Src/main.c diff --git a/software/Firmware/Src/stm8s_it.c b/Software/Firmware/Src/stm8s_it.c similarity index 100% rename from software/Firmware/Src/stm8s_it.c rename to Software/Firmware/Src/stm8s_it.c diff --git a/software/Firmware/doxygen.cfg b/Software/Firmware/doxygen.cfg similarity index 100% rename from software/Firmware/doxygen.cfg rename to Software/Firmware/doxygen.cfg diff --git a/software/Firmware/uncrustify.cfg b/Software/Firmware/uncrustify.cfg similarity index 100% rename from software/Firmware/uncrustify.cfg rename to Software/Firmware/uncrustify.cfg diff --git a/Software/README.md b/Software/README.md new file mode 100644 index 0000000..52a2cbb --- /dev/null +++ b/Software/README.md @@ -0,0 +1,5 @@ +# Software + +* ["Data processing and firmware flashing" node architecture +](https://github.com/RobertGawron/IonizationChamber/wiki/%22Data-processing-and-firmware-flashing%22-node-architecture +) From e139a503348cd3a6e0ec7a45802b9948a77c88ae Mon Sep 17 00:00:00 2001 From: Robert Gawron Date: Thu, 22 Oct 2020 11:55:36 +0200 Subject: [PATCH 2/2] remove pointless comments --- Software/Firmware/.gitignore | 1 + Software/Firmware/Inc/ApplicationBuilder.h | 9 +-------- Software/Firmware/Inc/BitHandler.h | 1 - Software/Firmware/Inc/ClockConfigurator.h | 9 +-------- Software/Firmware/Inc/CommonDataTypes.h | 9 +-------- Software/Firmware/Inc/Logger.h | 9 +-------- Software/Firmware/Inc/MeasurementCollector.h | 9 +-------- Software/Firmware/Inc/MeasurementFrame.h | 9 +-------- Software/Firmware/Inc/PinoutConfiguration.h | 8 +------- Software/Firmware/Inc/TimerConfigurator.h | 9 +-------- Software/Firmware/Inc/UserInterface.h | 9 +-------- Software/Firmware/Inc/VoltageSensorActualValue.h | 9 +-------- Software/Firmware/Src/ApplicationBuilder.c | 7 ------- Software/Firmware/Src/ClockConfigurator.c | 7 ------- Software/Firmware/Src/Logger.c | 7 ------- Software/Firmware/Src/MeasurementCollector.c | 7 ------- Software/Firmware/Src/MeasurementFrame.c | 7 ------- Software/Firmware/Src/TimerConfigurator.c | 7 ------- Software/Firmware/Src/UserInterface.c | 7 ------- Software/Firmware/Src/VoltageSensorActualValue.c | 7 ------- Software/Firmware/Src/main.c | 6 ------ 21 files changed, 11 insertions(+), 142 deletions(-) create mode 100644 Software/Firmware/.gitignore diff --git a/Software/Firmware/.gitignore b/Software/Firmware/.gitignore new file mode 100644 index 0000000..567609b --- /dev/null +++ b/Software/Firmware/.gitignore @@ -0,0 +1 @@ +build/ diff --git a/Software/Firmware/Inc/ApplicationBuilder.h b/Software/Firmware/Inc/ApplicationBuilder.h index 75c7ff4..c791f0e 100755 --- a/Software/Firmware/Inc/ApplicationBuilder.h +++ b/Software/Firmware/Inc/ApplicationBuilder.h @@ -1,10 +1,3 @@ -/* - * ApplicationBuilder.h - * - * Created on: 15 cze 2019 - * Author: robert - */ - #ifndef INC_APPLICATIONBUILDER_H_ #define INC_APPLICATIONBUILDER_H_ @@ -14,4 +7,4 @@ void ApplicationBuilder_Run(); void ApplicationBuilder_Tick(); -#endif /* INC_APPLICATIONBUILDER_H_ */ +#endif diff --git a/Software/Firmware/Inc/BitHandler.h b/Software/Firmware/Inc/BitHandler.h index 17ffcec..f86983f 100644 --- a/Software/Firmware/Inc/BitHandler.h +++ b/Software/Firmware/Inc/BitHandler.h @@ -1,7 +1,6 @@ #ifndef SRC_BITHANDLER_H_ #define SRC_BITHANDLER_H_ -// TODO a bit of type checking? #define GET_MSB(data) (data >> 8) #define GET_LSB(data) (data & 0xff) diff --git a/Software/Firmware/Inc/ClockConfigurator.h b/Software/Firmware/Inc/ClockConfigurator.h index d0117ff..fda1433 100755 --- a/Software/Firmware/Inc/ClockConfigurator.h +++ b/Software/Firmware/Inc/ClockConfigurator.h @@ -1,14 +1,7 @@ -/* - * ClockConfigurator.h - * - * Created on: 03.07.2019 - * Author: robert - */ - #ifndef INC_CLOCKCONFIGURATOR_H_ #define INC_CLOCKCONFIGURATOR_H_ void ClockConfigurator_Init(); -#endif /* INC_CLOCKCONFIGURATOR_H_ */ +#endif diff --git a/Software/Firmware/Inc/CommonDataTypes.h b/Software/Firmware/Inc/CommonDataTypes.h index ccc30f8..b37abc5 100644 --- a/Software/Firmware/Inc/CommonDataTypes.h +++ b/Software/Firmware/Inc/CommonDataTypes.h @@ -1,10 +1,3 @@ -/* - * CommonDataTypes.h - * - * Created on: 15 cze 2019 - * Author: robert - */ - #ifndef INC_COMMONDATATYPES_H_ #define INC_COMMONDATATYPES_H_ @@ -14,4 +7,4 @@ #include "stm8s.h" -#endif /* INC_COMMONDATATYPES_H_ */ +#endif diff --git a/Software/Firmware/Inc/Logger.h b/Software/Firmware/Inc/Logger.h index 3feeaac..46b975d 100644 --- a/Software/Firmware/Inc/Logger.h +++ b/Software/Firmware/Inc/Logger.h @@ -1,10 +1,3 @@ -/* - * DataLogger.h - * - * Created on: 16.06.2019 - * Author: robert - */ - #ifndef INC_LOGGER_H_ #define INC_LOGGER_H_ @@ -16,4 +9,4 @@ void Logger_Init(); void Logger_Print(Logger_DataFormat_t data); -#endif /* INC_LOGGER_H_ */ +#endif diff --git a/Software/Firmware/Inc/MeasurementCollector.h b/Software/Firmware/Inc/MeasurementCollector.h index 362e70a..a0b5e8d 100755 --- a/Software/Firmware/Inc/MeasurementCollector.h +++ b/Software/Firmware/Inc/MeasurementCollector.h @@ -1,10 +1,3 @@ -/* - * MeasurementCollector.h - * - * Created on: 15 cze 2019 - * Author: robert - */ - #ifndef INC_MEASUREMENTCOLLECTOR_H_ #define INC_MEASUREMENTCOLLECTOR_H_ @@ -12,4 +5,4 @@ void MeasurementCollector_Init(); void MeasurementCollector_Tick(); -#endif /* INC_MEASUREMENTCOLLECTOR_H_ */ +#endif diff --git a/Software/Firmware/Inc/MeasurementFrame.h b/Software/Firmware/Inc/MeasurementFrame.h index 55a9a39..85e32c6 100644 --- a/Software/Firmware/Inc/MeasurementFrame.h +++ b/Software/Firmware/Inc/MeasurementFrame.h @@ -1,10 +1,3 @@ -/* - * MeasurementFrame.h - * - * Created on: 06.07.2019 - * Author: robert - */ - #ifndef INC_MEASUREMENTFRAME_H_ #define INC_MEASUREMENTFRAME_H_ @@ -15,4 +8,4 @@ void MeasurementFrame_Create(uint8_t configuration, uint16_t data); /* Dependency injection. This module require a function that take character as an argument and print it somewhere. */ bool MeasurementFrame_Send(void (*sendFunction)(uint8_t)); -#endif /* INC_MEASUREMENTFRAME_H_ */ +#endif diff --git a/Software/Firmware/Inc/PinoutConfiguration.h b/Software/Firmware/Inc/PinoutConfiguration.h index 7766f11..b773b2e 100755 --- a/Software/Firmware/Inc/PinoutConfiguration.h +++ b/Software/Firmware/Inc/PinoutConfiguration.h @@ -1,9 +1,3 @@ -/* - * PinoutConfiguration.h - * - * Created on: 15 cze 2019 - * Author: robert - */ #include "CommonDataTypes.h" #ifndef INC_PINOUTCONFIGURATION_H_ @@ -26,4 +20,4 @@ #define PIN_I2C_SCL GPIO_PIN_4 #define PIN_I2C_SDA GPIO_PIN_5 -#endif /* INC_PINOUTCONFIGURATION_H_ */ +#endif diff --git a/Software/Firmware/Inc/TimerConfigurator.h b/Software/Firmware/Inc/TimerConfigurator.h index 0e7ea21..05814b5 100755 --- a/Software/Firmware/Inc/TimerConfigurator.h +++ b/Software/Firmware/Inc/TimerConfigurator.h @@ -1,13 +1,6 @@ -/* - * TimerConfigurator.h - * - * Created on: 06.07.2019 - * Author: robert - */ - #ifndef INC_TIMERCONFIGURATOR_H_ #define INC_TIMERCONFIGURATOR_H_ void TimerConfigurator_Init(); -#endif /* INC_TIMERCONFIGURATOR_H_ */ +#endif diff --git a/Software/Firmware/Inc/UserInterface.h b/Software/Firmware/Inc/UserInterface.h index 855734f..e90ec69 100755 --- a/Software/Firmware/Inc/UserInterface.h +++ b/Software/Firmware/Inc/UserInterface.h @@ -1,10 +1,3 @@ -/* - * UserInterface.h - * - * Created on: 30.06.2019 - * Author: robert - */ - #ifndef SRC_GUI_H_ #define SRC_USER_INTERFACE_H_ @@ -16,4 +9,4 @@ void UserInterface_Tick(); void UserInterface_ShowMessage(UserInterface_Status status); -#endif /* SRC_GUI_H_ */ +#endif diff --git a/Software/Firmware/Inc/VoltageSensorActualValue.h b/Software/Firmware/Inc/VoltageSensorActualValue.h index 08b3dff..759b15e 100644 --- a/Software/Firmware/Inc/VoltageSensorActualValue.h +++ b/Software/Firmware/Inc/VoltageSensorActualValue.h @@ -1,10 +1,3 @@ -/* - * VoltageSensorActualValue.h - * - * Created on: 04.06.2019 - * Author: robert - */ - #ifndef SRC_VOLTAGESENSORACTUALVALUE_H_ #define SRC_VOLTAGESENSORACTUALVALUE_H_ @@ -18,4 +11,4 @@ bool VoltageSensorActualValue_MeasureValue(VoltageSensorActualValue_MeasurementD uint8_t VoltageSensorActualValue_GetConfiguration(); -#endif /* SRC_VOLTAGESENSORACTUALVALUE_H_ */ +#endif diff --git a/Software/Firmware/Src/ApplicationBuilder.c b/Software/Firmware/Src/ApplicationBuilder.c index c101b28..00ac7bc 100644 --- a/Software/Firmware/Src/ApplicationBuilder.c +++ b/Software/Firmware/Src/ApplicationBuilder.c @@ -1,10 +1,3 @@ -/* - * ApplicationBuilder.c - * - * Created on: 15 cze 2019 - * Author: robert - */ - #include "ApplicationBuilder.h" #include "PinoutConfiguration.h" #include "ClockConfigurator.h" diff --git a/Software/Firmware/Src/ClockConfigurator.c b/Software/Firmware/Src/ClockConfigurator.c index d228a0b..fc865f8 100644 --- a/Software/Firmware/Src/ClockConfigurator.c +++ b/Software/Firmware/Src/ClockConfigurator.c @@ -1,10 +1,3 @@ -/* - * ClockConfigurator.c - * - * Created on: 03.07.2019 - * Author: robert - */ - #include "ClockConfigurator.h" #include "stm8s_clk.h" diff --git a/Software/Firmware/Src/Logger.c b/Software/Firmware/Src/Logger.c index 62f65da..8979311 100644 --- a/Software/Firmware/Src/Logger.c +++ b/Software/Firmware/Src/Logger.c @@ -1,10 +1,3 @@ -/* - * DataLogger.c - * - * Created on: 16.06.2019 - * Author: robert - */ - #include "Logger.h" #include "stm8s_uart1.h" #include "PinoutConfiguration.h" diff --git a/Software/Firmware/Src/MeasurementCollector.c b/Software/Firmware/Src/MeasurementCollector.c index 7826145..96858b1 100644 --- a/Software/Firmware/Src/MeasurementCollector.c +++ b/Software/Firmware/Src/MeasurementCollector.c @@ -1,10 +1,3 @@ -/* - * MeasurementCollector.c - * - * Created on: 15 cze 2019 - * Author: robert - */ - #include "MeasurementCollector.h" #include "VoltageSensorActualValue.h" #include "MeasurementFrame.h" diff --git a/Software/Firmware/Src/MeasurementFrame.c b/Software/Firmware/Src/MeasurementFrame.c index 49a8ef4..4115a58 100644 --- a/Software/Firmware/Src/MeasurementFrame.c +++ b/Software/Firmware/Src/MeasurementFrame.c @@ -1,10 +1,3 @@ -/* - * MeasurementFrame.c - * - * Created on: 06.07.2019 - * Author: robert - */ - #include "MeasurementFrame.h" #include "BitHandler.h" diff --git a/Software/Firmware/Src/TimerConfigurator.c b/Software/Firmware/Src/TimerConfigurator.c index 376791f..970fe28 100644 --- a/Software/Firmware/Src/TimerConfigurator.c +++ b/Software/Firmware/Src/TimerConfigurator.c @@ -1,10 +1,3 @@ -/* - * TimerConfigurator.c - * - * Created on: 06.07.2019 - * Author: robert - */ - #include "TimerConfigurator.h" #include "stm8s_tim1.h" diff --git a/Software/Firmware/Src/UserInterface.c b/Software/Firmware/Src/UserInterface.c index df601f4..a33d835 100644 --- a/Software/Firmware/Src/UserInterface.c +++ b/Software/Firmware/Src/UserInterface.c @@ -1,10 +1,3 @@ -/* - * UserInterface.c - * - * Created on: 30.06.2019 - * Author: robert - */ - #include "UserInterface.h" #include "PinoutConfiguration.h" diff --git a/Software/Firmware/Src/VoltageSensorActualValue.c b/Software/Firmware/Src/VoltageSensorActualValue.c index ee0a9be..a8f7317 100644 --- a/Software/Firmware/Src/VoltageSensorActualValue.c +++ b/Software/Firmware/Src/VoltageSensorActualValue.c @@ -1,10 +1,3 @@ -/* - * MCP3425A0T.c - * - * Created on: 04.06.2019 - * Author: robert - */ - #include "VoltageSensorActualValue.h" #include "PinoutConfiguration.h" #include "UserInterface.h" diff --git a/Software/Firmware/Src/main.c b/Software/Firmware/Src/main.c index 0f104f5..aa26d15 100644 --- a/Software/Firmware/Src/main.c +++ b/Software/Firmware/Src/main.c @@ -1,9 +1,3 @@ -/* - * main.c - * - * Created on: 04.06.2019 - * Author: robert. Based on stm8s-sdcc-template. - */ #include "stm8s.h" #include "stm8s_it.h" #include "ApplicationBuilder.h"