Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 1 addition & 4 deletions src/core/osd.c
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ void osd_analog_rssi_show(bool bShow) {
if (g_setting.analog_rssi.calib_min == g_setting.analog_rssi.calib_max)
rssi_volt_mv = 0;
else {
rssi_volt_mv = RTC6715_GetRssi();
rssi_volt_mv = rtc6715_rssi;
if (rssi_volt_mv <= g_setting.analog_rssi.calib_min)
rssi_volt_mv = 0;
else if (rssi_volt_mv >= g_setting.analog_rssi.calib_max)
Expand Down Expand Up @@ -627,9 +627,6 @@ void osd_elements_set_dummy_sources() {
void osd_hdzero_update(void) {
char buf[128], i;

if (GOGGLE_VER_2)
RTC6715_GetRssi();

if (g_osd_update_cnt < FC_OSD_CHECK_PERIOD)
g_osd_update_cnt++;
else if (g_osd_update_cnt == FC_OSD_CHECK_PERIOD) {
Expand Down
2 changes: 2 additions & 0 deletions src/core/thread.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include "driver/it66021.h"
#include "driver/nct75.h"
#include "driver/oled.h"
#include "driver/rtc6715.h"
#include "ui/page_fans.h"
#include "ui/page_storage.h"
#include "ui/page_version.h"
Expand Down Expand Up @@ -194,6 +195,7 @@ static void threads_instance(threads_obj_t *obj) {
obj->instance[0] = thread_peripheral;
obj->instance[1] = thread_version;
obj->instance[2] = thread_osd;
obj->instance[3] = thread_rtc6715_rssi;
}

int create_threads() {
Expand Down
2 changes: 1 addition & 1 deletion src/core/thread.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ extern "C" {
#include <stdint.h>

#define THREAD_COUNT_MAX (10)
#define THREAD_COUNT (3)
#define THREAD_COUNT (4)

typedef void *(*fun_thread_instance_t)(void *params);

Expand Down
18 changes: 18 additions & 0 deletions src/driver/rtc6715.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@
#include "gpadc.h"
#include "i2c.h"

#include "../core/settings.h"
#include "app_state.h"
#include "ui/page_common.h"

int rtc6715_rssi = 0;

static uint8_t RTC6715_rssi;

void MM_Write(uint8_t addr, uint32_t dat) {
Expand Down Expand Up @@ -79,4 +85,16 @@ int RTC6715_GetRssi() {
rssi_adc = 3300 * value / 4096;
// LOGI("rssi voltage: %02f", (float)rssi_adc / 1000);
return rssi_adc;
}

extern int GOGGLE_VER_2;
void *thread_rtc6715_rssi(void *ptr) {
for (;;) {
if (GOGGLE_VER_2) {
if (g_app_state == APP_STATE_VIDEO && g_source_info.source == SOURCE_ANALOG && g_setting.source.analog_module == SETTING_SOURCES_ANALOG_MODULE_INTERNAL) {
rtc6715_rssi = RTC6715_GetRssi();
}
}
usleep(100 * 1000);
}
}
3 changes: 3 additions & 0 deletions src/driver/rtc6715.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ extern "C" {
void RTC6715_Open(int power_on, int audio_on);
void RTC6715_SetCH(int ch);
int RTC6715_GetRssi();
void *thread_rtc6715_rssi(void *ptr);

extern int rtc6715_rssi;

#ifdef __cplusplus
}
Expand Down