aboutsummaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rw-r--r--source/adc.cpp157
-rw-r--r--source/adc.hpp7
-rw-r--r--source/cordic.cpp18
-rw-r--r--source/cordic.hpp3
-rw-r--r--source/main.cpp97
-rw-r--r--source/samplebuffer.hpp3
-rw-r--r--source/sclock.cpp8
-rw-r--r--source/usbcfg.c4
8 files changed, 225 insertions, 72 deletions
diff --git a/source/adc.cpp b/source/adc.cpp
index b0c0312..b9fe34c 100644
--- a/source/adc.cpp
+++ b/source/adc.cpp
@@ -11,11 +11,26 @@
#include "adc.hpp"
+#if defined(TARGET_PLATFORM_L4)
+ADCDriver *ADC::m_driver = &ADCD1;
+ADCDriver *ADC::m_driver2 = &ADCD3;
+#else
ADCDriver *ADC::m_driver = &ADCD3;
+//ADCDriver *ADC::m_driver2 = &ADCD1; // TODO
+#endif
const ADCConfig ADC::m_config = {
.difsel = 0,
+#if defined(TARGET_PLATFORM_H7)
.calibration = 0,
+#endif
+};
+
+const ADCConfig ADC::m_config2 = {
+ .difsel = 0,
+#if defined(TARGET_PLATFORM_H7)
+ .calibration = 0,
+#endif
};
ADCConversionGroup ADC::m_group_config = {
@@ -25,11 +40,19 @@ ADCConversionGroup ADC::m_group_config = {
.error_cb = nullptr,
.cfgr = ADC_CFGR_EXTEN_RISING | ADC_CFGR_EXTSEL_SRC(13), /* TIM6_TRGO */
.cfgr2 = ADC_CFGR2_ROVSE | ADC_CFGR2_OVSR_1 | ADC_CFGR2_OVSS_0, // Oversampling 2x
+#if defined(TARGET_PLATFORM_H7)
.ccr = 0,
.pcsel = 0,
- .ltr1 = 0, .htr1 = 0x0FFF,
- .ltr2 = 0, .htr2 = 0x0FFF,
- .ltr3 = 0, .htr3 = 0x0FFF,
+ .ltr1 = 0, .htr1 = 4095,
+ .ltr2 = 0, .htr2 = 4095,
+ .ltr3 = 0, .htr3 = 4095,
+#else
+ .tr1 = ADC_TR(0, 4095),
+ .tr2 = ADC_TR(0, 4095),
+ .tr3 = ADC_TR(0, 4095),
+ .awd2cr = 0,
+ .awd3cr = 0,
+#endif
.smpr = {
ADC_SMPR1_SMP_AN5(ADC_SMPR_SMP_12P5), 0
},
@@ -39,54 +62,55 @@ ADCConversionGroup ADC::m_group_config = {
},
};
-std::array<std::array<uint32_t, 2>, 6> ADC::m_rate_presets = {{
- // Rate PLL N PLL P
- {/* 8k */ 80, 20},
- {/* 16k */ 80, 10},
- {/* 20k */ 80, 8},
- {/* 32k */ 80, 5},
- {/* 48k */ 96, 4},
- {/* 96k */ 288, 10}
-}};
+static bool readAltDone = false;
+static void readAltCallback(ADCDriver *)
+{
+ readAltDone = true;
+}
+ADCConversionGroup ADC::m_group_config2 = {
+ .circular = false,
+ .num_channels = 1,
+ .end_cb = readAltCallback,
+ .error_cb = nullptr,
+ .cfgr = ADC_CFGR_EXTEN_RISING | ADC_CFGR_EXTSEL_SRC(13), /* TIM6_TRGO */
+ .cfgr2 = ADC_CFGR2_ROVSE | ADC_CFGR2_OVSR_1 | ADC_CFGR2_OVSS_0, // Oversampling 2x
+#if defined(TARGET_PLATFORM_H7)
+ .ccr = 0,
+ .pcsel = 0,
+ .ltr1 = 0, .htr1 = 4095,
+ .ltr2 = 0, .htr2 = 4095,
+ .ltr3 = 0, .htr3 = 4095,
+#else
+ .tr1 = ADC_TR(0, 4095),
+ .tr2 = ADC_TR(0, 4095),
+ .tr3 = ADC_TR(0, 4095),
+ .awd2cr = 0,
+ .awd3cr = 0,
+#endif
+ .smpr = {
+ ADC_SMPR1_SMP_AN1(ADC_SMPR_SMP_12P5), 0
+ },
+ .sqr = {
+ ADC_SQR1_SQ1_N(ADC_CHANNEL_IN1),
+ 0, 0, 0
+ },
+};
adcsample_t *ADC::m_current_buffer = nullptr;
size_t ADC::m_current_buffer_size = 0;
ADC::Operation ADC::m_operation = nullptr;
-//static const ADCConfig m_config2 = {};
-//ADCConversionGroup m_group_config2 = {
-// .circular = false,
-// .num_channels = 1,
-// .end_cb = nullptr,
-// .error_cb = nullptr,
-// .cfgr = 0,
-// .cfgr2 = 0,
-// .ccr = 0,
-// .pcsel = 0,
-// .ltr1 = 0, .htr1 = 0x0FFF,
-// .ltr2 = 0, .htr2 = 0x0FFF,
-// .ltr3 = 0, .htr3 = 0x0FFF,
-// .smpr = {
-// ADC_SMPR1_SMP_AN5(ADC_SMPR_SMP_12P5), 0
-// },
-// .sqr = {
-// ADC_SQR1_SQ1_N(ADC_CHANNEL_IN10),
-// 0, 0, 0
-// },
-//};
-
void ADC::begin()
{
+#if defined(TARGET_PLATFORM_H7)
palSetPadMode(GPIOF, 3, PAL_MODE_INPUT_ANALOG);
-
- //palSetPadMode(GPIOC, 0, PAL_MODE_INPUT_ANALOG);
- //adcStart(&ADCD1, &m_config2);
- //adcsample_t val = 0;
- //adcConvert(&ADCD1, &m_group_config2, &val, 1);
- //adcStop(&ADCD1);
+#else
+ palSetPadMode(GPIOA, 0, PAL_MODE_INPUT_ANALOG); // Algorithm in
+ palSetPadMode(GPIOC, 0, PAL_MODE_INPUT_ANALOG); // Potentiometer 1
+#endif
adcStart(m_driver, &m_config);
- adcSTM32EnableVREF(m_driver);
+ adcStart(m_driver2, &m_config2);
}
void ADC::start(adcsample_t *buffer, size_t count, Operation operation)
@@ -109,8 +133,32 @@ void ADC::stop()
m_operation = nullptr;
}
+adcsample_t ADC::readAlt(unsigned int id)
+{
+ if (id != 0)
+ return 0;
+ static adcsample_t result[32] = {};
+ readAltDone = false;
+ adcStartConversion(m_driver2, &m_group_config2, result, 32);
+ while (!readAltDone)
+ ;
+ adcStopConversion(m_driver2);
+ return result[0];
+}
+
void ADC::setRate(SClock::Rate rate)
{
+#if defined(TARGET_PLATFORM_H7)
+ std::array<std::array<uint32_t, 2>, 6> m_rate_presets = {{
+ // Rate PLL N PLL P
+ {/* 8k */ 80, 20},
+ {/* 16k */ 80, 10},
+ {/* 20k */ 80, 8},
+ {/* 32k */ 80, 5},
+ {/* 48k */ 96, 4},
+ {/* 96k */ 288, 10}
+ }};
+
auto& preset = m_rate_presets[static_cast<unsigned int>(rate)];
auto pllbits = (preset[0] << RCC_PLL2DIVR_N2_Pos) |
(preset[1] << RCC_PLL2DIVR_P2_Pos);
@@ -131,6 +179,33 @@ void ADC::setRate(SClock::Rate rate)
: ADC_SMPR1_SMP_AN5(ADC_SMPR_SMP_2P5);
adcStart(m_driver, &m_config);
+#elif defined(TARGET_PLATFORM_L4)
+ std::array<std::array<uint32_t, 3>, 6> m_rate_presets = {{
+ // Rate PLLSAI2N R OVERSAMPLE
+ {/* 8k */ 16, 3, 1},
+ {/* 16k */ 32, 3, 1},
+ {/* 20k */ 40, 3, 1},
+ {/* 32k */ 64, 3, 1},
+ {/* 48k */ 24, 3, 0},
+ {/* 96k */ 48, 3, 0}
+ }};
+
+ auto& preset = m_rate_presets[static_cast<int>(rate)];
+ auto pllnr = (preset[0] << RCC_PLLSAI2CFGR_PLLSAI2N_Pos) |
+ (preset[1] << RCC_PLLSAI2CFGR_PLLSAI2R_Pos);
+ bool oversample = preset[2] != 0;
+
+ // Adjust PLLSAI2
+ RCC->CR &= ~(RCC_CR_PLLSAI2ON);
+ while ((RCC->CR & RCC_CR_PLLSAI2RDY) == RCC_CR_PLLSAI2RDY);
+ RCC->PLLSAI2CFGR = (RCC->PLLSAI2CFGR & ~(RCC_PLLSAI2CFGR_PLLSAI2N_Msk | RCC_PLLSAI2CFGR_PLLSAI2R_Msk)) | pllnr;
+ RCC->CR |= RCC_CR_PLLSAI2ON;
+ while ((RCC->CR & RCC_CR_PLLSAI2RDY) != RCC_CR_PLLSAI2RDY);
+
+ // Set 2x oversampling
+ m_group_config.cfgr2 = oversample ? ADC_CFGR2_ROVSE | ADC_CFGR2_OVSR_0 | ADC_CFGR2_OVSS_1 : 0;
+ m_group_config2.cfgr2 = oversample ? ADC_CFGR2_ROVSE | ADC_CFGR2_OVSR_0 | ADC_CFGR2_OVSS_1 : 0;
+#endif
}
void ADC::setOperation(ADC::Operation operation)
diff --git a/source/adc.hpp b/source/adc.hpp
index d9a435a..24a7fff 100644
--- a/source/adc.hpp
+++ b/source/adc.hpp
@@ -27,16 +27,19 @@ public:
static void start(adcsample_t *buffer, size_t count, Operation operation);
static void stop();
+ static adcsample_t readAlt(unsigned int id);
+
static void setRate(SClock::Rate rate);
static void setOperation(Operation operation);
private:
static ADCDriver *m_driver;
+ static ADCDriver *m_driver2;
static const ADCConfig m_config;
+ static const ADCConfig m_config2;
static ADCConversionGroup m_group_config;
-
- static std::array<std::array<uint32_t, 2>, 6> m_rate_presets;
+ static ADCConversionGroup m_group_config2;
static adcsample_t *m_current_buffer;
static size_t m_current_buffer_size;
diff --git a/source/cordic.cpp b/source/cordic.cpp
index 4852563..d2997f2 100644
--- a/source/cordic.cpp
+++ b/source/cordic.cpp
@@ -1,7 +1,8 @@
#include "cordic.hpp"
#include "hal.h"
-namespace math {
+namespace cordic {
+#if !defined(TARGET_PLATFORM_L4)
void init()
{
@@ -92,11 +93,16 @@ double tan(double x) {
return tanx;
}
-__attribute__((naked))
-double sqrt(double) {
- asm("vsqrt.f64 d0, d0; bx lr");
- return 0.;
-}
+#else // L4
+
+void init() {}
+
+double mod(double, double) { return 0; }
+
+double cos(double) { return 0; }
+double sin(double) { return 0; }
+double tan(double) { return 0; }
+#endif
}
diff --git a/source/cordic.hpp b/source/cordic.hpp
index 755fddb..5c52fe4 100644
--- a/source/cordic.hpp
+++ b/source/cordic.hpp
@@ -1,7 +1,7 @@
#ifndef CORDIC_HPP_
#define CORDIC_HPP_
-namespace math {
+namespace cordic {
constexpr double PI = 3.1415926535L;
void init();
@@ -11,7 +11,6 @@ namespace math {
double cos(double x);
double sin(double x);
double tan(double x);
- double sqrt(double x);
}
#endif // CORDIC_HPP_
diff --git a/source/main.cpp b/source/main.cpp
index 6e58510..0ec69b8 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -26,7 +26,7 @@ static_assert(sizeof(dacsample_t) == sizeof(uint16_t));
#include <array>
-constexpr unsigned int MAX_ELF_FILE_SIZE = 8 * 1024;
+constexpr unsigned int MAX_ELF_FILE_SIZE = 16 * 1024;
enum class RunStatus : char
{
@@ -50,13 +50,15 @@ static msg_t conversionMBBuffer[2];
static MAILBOX_DECL(conversionMB, conversionMBBuffer, 2);
// Thread for LED status and wakeup hold
+#if defined(TARGET_PLATFORM_H7)
__attribute__((section(".stacks")))
-static THD_WORKING_AREA(monitorThreadWA, 4096);
-/*extern "C"*/static THD_FUNCTION(monitorThread, arg);
+static THD_WORKING_AREA(monitorThreadWA, 1024);
+static THD_FUNCTION(monitorThread, arg);
+#endif
// Thread for managing the conversion task
__attribute__((section(".stacks")))
-static THD_WORKING_AREA(conversionThreadMonitorWA, 4096);
+static THD_WORKING_AREA(conversionThreadMonitorWA, 1024);
static THD_FUNCTION(conversionThreadMonitor, arg);
static thread_t *conversionThreadHandle = nullptr;
@@ -64,8 +66,14 @@ static thread_t *conversionThreadHandle = nullptr;
__attribute__((section(".stacks")))
static THD_WORKING_AREA(conversionThreadWA, 128); // All we do is enter unprivileged mode.
static THD_FUNCTION(conversionThread, arg);
+constexpr unsigned int conversionThreadUPWASize =
+#if defined(TARGET_PLATFORM_H7)
+ 62 * 1024;
+#else
+ 15 * 1024;
+#endif
__attribute__((section(".convdata")))
-static THD_WORKING_AREA(conversionThreadUPWA, 62 * 1024);
+static THD_WORKING_AREA(conversionThreadUPWA, conversionThreadUPWASize);
__attribute__((section(".convdata")))
static thread_t *conversionThreadMonitorHandle = nullptr;
@@ -75,12 +83,19 @@ static THD_WORKING_AREA(communicationThreadWA, 4096);
static THD_FUNCTION(communicationThread, arg);
static time_measurement_t conversion_time_measurement;
+#if defined(TARGET_PLATFORM_H7)
__attribute__((section(".convdata")))
static SampleBuffer samplesIn (reinterpret_cast<Sample *>(0x38000000)); // 16k
__attribute__((section(".convdata")))
static SampleBuffer samplesOut (reinterpret_cast<Sample *>(0x30004000)); // 16k
-
static SampleBuffer samplesSigGen (reinterpret_cast<Sample *>(0x30000000)); // 16k
+#else
+__attribute__((section(".convdata")))
+static SampleBuffer samplesIn (reinterpret_cast<Sample *>(0x20008000)); // 16k
+__attribute__((section(".convdata")))
+static SampleBuffer samplesOut (reinterpret_cast<Sample *>(0x2000C000)); // 16k
+static SampleBuffer samplesSigGen (reinterpret_cast<Sample *>(0x20010000)); // 16k
+#endif
static unsigned char elf_file_store[MAX_ELF_FILE_SIZE];
__attribute__((section(".convdata")))
@@ -108,16 +123,18 @@ int main()
DAC::begin();
SClock::begin();
USBSerial::begin();
- math::init();
+ cordic::init();
SClock::setRate(SClock::Rate::R32K);
ADC::setRate(SClock::Rate::R32K);
chTMObjectInit(&conversion_time_measurement);
+#if defined(TARGET_PLATFORM_H7)
chThdCreateStatic(
monitorThreadWA, sizeof(monitorThreadWA),
LOWPRIO,
monitorThread, nullptr);
+#endif
conversionThreadMonitorHandle = chThdCreateStatic(
conversionThreadMonitorWA, sizeof(conversionThreadMonitorWA),
NORMALPRIO + 1,
@@ -126,7 +143,8 @@ int main()
conversionThreadWA, sizeof(conversionThreadWA),
HIGHPRIO,
conversionThread,
- reinterpret_cast<void *>(reinterpret_cast<uint32_t>(conversionThreadUPWA) + 62 * 1024));
+ reinterpret_cast<void *>(reinterpret_cast<uint32_t>(conversionThreadUPWA) +
+ conversionThreadUPWASize));
chThdCreateStatic(
communicationThreadWA, sizeof(communicationThreadWA),
NORMALPRIO,
@@ -222,7 +240,11 @@ THD_FUNCTION(communicationThread, arg)
// 'i' - Sends an identifying string to confirm that this is the stmdsp device.
case 'i':
- USBSerial::write(reinterpret_cast<const uint8_t *>("stmdsp"), 6);
+#if defined(TARGET_PLATFORM_H7)
+ USBSerial::write(reinterpret_cast<const uint8_t *>("stmdsph"), 7);
+#else
+ USBSerial::write(reinterpret_cast<const uint8_t *>("stmdspl"), 7);
+#endif
break;
// 'I' - Sends the current run status.
@@ -370,11 +392,13 @@ THD_FUNCTION(conversionThread, stack)
reinterpret_cast<uint32_t>(stack));
}
+#if defined(TARGET_PLATFORM_H7)
THD_FUNCTION(monitorThread, arg)
{
(void)arg;
- bool erroron = false;
+ palSetLineMode(LINE_BUTTON, PAL_MODE_INPUT_PULLUP);
+
while (1) {
bool isidle = run_status == RunStatus::Idle;
auto led = isidle ? LINE_LED_GREEN : LINE_LED_YELLOW;
@@ -399,6 +423,7 @@ THD_FUNCTION(monitorThread, arg)
chThdSleepMilliseconds(500);
}
+ static bool erroron = false;
if (auto err = EM.hasError(); err ^ erroron) {
erroron = err;
if (err)
@@ -408,6 +433,7 @@ THD_FUNCTION(monitorThread, arg)
}
}
}
+#endif
void conversion_unprivileged_main()
{
@@ -439,24 +465,45 @@ void conversion_unprivileged_main()
void mpu_setup()
{
// Set up MPU for user algorithm
- // Region 2: Data for algorithm manager thread
+#if defined(TARGET_PLATFORM_H7)
+ // Region 2: Data for algorithm thread
+ // Region 3: Code for algorithm thread
+ // Region 4: User algorithm code
mpuConfigureRegion(MPU_REGION_2,
0x20000000,
MPU_RASR_ATTR_AP_RW_RW | MPU_RASR_ATTR_NON_CACHEABLE |
MPU_RASR_SIZE_64K |
MPU_RASR_ENABLE);
- // Region 3: Code for algorithm manager thread
mpuConfigureRegion(MPU_REGION_3,
0x0807F800,
MPU_RASR_ATTR_AP_RO_RO | MPU_RASR_ATTR_NON_CACHEABLE |
MPU_RASR_SIZE_2K |
MPU_RASR_ENABLE);
- // Region 4: Algorithm code
mpuConfigureRegion(MPU_REGION_4,
0x00000000,
MPU_RASR_ATTR_AP_RW_RW | MPU_RASR_ATTR_NON_CACHEABLE |
MPU_RASR_SIZE_64K |
MPU_RASR_ENABLE);
+#else
+ // Region 2: Data for algorithm thread and ADC/DAC buffers
+ // Region 3: Code for algorithm thread
+ // Region 4: User algorithm code
+ mpuConfigureRegion(MPU_REGION_2,
+ 0x20008000,
+ MPU_RASR_ATTR_AP_RW_RW | MPU_RASR_ATTR_NON_CACHEABLE |
+ MPU_RASR_SIZE_128K|
+ MPU_RASR_ENABLE);
+ mpuConfigureRegion(MPU_REGION_3,
+ 0x0807F800,
+ MPU_RASR_ATTR_AP_RO_RO | MPU_RASR_ATTR_NON_CACHEABLE |
+ MPU_RASR_SIZE_2K |
+ MPU_RASR_ENABLE);
+ mpuConfigureRegion(MPU_REGION_4,
+ 0x10000000,
+ MPU_RASR_ATTR_AP_RW_RW | MPU_RASR_ATTR_NON_CACHEABLE |
+ MPU_RASR_SIZE_32K |
+ MPU_RASR_ENABLE);
+#endif
}
void conversion_abort()
@@ -523,19 +570,28 @@ void port_syscall(struct port_extctx *ctxp, uint32_t n)
case 1:
{
using mathcall = void (*)();
- static mathcall funcs[4] = {
- reinterpret_cast<mathcall>(math::sin),
- reinterpret_cast<mathcall>(math::cos),
- reinterpret_cast<mathcall>(math::tan),
- reinterpret_cast<mathcall>(math::sqrt),
+ static mathcall funcs[3] = {
+ reinterpret_cast<mathcall>(cordic::sin),
+ reinterpret_cast<mathcall>(cordic::cos),
+ reinterpret_cast<mathcall>(cordic::tan),
};
+#if defined(PLATFORM_H7)
asm("vmov.f64 d0, %0, %1" :: "r" (ctxp->r1), "r" (ctxp->r2));
- if (ctxp->r0 < 4) {
+ if (ctxp->r0 < 3) {
funcs[ctxp->r0]();
asm("vmov.f64 %0, %1, d0" : "=r" (ctxp->r1), "=r" (ctxp->r2));
} else {
asm("eor r0, r0; vmov.f64 d0, r0, r0");
}
+#else
+ asm("vmov.f32 s0, %0" :: "r" (ctxp->r1));
+ if (ctxp->r0 < 3) {
+ funcs[ctxp->r0]();
+ asm("vmov.f32 %0, s0" : "=r" (ctxp->r1));
+ } else {
+ asm("eor r0, r0; vmov.f32 s0, r0");
+ }
+#endif
}
break;
case 2:
@@ -551,6 +607,9 @@ void port_syscall(struct port_extctx *ctxp, uint32_t n)
conversion_time_measurement.last -= measurement_overhead;
}
break;
+ case 3:
+ ctxp->r0 = ADC::readAlt(0);
+ break;
default:
while (1);
break;
diff --git a/source/samplebuffer.hpp b/source/samplebuffer.hpp
index bed52bf..6d17d2a 100644
--- a/source/samplebuffer.hpp
+++ b/source/samplebuffer.hpp
@@ -6,8 +6,7 @@
using Sample = uint16_t;
-// Gives 8000 (8192) samples total (algorithm works with max 4096).
-constexpr unsigned int MAX_SAMPLE_BUFFER_BYTESIZE = 16384;
+constexpr unsigned int MAX_SAMPLE_BUFFER_BYTESIZE = sizeof(Sample) * 8192;
constexpr unsigned int MAX_SAMPLE_BUFFER_SIZE = MAX_SAMPLE_BUFFER_BYTESIZE / sizeof(Sample);
class SampleBuffer
diff --git a/source/sclock.cpp b/source/sclock.cpp
index 795274d..198c684 100644
--- a/source/sclock.cpp
+++ b/source/sclock.cpp
@@ -5,19 +5,27 @@ unsigned int SClock::m_div = 1;
unsigned int SClock::m_runcount = 0;
const GPTConfig SClock::m_timer_config = {
+#if defined(TARGET_PLATFORM_H7)
.frequency = 4800000,
+#else
+ .frequency = 36000000,
+#endif
.callback = nullptr,
.cr2 = TIM_CR2_MMS_1, /* TRGO */
.dier = 0
};
const std::array<unsigned int, 6> SClock::m_rate_divs = {{
+#if defined(TARGET_PLATFORM_H7)
/* 8k */ 600,
/* 16k */ 300,
/* 20k */ 240,
/* 32k */ 150,
/* 48k */ 100,
/* 96k */ 50
+#else
+ 4500, 2250, 1800, 1125, 750, 375
+#endif
}};
void SClock::begin()
diff --git a/source/usbcfg.c b/source/usbcfg.c
index 051fcd5..b726e23 100644
--- a/source/usbcfg.c
+++ b/source/usbcfg.c
@@ -335,7 +335,11 @@ const USBConfig usbcfg = {
* Serial over USB driver configuration.
*/
const SerialUSBConfig serusbcfg = {
+#if defined(TARGET_PLATFORM_H7)
&USBD2,
+#else
+ &USBD1,
+#endif
USBD1_DATA_REQUEST_EP,
USBD1_DATA_AVAILABLE_EP,
USBD1_INTERRUPT_REQUEST_EP
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-04 12:50:48 +0000