Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ctxlink/wifi: fix the speed issues with the Wi-Fi interface #2007

Merged
merged 1 commit into from
Nov 28, 2024
+58 −22
Merged

ctxlink/wifi: fix the speed issues with the Wi-Fi interface #2007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/platforms/ctxlink/WiFi_Server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ void trace_send_data(void);
#define TIMEOUT_TICK_COUNT 1000

#define INPUT_BUFFER_SIZE 2048

static uint8_t input_buffer[INPUT_BUFFER_SIZE] = {0}; ///< The input buffer[ input buffer size]
static volatile uint32_t input_index = 0; ///< Zero-based index of the input
static volatile uint32_t output_index = 0; ///< Zero-based index of the output
Expand Down Expand Up @@ -274,6 +275,7 @@ void tim2_isr(void)
else
timeout_tick_counter = TIMEOUT_TICK_COUNT;
}
platform_read_adc();
}

void timer_init(void)
Expand Down
77 changes: 55 additions & 22 deletions src/platforms/ctxlink/platform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include "morse.h"
#include "exception.h"
#include <string.h>
#include <stdatomic.h>

#include <libopencm3/stm32/rcc.h>
#include <libopencm3/cm3/scb.h>
Expand Down Expand Up @@ -67,7 +68,13 @@
bool last_battery_state = true;
bool battery_present = false;

static uint32_t input_voltages[2] = {0};
#define READ_ADC_PERIOD 100 //< ms count
static uint32_t read_adc_period = READ_ADC_PERIOD;

#define MAX_ADC_PHASE 4
static uint8_t adc_phase;

_Atomic uint32_t input_voltages[2] = {0};
static uint8_t adc_channels[] = {CTXLINK_BATTERY_INPUT, CTXLINK_TARGET_VOLTAGE_INPUT}; /// ADC channels used by ctxLink

typedef void (*irq_function_t)(void);
Expand Down Expand Up @@ -139,25 +146,9 @@ void wifi_init(void)
app_initialize();
}

void platform_adc_read(void)
{
adc_set_regular_sequence(ADC1, 1, &adc_channels[CTXLINK_ADC_BATTERY]);
adc_start_conversion_regular(ADC1);
/* Wait for end of conversion. */
while (!adc_eoc(ADC1))
continue;
input_voltages[CTXLINK_ADC_BATTERY] = ((adc_read_regular(ADC1) * 16U) / 10U);
adc_set_regular_sequence(ADC1, 1, &adc_channels[CTXLINK_ADC_TARGET]);
adc_start_conversion_regular(ADC1);
/* Wait for end of conversion. */
while (!adc_eoc(ADC1))
continue;
input_voltages[CTXLINK_ADC_TARGET] = (adc_read_regular(ADC1) * 16U) / 10U;
}

uint32_t platform_target_voltage_sense(void)
{
return input_voltages[CTXLINK_ADC_TARGET];
return atomic_load_explicit(&input_voltages[CTXLINK_ADC_TARGET], memory_order_relaxed);
}

int platform_hwversion(void)
Expand Down Expand Up @@ -330,6 +321,49 @@ bool platform_nrst_get_val(void)
return false;
}

void platform_read_adc(void)
{
if (--read_adc_period != 0)
return;
read_adc_period = READ_ADC_PERIOD;
//
// The ADC is read here; there are two channels read for the target
// and battery. A 4-phase system is used:
// phase 0 -> start target voltage conversion
// phase 1 -> Read and update the cached target voltage
// phase 2 -> start the battery voltage conversion
// phase 3 -> read and update the cached battery voltage
switch (adc_phase) {
default: {
//
// Something went wrong, reset the phase and start again
//
adc_phase = 0;
BMD_FALLTHROUGH;
}
case 0: {
adc_set_regular_sequence(ADC1, 1, &adc_channels[CTXLINK_ADC_TARGET]);
adc_start_conversion_regular(ADC1);
break;
}
case 1: {
atomic_store_explicit(
&input_voltages[CTXLINK_ADC_TARGET], (adc_read_regular(ADC1) * 16U) / 10U, memory_order_relaxed);
break;
}
case 2: {
adc_set_regular_sequence(ADC1, 1, &adc_channels[CTXLINK_ADC_BATTERY]);
adc_start_conversion_regular(ADC1);
break;
}
case 3:
atomic_store_explicit(
&input_voltages[CTXLINK_ADC_BATTERY], (adc_read_regular(ADC1) * 16U) / 10U, memory_order_relaxed);
break;
}
adc_phase = (adc_phase + 1) % MAX_ADC_PHASE;
}

const char *platform_target_voltage(void)
{
static char target[64] = {0};
Expand Down Expand Up @@ -401,20 +435,19 @@ const char *platform_battery_voltage(void)

bool platform_check_battery_voltage(void)
{
platform_adc_read();
//
// Is battery connected?
//
if (input_voltages[CTXLINK_ADC_BATTERY] <= BATTERY_VOLTAGE_1 ||
input_voltages[CTXLINK_ADC_BATTERY] >= BATTERY_VOLTAGE_2) {
uint32_t voltage = atomic_load_explicit(&input_voltages[CTXLINK_ADC_BATTERY], memory_order_relaxed);
if (voltage <= BATTERY_VOLTAGE_1 || voltage >= BATTERY_VOLTAGE_2) {
battery_present = false;
last_battery_state = true;
} else {
battery_present = true;
//
// Is the voltage good?
//
last_battery_state = input_voltages[CTXLINK_ADC_BATTERY] > BATTERY_LOW;
last_battery_state = voltage > BATTERY_LOW;
}
return last_battery_state;
}
Expand Down
1 change: 1 addition & 0 deletions src/platforms/ctxlink/platform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,5 +293,6 @@ void platform_tasks(void);
const char *platform_battery_voltage(void);
bool platform_check_battery_voltage(void);
bool platform_configure_uart(char *configuration_string);
void platform_read_adc(void);

#endif /* PLATFORMS_CTXLINK_PLATFORM_H */
Loading