Merge remote-tracking branch 'origin/dev'

Author: fanfare-ff

docs/Getting Started/index.md

@@ -60,7 +60,7 @@ Now that your setup is complete, you can start developing your projects with Sen
 * Check out sample projects in `projects\` folder, and respective [Projects]({% link Projects/index.md %}) section
 * For troubleshooting or guidance, visit the [Help]({% link Help/index.md %}) section
 
-{: .note}
+{: .NOTE}
 If you are interested in contributing to SensEdu, visit the [Contributing]({% link Contributing/index.md %}) page and join our community!
 
 [Arduino IDE]: https://support.arduino.cc/hc/en-us/articles/360019833020-Download-and-install-Arduino-IDE

docs/Library/ADC.md

@@ -29,7 +29,7 @@ An overview of possible errors for ADC:
 * `0x2002`: Passed ADC instance is not either `ADC1`, `ADC2` nor `ADC3`
 * `0x2003`: ADC failed to disable
 * `0x2004`: ADC failed to power up
-* `0x2005`: Selected pin for ADC is not reachable. Refer to the [table]({% link Library/ADC.md %}#notes) to find proper pins for each ADC instance
+* `0x2005`: Selected pin for ADC is not reachable. Refer to the [table] to find proper pins for each ADC instance
 * `0x2006`: Unexpected pin number during initialization. Must be at least 1
 * `0x2007`: Unexpected address or memory size for DMA
 * `0x2008`: Unexpected sampling frequency. Must be at least 1kHz
@@ -80,7 +80,7 @@ typedef struct {
 * `mem_address`: DMA buffer address in memory (first element of the array)
 * `mem_size`: DMA buffer size
 
-#### Notes {#adc_table_id}
+#### Notes {#adc_mapping}
 {: .no_toc}
 
 Be aware of which pins you can use with selected ADC. Table below shows ADC connections. For example, you can't access `ADC3` with pin `A7`, cause it is only connected to `ADC1`. 
@@ -268,7 +268,7 @@ void SensEdu_ADC_ShortA4toA9(void);
 
 #### Notes
 {: .no_toc}
-* **In older board revisions**, microphone #2 is wired to pin `A9` (`PC3_C`), which is routed only to `ADC3`. This conflicts with project requiring x4 microphones, using `ADC1` and `ADC2` with x2 channels per ADC. To solve this problem, `_C` pins could be shorted to their `non_C` counterparts. This way pin `A4` (`PC3`) is bridged to `A9` (`PC3_C`), allowing microphone #2 to be accessed via any ADC, since `PC3` is shared between `ADC1` and `ADC2`. Refer to the table at [settings section]({% link Library/ADC.md %}#notes) for better understanding.
+* **In older board revisions**, microphone #2 is wired to pin `A9` (`PC3_C`), which is routed only to `ADC3`. This conflicts with project requiring x4 microphones, using `ADC1` and `ADC2` with x2 channels per ADC. To solve this problem, `_C` pins could be shorted to their `non_C` counterparts. This way pin `A4` (`PC3`) is bridged to `A9` (`PC3_C`), allowing microphone #2 to be accessed via any ADC, since `PC3` is shared between `ADC1` and `ADC2`. Refer to the [table] at settings section for better understanding.
 
 
 ## Examples
@@ -658,14 +658,14 @@ __attribute__((aligned(__SCB_DCACHE_LINE_SIZE))) uint16_t memory4adc[memory4adc_
 
 ### Reading ADC Data
 
-The STM32H7 microcontroller is equipped with three ADC modules, each capable of accessing multiple channels (refer to the [table] above). Reading the ADC values from a single channel is straightforward, as the data is stored consecutively in an array. 
+The STM32H7 microcontroller is equipped with three ADC modules, each capable of accessing multiple channels (refer to the ADC mapping [table] above). Reading the ADC values from a single channel is straightforward, as the data is stored consecutively in an array. 
 
 However, when reading data from multiple channels within a single ADC module, users must use different approach. The data for each channel is interleaved in the array, meaning that the data for each channel is stored one after the other, rather than all data from first channel followed by all data from second channel, and so forth. This structure is illustrated clearly in the following figure giving an example of using two channels with one ADC module. 
 
 <img src="{{site.baseurl}}/assets/images/ADC_Data_Flow.png" alt="drawing"/>
 {: .text-center}
 
-[table]: /SensEdu/Library/ADC/#adc_table_id
+[table]: /SensEdu/Library/ADC/#adc_mapping
 [this issue]: https://github.com/ShiegeChan/SensEdu/issues/8
 [STM32H747 Reference Manual]: https://www.st.com/resource/en/reference_manual/rm0399-stm32h745755-and-stm32h747757-advanced-armbased-32bit-mcus-stmicroelectronics.pdf
 [Manual Page]: https://www.st.com/resource/en/reference_manual/rm0399-stm32h745755-and-stm32h747757-advanced-armbased-32bit-mcus-stmicroelectronics.pdf

docs/Projects/EMG.md

@@ -0,0 +1,44 @@
+---
+title: EMG
+layout: default
+parent: Projects
+math: mathjax
+nav_order: 4
+---
+
+# EMG
+{: .fs-8 .fw-500 .no_toc}
+---
+
+Cool Description
+{: .fw-500}
+
+- TOC
+{:toc}
+
+## Introduction
+
+SensEdu is equipped with x2 [AD8222] Instrumentation Amplifier ([datasheet]).
+
+Each Amplifier is dual-channel, so we have 4 channels in total. All channels are accessible from the following Jumpers:
+* J9: 1st Channel of U5 -> outputs MIC5 - A0 - ADC12_INP4
+* J11: 2nd Channel of U5 -> outputs MIC6 - A2 - ADC12_INP9
+* J12: 1st Channel of U6 -> outputs MIC7 - A11 - ADC12_INP0
+* J20: 2nd Channel of U6 -> outputs MIC8 - A7 - ADC1_INP16
+
+Refer to the [ADC mapping table](/SensEdu/Library/ADC/#adc_mapping) for better understanding.
+
+Circuit for each of the amplifier:
+
+<img src="{{site.baseurl}}/assets/images/amp_circuit.png" alt="drawing"/>
+{: .text-center}
+
+## Test
+
+WASD Dark Souls for 4 channels?
+
+
+
+
+[AD8222]: https://www.analog.com/en/products/ad8222.html?doc=ad8222-KGD.pdf
+[datasheet]: https://www.analog.com/media/en/technical-documentation/data-sheets/AD8222.pdf

docs/assets/images/amp_circuit.png

@@ -20,13 +20,13 @@
 data = zeros(1,ITERATIONS);
 time_axis = zeros(1,ITERATIONS);
 
-tic;
 for it = 1:ITERATIONS
     % Data readings
     write(arduino, 't', "char"); % trigger arduino measurement
     time_axis(it) = toc;
-
+    tic
     data = read_data(arduino, DATA_LENGTH);
+    toc
     plot_data(data);
 end
 

libraries/SensEdu/examples/Basic_UltraSound/matlab/Basic_UltraSound_ReadData.m

@@ -12,7 +12,7 @@ uint8_t adc1_pins[adc1_pin_num] = {A0, A1, A2};
 uint8_t adc2_pins[adc2_pin_num] = {A4, A5, A6};
 
 // must be:
-// 1. multiple of 32 words (64 half-words) to ensure cache coherence
+// 1. multiple of 32 bytes to ensure cache coherence
 // 2. properly aligned
 const uint16_t memory4adc1_size = 64 * adc1_pin_num;
 const uint16_t memory4adc2_size = 64 * adc2_pin_num;

libraries/SensEdu/examples/Basic_UltraSound/matlab/DAC_signal_cc.mat

@@ -8,7 +8,7 @@ uint32_t cntr = 0;
 /* -------------------------------------------------------------------------- */
 
 // must be:
-// 1. multiple of 32 words (64 half-words) to ensure cache coherence
+// 1. multiple of 32 bytes to ensure cache coherence
 // 2. properly aligned
 const uint16_t memory4adc_size = 128;
 __attribute__((aligned(__SCB_DCACHE_LINE_SIZE))) uint16_t memory4adc[memory4adc_size];