increase signal buffers; fix oversample
parent
716be4fc87
commit
ec2e1fd5c6
@ -1,387 +1,383 @@
|
|||||||
/**
|
/**
|
||||||
* @file main.cpp
|
* @file main.cpp
|
||||||
* @brief Program entry point.
|
* @brief Program entry point.
|
||||||
*
|
*
|
||||||
* Copyright (C) 2020 Clyne Sullivan
|
* Copyright (C) 2020 Clyne Sullivan
|
||||||
*
|
*
|
||||||
* Distributed under the GNU GPL v3 or later. You should have received a copy of
|
* Distributed under the GNU GPL v3 or later. You should have received a copy of
|
||||||
* the GNU General Public License along with this program.
|
* the GNU General Public License along with this program.
|
||||||
* If not, see <https://www.gnu.org/licenses/>.
|
* If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "ch.h"
|
#include "ch.h"
|
||||||
#include "hal.h"
|
#include "hal.h"
|
||||||
|
|
||||||
static_assert(sizeof(adcsample_t) == sizeof(uint16_t));
|
static_assert(sizeof(adcsample_t) == sizeof(uint16_t));
|
||||||
static_assert(sizeof(dacsample_t) == sizeof(uint16_t));
|
static_assert(sizeof(dacsample_t) == sizeof(uint16_t));
|
||||||
|
|
||||||
#include "common.hpp"
|
#include "common.hpp"
|
||||||
#include "error.hpp"
|
#include "error.hpp"
|
||||||
|
|
||||||
#include "adc.hpp"
|
#include "adc.hpp"
|
||||||
#include "dac.hpp"
|
#include "dac.hpp"
|
||||||
#include "elf_load.hpp"
|
#include "elf_load.hpp"
|
||||||
#include "sclock.hpp"
|
#include "sclock.hpp"
|
||||||
#include "usbserial.hpp"
|
#include "usbserial.hpp"
|
||||||
|
|
||||||
#include <array>
|
#include <array>
|
||||||
|
|
||||||
constexpr unsigned int MAX_ELF_FILE_SIZE = 8 * 1024;
|
constexpr unsigned int MAX_ELF_FILE_SIZE = 8 * 1024;
|
||||||
|
|
||||||
enum class RunStatus : char
|
enum class RunStatus : char
|
||||||
{
|
{
|
||||||
Idle = '1',
|
Idle = '1',
|
||||||
Running
|
Running
|
||||||
};
|
};
|
||||||
static RunStatus run_status = RunStatus::Idle;
|
static RunStatus run_status = RunStatus::Idle;
|
||||||
|
|
||||||
#define MSG_CONVFIRST (1)
|
#define MSG_CONVFIRST (1)
|
||||||
#define MSG_CONVSECOND (2)
|
#define MSG_CONVSECOND (2)
|
||||||
#define MSG_CONVFIRST_MEASURE (3)
|
#define MSG_CONVFIRST_MEASURE (3)
|
||||||
#define MSG_CONVSECOND_MEASURE (4)
|
#define MSG_CONVSECOND_MEASURE (4)
|
||||||
|
|
||||||
#define MSG_FOR_FIRST(m) (m & 1)
|
#define MSG_FOR_FIRST(m) (m & 1)
|
||||||
#define MSG_FOR_MEASURE(m) (m > 2)
|
#define MSG_FOR_MEASURE(m) (m > 2)
|
||||||
|
|
||||||
static msg_t conversionMBBuffer[4];
|
static msg_t conversionMBBuffer[4];
|
||||||
static MAILBOX_DECL(conversionMB, conversionMBBuffer, 4);
|
static MAILBOX_DECL(conversionMB, conversionMBBuffer, 4);
|
||||||
|
|
||||||
static THD_WORKING_AREA(conversionThreadWA, 2048);
|
static THD_WORKING_AREA(conversionThreadWA, 2048);
|
||||||
static THD_FUNCTION(conversionThread, arg);
|
static THD_FUNCTION(conversionThread, arg);
|
||||||
|
|
||||||
static time_measurement_t conversion_time_measurement;
|
static time_measurement_t conversion_time_measurement;
|
||||||
|
|
||||||
static ErrorManager EM;
|
static ErrorManager EM;
|
||||||
|
|
||||||
static SampleBuffer samplesIn (reinterpret_cast<Sample *>(0x38000000));
|
static SampleBuffer samplesIn (reinterpret_cast<Sample *>(0x38000000)); // 16k
|
||||||
static SampleBuffer samplesOut (reinterpret_cast<Sample *>(0x38002000));
|
static SampleBuffer samplesOut (reinterpret_cast<Sample *>(0x30004000)); // 16k
|
||||||
#ifdef ENABLE_SIGGEN
|
static SampleBuffer samplesSigGen (reinterpret_cast<Sample *>(0x30000000)); // 16k
|
||||||
static SampleBuffer samplesSigGen;
|
|
||||||
#endif
|
static unsigned char elf_file_store[MAX_ELF_FILE_SIZE];
|
||||||
|
static ELF::Entry elf_entry = nullptr;
|
||||||
static unsigned char elf_file_store[MAX_ELF_FILE_SIZE];
|
|
||||||
static ELF::Entry elf_entry = nullptr;
|
static void signal_operate(adcsample_t *buffer, size_t count);
|
||||||
|
static void signal_operate_measure(adcsample_t *buffer, size_t count);
|
||||||
static void signal_operate(adcsample_t *buffer, size_t count);
|
static void main_loop();
|
||||||
static void signal_operate_measure(adcsample_t *buffer, size_t count);
|
|
||||||
static void main_loop();
|
static THD_WORKING_AREA(waThread1, 128);
|
||||||
|
static THD_FUNCTION(Thread1, arg);
|
||||||
static THD_WORKING_AREA(waThread1, 128);
|
|
||||||
static THD_FUNCTION(Thread1, arg);
|
int main()
|
||||||
|
{
|
||||||
int main()
|
// Initialize the RTOS
|
||||||
{
|
halInit();
|
||||||
// Initialize the RTOS
|
chSysInit();
|
||||||
halInit();
|
|
||||||
chSysInit();
|
// Enable FPU
|
||||||
|
SCB->CPACR |= 0xF << 20;
|
||||||
//SCB_DisableDCache();
|
|
||||||
|
ADC::begin();
|
||||||
// Enable FPU
|
DAC::begin();
|
||||||
SCB->CPACR |= 0xF << 20;
|
SClock::begin();
|
||||||
|
USBSerial::begin();
|
||||||
ADC::begin();
|
|
||||||
DAC::begin();
|
SClock::setRate(SClock::Rate::R32K);
|
||||||
SClock::begin();
|
ADC::setRate(SClock::Rate::R32K);
|
||||||
USBSerial::begin();
|
|
||||||
|
chTMObjectInit(&conversion_time_measurement);
|
||||||
SClock::setRate(SClock::Rate::R32K);
|
chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, nullptr);
|
||||||
ADC::setRate(SClock::Rate::R32K);
|
chThdCreateStatic(conversionThreadWA, sizeof(conversionThreadWA),
|
||||||
|
NORMALPRIO, conversionThread, nullptr);
|
||||||
// Start the conversion manager thread
|
|
||||||
chTMObjectInit(&conversion_time_measurement);
|
main_loop();
|
||||||
chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1,
|
}
|
||||||
nullptr);
|
|
||||||
chThdCreateStatic(conversionThreadWA, sizeof(conversionThreadWA),
|
void main_loop()
|
||||||
NORMALPRIO, conversionThread, nullptr);
|
{
|
||||||
|
|
||||||
main_loop();
|
while (1) {
|
||||||
}
|
if (USBSerial::isActive()) {
|
||||||
|
// Attempt to receive a command packet
|
||||||
void main_loop()
|
if (unsigned char cmd[3]; USBSerial::read(&cmd[0], 1) > 0) {
|
||||||
{
|
// Packet received, first byte represents the desired command/action
|
||||||
|
switch (cmd[0]) {
|
||||||
while (1) {
|
|
||||||
if (USBSerial::isActive()) {
|
case 'a':
|
||||||
// Attempt to receive a command packet
|
USBSerial::write(samplesIn.bytedata(), samplesIn.bytesize());
|
||||||
if (unsigned char cmd[3]; USBSerial::read(&cmd[0], 1) > 0) {
|
break;
|
||||||
// Packet received, first byte represents the desired command/action
|
case 'A':
|
||||||
switch (cmd[0]) {
|
USBSerial::read(samplesIn.bytedata(), samplesIn.bytesize());
|
||||||
|
break;
|
||||||
case 'a':
|
|
||||||
USBSerial::write(samplesIn.bytedata(), samplesIn.bytesize());
|
case 'B':
|
||||||
break;
|
if (EM.assert(run_status == RunStatus::Idle, Error::NotIdle) &&
|
||||||
case 'A':
|
EM.assert(USBSerial::read(&cmd[1], 2) == 2, Error::BadParamSize))
|
||||||
USBSerial::read(samplesIn.bytedata(), samplesIn.bytesize());
|
{
|
||||||
break;
|
unsigned int count = (cmd[1] | (cmd[2] << 8)) * 2;
|
||||||
|
if (EM.assert(count <= MAX_SAMPLE_BUFFER_SIZE, Error::BadParam)) {
|
||||||
case 'B':
|
samplesIn.setSize(count);
|
||||||
if (EM.assert(run_status == RunStatus::Idle, Error::NotIdle) &&
|
samplesOut.setSize(count);
|
||||||
EM.assert(USBSerial::read(&cmd[1], 2) == 2, Error::BadParamSize))
|
}
|
||||||
{
|
}
|
||||||
unsigned int count = (cmd[1] | (cmd[2] << 8)) * 2;
|
break;
|
||||||
if (EM.assert(count <= MAX_SAMPLE_BUFFER_SIZE, Error::BadParam)) {
|
|
||||||
samplesIn.setSize(count);
|
case 'd':
|
||||||
samplesOut.setSize(count);
|
USBSerial::write(samplesOut.bytedata(), samplesOut.bytesize());
|
||||||
}
|
break;
|
||||||
}
|
case 'D':
|
||||||
break;
|
if (EM.assert(USBSerial::read(&cmd[1], 2) == 2, Error::BadParamSize)) {
|
||||||
|
unsigned int count = cmd[1] | (cmd[2] << 8);
|
||||||
case 'd':
|
if (EM.assert(count <= MAX_SAMPLE_BUFFER_SIZE, Error::BadParam)) {
|
||||||
USBSerial::write(samplesOut.bytedata(), samplesOut.bytesize());
|
samplesSigGen.setSize(count);
|
||||||
break;
|
USBSerial::read(samplesSigGen.bytedata(), samplesSigGen.bytesize());
|
||||||
#ifdef ENABLE_SIGGEN
|
}
|
||||||
case 'D':
|
}
|
||||||
if (EM.assert(USBSerial::read(&cmd[1], 2) == 2, Error::BadParamSize)) {
|
break;
|
||||||
unsigned int count = cmd[1] | (cmd[2] << 8);
|
|
||||||
if (EM.assert(count <= MAX_SAMPLE_BUFFER_SIZE, Error::BadParam)) {
|
// 'E' - Reads in and loads the compiled conversion code binary from USB.
|
||||||
samplesSigGen.setSize(count);
|
case 'E':
|
||||||
USBSerial::read(samplesSigGen.bytedata(), samplesSigGen.bytesize());
|
if (EM.assert(run_status == RunStatus::Idle, Error::NotIdle) &&
|
||||||
}
|
EM.assert(USBSerial::read(&cmd[1], 2) == 2, Error::BadParamSize))
|
||||||
}
|
{
|
||||||
break;
|
// Only load the binary if it can fit in the memory reserved for it.
|
||||||
#endif
|
unsigned int size = cmd[1] | (cmd[2] << 8);
|
||||||
|
if (EM.assert(size < sizeof(elf_file_store), Error::BadUserCodeSize)) {
|
||||||
// 'E' - Reads in and loads the compiled conversion code binary from USB.
|
USBSerial::read(elf_file_store, size);
|
||||||
case 'E':
|
elf_entry = ELF::load(elf_file_store);
|
||||||
if (EM.assert(run_status == RunStatus::Idle, Error::NotIdle) &&
|
|
||||||
EM.assert(USBSerial::read(&cmd[1], 2) == 2, Error::BadParamSize))
|
EM.assert(elf_entry != nullptr, Error::BadUserCodeLoad);
|
||||||
{
|
}
|
||||||
// Only load the binary if it can fit in the memory reserved for it.
|
}
|
||||||
unsigned int size = cmd[1] | (cmd[2] << 8);
|
break;
|
||||||
if (EM.assert(size < sizeof(elf_file_store), Error::BadUserCodeSize)) {
|
|
||||||
USBSerial::read(elf_file_store, size);
|
// 'e' - Unloads the currently loaded conversion code
|
||||||
elf_entry = ELF::load(elf_file_store);
|
case 'e':
|
||||||
|
elf_entry = nullptr;
|
||||||
EM.assert(elf_entry != nullptr, Error::BadUserCodeLoad);
|
break;
|
||||||
}
|
|
||||||
}
|
// 'i' - Sends an identifying string to confirm that this is the stmdsp device.
|
||||||
break;
|
case 'i':
|
||||||
|
USBSerial::write(reinterpret_cast<const uint8_t *>("stmdsp"), 6);
|
||||||
// 'e' - Unloads the currently loaded conversion code
|
break;
|
||||||
case 'e':
|
|
||||||
elf_entry = nullptr;
|
// 'I' - Sends the current run status.
|
||||||
break;
|
case 'I':
|
||||||
|
{
|
||||||
// 'i' - Sends an identifying string to confirm that this is the stmdsp device.
|
unsigned char buf[2] = {
|
||||||
case 'i':
|
static_cast<unsigned char>(run_status),
|
||||||
USBSerial::write(reinterpret_cast<const uint8_t *>("stmdsp"), 6);
|
static_cast<unsigned char>(EM.pop())
|
||||||
break;
|
};
|
||||||
|
USBSerial::write(buf, sizeof(buf));
|
||||||
// 'I' - Sends the current run status.
|
}
|
||||||
case 'I':
|
break;
|
||||||
{
|
|
||||||
unsigned char buf[2] = {
|
// 'M' - Begins continuous sampling, but measures the execution time of the first
|
||||||
static_cast<unsigned char>(run_status),
|
// sample processing. This duration can be later read through 'm'.
|
||||||
static_cast<unsigned char>(EM.pop())
|
case 'M':
|
||||||
};
|
if (EM.assert(run_status == RunStatus::Idle, Error::NotIdle)) {
|
||||||
USBSerial::write(buf, sizeof(buf));
|
run_status = RunStatus::Running;
|
||||||
}
|
samplesOut.clear();
|
||||||
break;
|
ADC::start(samplesIn.data(), samplesIn.size(), signal_operate_measure);
|
||||||
|
DAC::start(0, samplesOut.data(), samplesOut.size());
|
||||||
// 'M' - Begins continuous sampling, but measures the execution time of the first
|
}
|
||||||
// sample processing. This duration can be later read through 'm'.
|
break;
|
||||||
case 'M':
|
|
||||||
if (EM.assert(run_status == RunStatus::Idle, Error::NotIdle)) {
|
// 'm' - Returns the last measured sample processing time, presumably in processor
|
||||||
run_status = RunStatus::Running;
|
// ticks.
|
||||||
samplesOut.clear();
|
case 'm':
|
||||||
ADC::start(samplesIn.data(), samplesIn.size(), signal_operate_measure);
|
USBSerial::write(reinterpret_cast<uint8_t *>(&conversion_time_measurement.last),
|
||||||
DAC::start(0, samplesOut.data(), samplesOut.size());
|
sizeof(rtcnt_t));
|
||||||
}
|
break;
|
||||||
break;
|
|
||||||
|
// 'R' - Begin continuous sampling/conversion of the ADC. Samples will go through
|
||||||
// 'm' - Returns the last measured sample processing time, presumably in processor
|
// the conversion code, and will be sent out over the DAC.
|
||||||
// ticks.
|
case 'R':
|
||||||
case 'm':
|
if (EM.assert(run_status == RunStatus::Idle, Error::NotIdle)) {
|
||||||
USBSerial::write(reinterpret_cast<uint8_t *>(&conversion_time_measurement.last),
|
run_status = RunStatus::Running;
|
||||||
sizeof(rtcnt_t));
|
samplesOut.clear();
|
||||||
break;
|
ADC::start(samplesIn.data(), samplesIn.size(), signal_operate);
|
||||||
|
DAC::start(0, samplesOut.data(), samplesOut.size());
|
||||||
// 'R' - Begin continuous sampling/conversion of the ADC. Samples will go through
|
}
|
||||||
// the conversion code, and will be sent out over the DAC.
|
break;
|
||||||
case 'R':
|
|
||||||
if (EM.assert(run_status == RunStatus::Idle, Error::NotIdle)) {
|
case 'r':
|
||||||
run_status = RunStatus::Running;
|
if (EM.assert(USBSerial::read(&cmd[1], 1) == 1, Error::BadParamSize)) {
|
||||||
samplesOut.clear();
|
if (cmd[1] == 0xFF) {
|
||||||
ADC::start(samplesIn.data(), samplesIn.size(), signal_operate);
|
unsigned char r = SClock::getRate();
|
||||||
DAC::start(0, samplesOut.data(), samplesOut.size());
|
USBSerial::write(&r, 1);
|
||||||
}
|
} else {
|
||||||
break;
|
auto r = static_cast<SClock::Rate>(cmd[1]);
|
||||||
|
SClock::setRate(r);
|
||||||
case 'r':
|
ADC::setRate(r);
|
||||||
if (EM.assert(USBSerial::read(&cmd[1], 1) == 1, Error::BadParamSize)) {
|
}
|
||||||
if (cmd[1] == 0xFF) {
|
}
|
||||||
unsigned char r = SClock::getRate();
|
break;
|
||||||
USBSerial::write(&r, 1);
|
|
||||||
} else {
|
// 'S' - Stops the continuous sampling/conversion.
|
||||||
auto r = static_cast<SClock::Rate>(cmd[1]);
|
case 'S':
|
||||||
SClock::setRate(r);
|
if (run_status == RunStatus::Running) {
|
||||||
ADC::setRate(r);
|
DAC::stop(0);
|
||||||
}
|
ADC::stop();
|
||||||
}
|
run_status = RunStatus::Idle;
|
||||||
break;
|
}
|
||||||
|
break;
|
||||||
// 'S' - Stops the continuous sampling/conversion.
|
|
||||||
case 'S':
|
case 's':
|
||||||
if (run_status == RunStatus::Running) {
|
if (auto samps = samplesOut.modified(); samps != nullptr) {
|
||||||
DAC::stop(0);
|
unsigned char buf[2] = {
|
||||||
ADC::stop();
|
static_cast<unsigned char>(samplesOut.size() / 2 & 0xFF),
|
||||||
run_status = RunStatus::Idle;
|
static_cast<unsigned char>(((samplesOut.size() / 2) >> 8) & 0xFF)
|
||||||
}
|
};
|
||||||
break;
|
USBSerial::write(buf, 2);
|
||||||
|
unsigned int total = samplesOut.bytesize() / 2;
|
||||||
case 's':
|
unsigned int offset = 0;
|
||||||
if (auto samps = samplesOut.modified(); samps != nullptr) {
|
unsigned char unused;
|
||||||
unsigned char buf[2] = {
|
while (total > 512) {
|
||||||
static_cast<unsigned char>(samplesOut.size() / 2 & 0xFF),
|
USBSerial::write(reinterpret_cast<uint8_t *>(samps) + offset, 512);
|
||||||
static_cast<unsigned char>(((samplesOut.size() / 2) >> 8) & 0xFF)
|
while (USBSerial::read(&unused, 1) == 0);
|
||||||
};
|
offset += 512;
|
||||||
USBSerial::write(buf, 2);
|
total -= 512;
|
||||||
unsigned int total = samplesOut.bytesize() / 2;
|
}
|
||||||
unsigned int offset = 0;
|
USBSerial::write(reinterpret_cast<uint8_t *>(samps) + offset, total);
|
||||||
unsigned char unused;
|
while (USBSerial::read(&unused, 1) == 0);
|
||||||
while (total > 512) {
|
} else {
|
||||||
USBSerial::write(reinterpret_cast<uint8_t *>(samps) + offset, 512);
|
USBSerial::write(reinterpret_cast<const uint8_t *>("\0\0"), 2);
|
||||||
while (USBSerial::read(&unused, 1) == 0);
|
}
|
||||||
offset += 512;
|
break;
|
||||||
total -= 512;
|
|
||||||
}
|
case 'W':
|
||||||
USBSerial::write(reinterpret_cast<uint8_t *>(samps) + offset, total);
|
DAC::start(1, samplesSigGen.data(), samplesSigGen.size());
|
||||||
while (USBSerial::read(&unused, 1) == 0);
|
break;
|
||||||
} else {
|
case 'w':
|
||||||
USBSerial::write(reinterpret_cast<const uint8_t *>("\0\0"), 2);
|
DAC::stop(1);
|
||||||
}
|
break;
|
||||||
break;
|
|
||||||
|
default:
|
||||||
#ifdef ENABLE_SIGGEN
|
break;
|
||||||
case 'W':
|
}
|
||||||
DAC::start(1, samplesSigGen.data(), samplesSigGen.size());
|
}
|
||||||
break;
|
}
|
||||||
case 'w':
|
|
||||||
DAC::stop(1);
|
chThdSleepMicroseconds(100);
|
||||||
break;
|
}
|
||||||
#endif
|
}
|
||||||
|
|
||||||
default:
|
void conversion_abort()
|
||||||
break;
|
{
|
||||||
}
|
elf_entry = nullptr;
|
||||||
}
|
DAC::stop(0);
|
||||||
}
|
ADC::stop();
|
||||||
|
EM.add(Error::ConversionAborted);
|
||||||
chThdSleepMicroseconds(100);
|
}
|
||||||
}
|
|
||||||
}
|
THD_FUNCTION(conversionThread, arg)
|
||||||
|
{
|
||||||
void conversion_abort()
|
(void)arg;
|
||||||
{
|
|
||||||
elf_entry = nullptr;
|
while (1) {
|
||||||
DAC::stop(0);
|
msg_t message;
|
||||||
ADC::stop();
|
if (chMBFetchTimeout(&conversionMB, &message, TIME_INFINITE) == MSG_OK) {
|
||||||
EM.add(Error::ConversionAborted);
|
auto samples = MSG_FOR_FIRST(message) ? samplesIn.data() : samplesIn.middata();
|
||||||
}
|
auto size = samplesIn.size() / 2;
|
||||||
|
|
||||||
THD_FUNCTION(conversionThread, arg)
|
if (elf_entry) {
|
||||||
{
|
if (!MSG_FOR_MEASURE(message)) {
|
||||||
(void)arg;
|
samples = elf_entry(samples, size);
|
||||||
|
} else {
|
||||||
while (1) {
|
chTMStartMeasurementX(&conversion_time_measurement);
|
||||||
msg_t message;
|
samples = elf_entry(samples, size);
|
||||||
if (chMBFetchTimeout(&conversionMB, &message, TIME_INFINITE) == MSG_OK) {
|
chTMStopMeasurementX(&conversion_time_measurement);
|
||||||
auto samples = MSG_FOR_FIRST(message) ? samplesIn.data() : samplesIn.middata();
|
}
|
||||||
auto size = samplesIn.size() / 2;
|
}
|
||||||
|
|
||||||
if (elf_entry) {
|
if (MSG_FOR_FIRST(message))
|
||||||
if (!MSG_FOR_MEASURE(message)) {
|
samplesOut.modify(samples, size);
|
||||||
samples = elf_entry(samples, size);
|
else
|
||||||
} else {
|
samplesOut.midmodify(samples, size);
|
||||||
chTMStartMeasurementX(&conversion_time_measurement);
|
}
|
||||||
samples = elf_entry(samples, size);
|
}
|
||||||
chTMStopMeasurementX(&conversion_time_measurement);
|
}
|
||||||
}
|
|
||||||
}
|
void signal_operate(adcsample_t *buffer, size_t)
|
||||||
|
{
|
||||||
if (MSG_FOR_FIRST(message))
|
chSysLockFromISR();
|
||||||
samplesOut.modify(samples, size);
|
|
||||||
else
|
if (chMBGetUsedCountI(&conversionMB) > 1) {
|
||||||
samplesOut.midmodify(samples, size);
|
chSysUnlockFromISR();
|
||||||
}
|
conversion_abort();
|
||||||
}
|
} else {
|
||||||
}
|
chMBPostI(&conversionMB, buffer == samplesIn.data() ? MSG_CONVFIRST : MSG_CONVSECOND);
|
||||||
|
chSysUnlockFromISR();
|
||||||
void signal_operate(adcsample_t *buffer, size_t)
|
}
|
||||||
{
|
}
|
||||||
chSysLockFromISR();
|
|
||||||
|
void signal_operate_measure(adcsample_t *buffer, [[maybe_unused]] size_t count)
|
||||||
if (chMBGetUsedCountI(&conversionMB) > 1) {
|
{
|
||||||
chSysUnlockFromISR();
|
chSysLockFromISR();
|
||||||
conversion_abort();
|
chMBPostI(&conversionMB, buffer == samplesIn.data() ? MSG_CONVFIRST_MEASURE : MSG_CONVSECOND_MEASURE);
|
||||||
} else {
|
chSysUnlockFromISR();
|
||||||
chMBPostI(&conversionMB, buffer == samplesIn.data() ? MSG_CONVFIRST : MSG_CONVSECOND);
|
|
||||||
chSysUnlockFromISR();
|
ADC::setOperation(signal_operate);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
THD_FUNCTION(Thread1, arg)
|
||||||
void signal_operate_measure(adcsample_t *buffer, [[maybe_unused]] size_t count)
|
{
|
||||||
{
|
(void)arg;
|
||||||
chSysLockFromISR();
|
|
||||||
chMBPostI(&conversionMB, buffer == samplesIn.data() ? MSG_CONVFIRST_MEASURE : MSG_CONVSECOND_MEASURE);
|
bool erroron = false;
|
||||||
chSysUnlockFromISR();
|
while (1) {
|
||||||
|
bool isidle = run_status == RunStatus::Idle;
|
||||||
ADC::setOperation(signal_operate);
|
auto led = isidle ? LINE_LED_GREEN : LINE_LED_YELLOW;
|
||||||
}
|
auto delay = isidle ? 500 : 250;
|
||||||
|
|
||||||
THD_FUNCTION(Thread1, arg)
|
palSetLine(led);
|
||||||
{
|
chThdSleepMilliseconds(delay);
|
||||||
(void)arg;
|
palClearLine(led);
|
||||||
while (1) {
|
chThdSleepMilliseconds(delay);
|
||||||
palSetLine(LINE_LED1);
|
|
||||||
chThdSleepMilliseconds(70);
|
if (auto err = EM.hasError(); err ^ erroron) {
|
||||||
palSetLine(LINE_LED2);
|
erroron = err;
|
||||||
chThdSleepMilliseconds(70);
|
if (err)
|
||||||
palSetLine(LINE_LED3);
|
palSetLine(LINE_LED_RED);
|
||||||
chThdSleepMilliseconds(240);
|
else
|
||||||
palClearLine(LINE_LED1);
|
palClearLine(LINE_LED_RED);
|
||||||
chThdSleepMilliseconds(70);
|
}
|
||||||
palClearLine(LINE_LED2);
|
}
|
||||||
chThdSleepMilliseconds(70);
|
}
|
||||||
palClearLine(LINE_LED3);
|
|
||||||
chThdSleepMilliseconds(240);
|
extern "C" {
|
||||||
}
|
|
||||||
}
|
__attribute__((naked))
|
||||||
|
void HardFault_Handler()
|
||||||
extern "C" {
|
{
|
||||||
|
while (1);
|
||||||
__attribute__((naked))
|
// //asm("push {lr}");
|
||||||
void HardFault_Handler()
|
//
|
||||||
{
|
// uint32_t *stack;
|
||||||
while (1);
|
// uint32_t lr;
|
||||||
// //asm("push {lr}");
|
// asm("\
|
||||||
//
|
// tst lr, #4; \
|
||||||
// uint32_t *stack;
|
// ite eq; \
|
||||||
// uint32_t lr;
|
// mrseq %0, msp; \
|
||||||
// asm("\
|
// mrsne %0, psp; \
|
||||||
// tst lr, #4; \
|
// mov %1, lr; \
|
||||||
// ite eq; \
|
// " : "=r" (stack), "=r" (lr));
|
||||||
// mrseq %0, msp; \
|
// //stack++;
|
||||||
// mrsne %0, psp; \
|
// stack[7] |= (1 << 24); // Keep Thumb mode enabled
|
||||||
// mov %1, lr; \
|
//
|
||||||
// " : "=r" (stack), "=r" (lr));
|
// conversion_abort();
|
||||||
// //stack++;
|
//
|
||||||
// stack[7] |= (1 << 24); // Keep Thumb mode enabled
|
// // TODO test lr and decide how to recover
|
||||||
//
|
//
|
||||||
// conversion_abort();
|
// //if (run_status == RunStatus::Converting) {
|
||||||
//
|
// stack[6] = stack[5]; // Escape from elf_entry code
|
||||||
// // TODO test lr and decide how to recover
|
// //} else /*if (run_status == RunStatus::Recovered)*/ {
|
||||||
//
|
// // stack[6] = (uint32_t)main_loop & ~1; // Return to safety
|
||||||
// //if (run_status == RunStatus::Converting) {
|
// //}
|
||||||
// stack[6] = stack[5]; // Escape from elf_entry code
|
//
|
||||||
// //} else /*if (run_status == RunStatus::Recovered)*/ {
|
// //asm("pop {lr}; bx lr");
|
||||||
// // stack[6] = (uint32_t)main_loop & ~1; // Return to safety
|
// asm("bx lr");
|
||||||
// //}
|
}
|
||||||
//
|
|
||||||
// //asm("pop {lr}; bx lr");
|
} // extern "C"
|
||||||
// asm("bx lr");
|
|
||||||
}
|
|
||||||
|
|
||||||
} // extern "C"
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue