Skip to content

Commit

Permalink
added parallel processing functionality, broken timings
Browse files Browse the repository at this point in the history
  • Loading branch information
@markzakharyan
markzakharyan committed Jul 25, 2024
1 parent 95db481 commit dfc9f2a
Show file tree
Hide file tree
Showing 28 changed files with 459 additions and 87 deletions.
62 changes: 0 additions & 62 deletions .vscode/settings.json
View file

This file was deleted.

229 changes: 229 additions & 0 deletions m4/.vscode/c_cpp_properties.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,229 @@
//
// !!! WARNING !!! AUTO-GENERATED FILE!
// PLEASE DO NOT MODIFY IT AND USE "platformio.ini":
// https://docs.platformio.org/page/projectconf/section_env_build.html#build-flags
//
{
"configurations": [
{
"name": "PlatformIO",
"includePath": [
"/Users/space/Desktop/NEW_Firmware/include",
"/Users/space/Desktop/NEW_Firmware/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/SPI",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/RPC/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/rpclib/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/openamp_arduino/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/cores/arduino",
"/Users/space/.platformio/packages/framework-arduino-mbed/cores/arduino/api/deprecated",
"/Users/space/.platformio/packages/framework-arduino-mbed/cores/arduino/api/deprecated-avr-comp",
"/Users/space/.platformio/packages/framework-arduino-mbed/variants/GENERIC_STM32H747_M4",
"/Users/space/Desktop/NEW_Firmware/.pio/libdeps/giga_r1_m4/Portenta_H7_TimerInterrupt/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/Arduino_CAN/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/Arduino_H7_Video/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/Camera/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/Ethernet/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/GC2145",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/GPS/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/GSM/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/Himax_HM01B0",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/Himax_HM0360",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/KernelDebug/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/MCUboot/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/MLC/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/MRI/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/NDP/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/Nano33BLE_System/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/Nicla_System/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/OV7670",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/PDM/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/Portenta_Audio/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/Portenta_SDCARD/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/Portenta_SDRAM/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/SE05X/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/SFU/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/STM32H747_System/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/Scheduler/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/SocketWrapper/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/ThreadDebug/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/USBAudio",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/USBHID/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/USBHOST/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/USBMIDI",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/USBMSD/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/WiFi/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/Wire",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/doom/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/ea_malloc",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/mbed-memory-status",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/syntiant_ilib/src",
""
],
"browse": {
"limitSymbolsToIncludedHeaders": true,
"path": [
"/Users/space/Desktop/NEW_Firmware/include",
"/Users/space/Desktop/NEW_Firmware/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/SPI",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/RPC/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/rpclib/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/openamp_arduino/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/cores/arduino",
"/Users/space/.platformio/packages/framework-arduino-mbed/cores/arduino/api/deprecated",
"/Users/space/.platformio/packages/framework-arduino-mbed/cores/arduino/api/deprecated-avr-comp",
"/Users/space/.platformio/packages/framework-arduino-mbed/variants/GENERIC_STM32H747_M4",
"/Users/space/Desktop/NEW_Firmware/.pio/libdeps/giga_r1_m4/Portenta_H7_TimerInterrupt/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/Arduino_CAN/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/Arduino_H7_Video/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/Camera/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/Ethernet/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/GC2145",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/GPS/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/GSM/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/Himax_HM01B0",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/Himax_HM0360",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/KernelDebug/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/MCUboot/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/MLC/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/MRI/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/NDP/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/Nano33BLE_System/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/Nicla_System/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/OV7670",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/PDM/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/Portenta_Audio/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/Portenta_SDCARD/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/Portenta_SDRAM/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/SE05X/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/SFU/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/STM32H747_System/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/Scheduler/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/SocketWrapper/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/ThreadDebug/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/USBAudio",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/USBHID/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/USBHOST/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/USBMIDI",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/USBMSD/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/WiFi/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/Wire",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/doom/src",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/ea_malloc",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/mbed-memory-status",
"/Users/space/.platformio/packages/framework-arduino-mbed/libraries/syntiant_ilib/src",
""
]
},
"defines": [
"PLATFORMIO=60115",
"ARDUINO_GIGA",
"ARDUINO_GIGA_M4",
"GIGA_PINS",
"ARM_MATH_CM4",
"BT_UART_NO_3M_SUPPORT",
"CM4_BOOT_BY_APPLICATION",
"__CMSIS_RTOS",
"COMPONENT_4343W_FS=1",
"COMPONENT_CYW43XXX=1",
"COMPONENT_FLASHIAP=1",
"COMPONENT_QSPIF=1",
"COMPONENT_WHD=1",
"CORE_CM4",
"__CORTEX_M4",
"CYW43XXX_UNBUFFERED_UART",
"DEVICE_ANALOGIN=1",
"DEVICE_ANALOGOUT=1",
"DEVICE_CAN=1",
"DEVICE_CRC=1",
"DEVICE_FLASH=1",
"DEVICE_I2C=1",
"DEVICE_I2C_ASYNCH=1",
"DEVICE_I2CSLAVE=1",
"DEVICE_INTERRUPTIN=1",
"DEVICE_LPTICKER=1",
"DEVICE_PORTIN=1",
"DEVICE_PORTINOUT=1",
"DEVICE_PORTOUT=1",
"DEVICE_PWMOUT=1",
"DEVICE_QSPI=1",
"DEVICE_RESET_REASON=1",
"DEVICE_RTC=1",
"DEVICE_SERIAL=1",
"DEVICE_SERIAL_FC=1",
"DEVICE_SLEEP=1",
"DEVICE_SPI=1",
"DEVICE_SPI_ASYNCH=1",
"DEVICE_SPISLAVE=1",
"DEVICE_STDIO_MESSAGES=1",
"DEVICE_TRNG=1",
"DEVICE_USTICKER=1",
"DEVICE_WATCHDOG=1",
"EXTRA_IDLE_STACK_REQUIRED",
"FEATURE_BLE=1",
"__FPU_PRESENT=1",
"__MBED__=1",
"MBED_BUILD_TIMESTAMP=1714459159.841316",
"__MBED_CMSIS_RTOS_CM",
"MBED_MPU_CUSTOM",
"MBED_TICKLESS",
"MBEDTLS_FS_IO",
"MBEDTLS_SHA1_C",
"METAL_INTERNAL",
"METAL_MAX_DEVICE_REGIONS=2",
"NO_ATOMIC_64_SUPPORT",
"NO_VTOR_RELOCATE",
"RPMSG_BUFFER_SIZE=512",
"STM32H747xx",
"TARGET_CORDIO",
"TARGET_CORTEX",
"TARGET_CORTEX_M",
"TARGET_GENERIC_STM32H747_M4",
"TARGET_LIKE_CORTEX_M4",
"TARGET_LIKE_MBED",
"TARGET_M4",
"TARGET_MCU_STM32",
"TARGET_MCU_STM32H7",
"TARGET_MCU_STM32H747xI",
"TARGET_MCU_STM32H747xI_CM4",
"TARGET_NAME=GENERIC_STM32H747_M4",
"TARGET_RELEASE",
"TARGET_RTOS_M4_M7",
"TARGET_STM",
"TARGET_STM32H7",
"TARGET_STM32H747xI",
"TARGET_STM32H747xI_CM4",
"TOOLCHAIN_GCC",
"TOOLCHAIN_GCC_ARM",
"TRANSACTION_QUEUE_SIZE_SPI=2",
"USE_FULL_LL_DRIVER",
"USE_HAL_DRIVER",
"VIRTIO_DEVICE_ONLY",
"MBED_NO_GLOBAL_USING_DIRECTIVE=1",
"CORE_MAJOR=4",
"CORE_MINOR=1",
"CORE_PATCH=3",
"USE_ARDUINO_PINOUT",
"ARDUINO=10810",
"ARDUINO_ARCH_MBED",
"CM4_BINARY_START=0x08100000",
"CM4_BINARY_END=0x08200000",
""
],
"cStandard": "gnu11",
"cppStandard": "gnu++14",
"compilerPath": "/Users/space/.platformio/packages/toolchain-gccarmnoneeabi/bin/arm-none-eabi-gcc",
"compilerArgs": [
"-mcpu=cortex-m4",
"-mfloat-abi=softfp",
"-mfpu=fpv4-sp-d16",
"-mthumb",
"-iprefix/Users/space/.platformio/packages/framework-arduino-mbed/cores/arduino",
"@/Users/space/.platformio/packages/framework-arduino-mbed/variants/GENERIC_STM32H747_M4/includes.txt",
"-mfloat-abi=soft",
"-mfpu=fpv4-sp-d16",
""
]
}
],
"version": 4
}
0 .vscode/extensions.json → m4/.vscode/extensions.json
View file
File renamed without changes.
44 changes: 44 additions & 0 deletions m4/.vscode/launch.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
// AUTOMATICALLY GENERATED FILE. PLEASE DO NOT MODIFY IT MANUALLY
//
// PlatformIO Debugging Solution
//
// Documentation: https://docs.platformio.org/en/latest/plus/debugging.html
// Configuration: https://docs.platformio.org/en/latest/projectconf/sections/env/options/debug/index.html

{
"version": "0.2.0",
"configurations": [
{
"type": "platformio-debug",
"request": "launch",
"name": "PIO Debug",
"executable": "/Users/space/Desktop/NEW_Firmware/.pio/build/giga_r1_m4/firmware.elf",
"projectEnvName": "giga_r1_m4",
"toolchainBinDir": "/Users/space/.platformio/packages/toolchain-gccarmnoneeabi/bin",
"internalConsoleOptions": "openOnSessionStart",
"preLaunchTask": {
"type": "PlatformIO",
"task": "Pre-Debug"
}
},
{
"type": "platformio-debug",
"request": "launch",
"name": "PIO Debug (skip Pre-Debug)",
"executable": "/Users/space/Desktop/NEW_Firmware/.pio/build/giga_r1_m4/firmware.elf",
"projectEnvName": "giga_r1_m4",
"toolchainBinDir": "/Users/space/.platformio/packages/toolchain-gccarmnoneeabi/bin",
"internalConsoleOptions": "openOnSessionStart"
},
{
"type": "platformio-debug",
"request": "launch",
"name": "PIO Debug (without uploading)",
"executable": "/Users/space/Desktop/NEW_Firmware/.pio/build/giga_r1_m4/firmware.elf",
"projectEnvName": "giga_r1_m4",
"toolchainBinDir": "/Users/space/.platformio/packages/toolchain-gccarmnoneeabi/bin",
"internalConsoleOptions": "openOnSessionStart",
"loadMode": "manual"
}
]
}
0 include/README → m4/include/README
View file
File renamed without changes.
0 lib/README → m4/lib/README
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions platformio.ini → m4/platformio.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
; Please visit documentation for the other options and examples
; https://docs.platformio.org/page/projectconf.html

[env:giga_r1_m7]
platform = https://github.com/dberlin/platform-ststm32.git#develop
board = giga_r1_m7
[env:giga_r1_m4]
platform = https://github.com/afylab/platform-ststm32#develop
board = giga_r1_m4
framework = arduino
; build_flags = -fexceptions -std=gnu++1z
; build_unflags = -std=gnu++11
Expand Down
0 src/Config.h → m4/src/Config.h
View file
File renamed without changes.
0 src/FunctionRegistry.h → m4/src/FunctionRegistry.h
View file
File renamed without changes.
0 src/FunctionRegistryMacros.h → m4/src/FunctionRegistryMacros.h
View file
File renamed without changes.
4 changes: 0 additions & 4 deletions src/Peripherals/ADC/ADCBoard.h → m4/src/Peripherals/ADC/ADCBoard.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@ class ADCBoard {
commsController.transfer(send);
commsController.endTransaction();
digitalWrite(cs_pin, HIGH);
Serial.println(send);
}

uint16_t getConversionData(int adc_channel) {
Expand Down Expand Up @@ -220,9 +219,6 @@ class ADCBoard {
std::vector<double> continuousConvert(int channel_index, uint32_t frequency_us, uint32_t duration) {
std::vector<double> data;
uint32_t num_samples = duration / frequency_us;
Serial.println(duration);
Serial.println(frequency_us);
Serial.println(num_samples);
startContinuousConversion(channel_index);
for (uint32_t i = 0; i < num_samples; i++) {
data.push_back(ADC2DOUBLE(getConversionData(channel_index)));
Expand Down
1 change: 0 additions & 1 deletion src/Peripherals/ADC/ADCController.h → m4/src/Peripherals/ADC/ADCController.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ class ADCController : public Peripheral {
// for (auto channel : adc_channels) {
// channel->initialize();
// }
// Serial.println("ADC INITIALIZATION COMPLETE");
return OperationResult::Success();
}

Expand Down
0 src/Peripherals/DAC/DACChannel.h → m4/src/Peripherals/DAC/DACChannel.h
View file
File renamed without changes.
0 src/Peripherals/DAC/DACController.h → m4/src/Peripherals/DAC/DACController.h
View file
File renamed without changes.
Loading

0 comments on commit dfc9f2a

Please sign in to comment.