From fbd881f8d99d80d4101810195139c3c3029b7636 Mon Sep 17 00:00:00 2001 From: PT_Dreamer Date: Fri, 3 Feb 2017 01:24:51 +0000 Subject: [PATCH] Telemetry/AVR/Function renaming renamed processSerialData to processTelemetryData acording to PR review --- radio/src/io/frsky_sport.cpp | 2 +- radio/src/targets/common/avr/telemetry_driver.cpp | 4 ++-- radio/src/telemetry/frsky.cpp | 2 +- radio/src/telemetry/frsky.h | 2 +- radio/src/telemetry/mavlink.cpp | 2 +- radio/src/telemetry/telemetry.cpp | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/radio/src/io/frsky_sport.cpp b/radio/src/io/frsky_sport.cpp index 1e7a4493e..337d616ca 100644 --- a/radio/src/io/frsky_sport.cpp +++ b/radio/src/io/frsky_sport.cpp @@ -130,7 +130,7 @@ bool sportWaitState(SportUpdateState state, int timeout) for (int i=timeout/2; i>=0; i--) { uint8_t byte ; while (telemetryGetByte(&byte)) { - processSerialData(byte); + processTelemetryData(byte); } if (sportUpdateState == state) { return true; diff --git a/radio/src/targets/common/avr/telemetry_driver.cpp b/radio/src/targets/common/avr/telemetry_driver.cpp index 082eaaf0f..5b3e6d8b8 100644 --- a/radio/src/targets/common/avr/telemetry_driver.cpp +++ b/radio/src/targets/common/avr/telemetry_driver.cpp @@ -45,7 +45,7 @@ void telemetryEnableRx(void) UCSRB_N(TLM_USART) |= (1 << RXCIE_N(TLM_USART)); // enable Interrupt } -void processSerialData(uint8_t data); +void processTelemetryData(uint8_t data); extern uint8_t telemetryRxBufferCount; ISR(USART_RX_vect_N(TLM_USART)) @@ -94,7 +94,7 @@ ISR(USART_RX_vect_N(TLM_USART)) telemetryRxBufferCount = 0; } else { - processSerialData(data); + processTelemetryData(data); } cli() ; diff --git a/radio/src/telemetry/frsky.cpp b/radio/src/telemetry/frsky.cpp index de7061fe2..9894d8d7b 100644 --- a/radio/src/telemetry/frsky.cpp +++ b/radio/src/telemetry/frsky.cpp @@ -48,7 +48,7 @@ enum FrSkyDataState { #endif }; -NOINLINE void processSerialData(uint8_t data) +NOINLINE void processTelemetryData(uint8_t data) { static uint8_t dataState = STATE_DATA_IDLE; diff --git a/radio/src/telemetry/frsky.h b/radio/src/telemetry/frsky.h index 8d3612575..8aae9fbb4 100644 --- a/radio/src/telemetry/frsky.h +++ b/radio/src/telemetry/frsky.h @@ -479,6 +479,6 @@ void frskySetCellVoltage(uint8_t battnumber, frskyCellVoltage_t cellVolts); void frskyUpdateCells(); #endif -void processSerialData(uint8_t data); +void processTelemetryData(uint8_t data); #endif // _FRSKY_H_ diff --git a/radio/src/telemetry/mavlink.cpp b/radio/src/telemetry/mavlink.cpp index 865b4acae..a59a2ccd8 100644 --- a/radio/src/telemetry/mavlink.cpp +++ b/radio/src/telemetry/mavlink.cpp @@ -48,7 +48,7 @@ Telemetry_Data_t telemetry_data; static void MAVLINK_parse_char(uint8_t c); uint8_t telemetryRxBufferCount = 0; -void processSerialData(uint8_t byte) { +void processTelemetryData(uint8_t byte) { MAVLINK_parse_char(byte); } diff --git a/radio/src/telemetry/telemetry.cpp b/radio/src/telemetry/telemetry.cpp index 599d87070..a48898d57 100644 --- a/radio/src/telemetry/telemetry.cpp +++ b/radio/src/telemetry/telemetry.cpp @@ -82,7 +82,7 @@ void processTelemetryData(uint8_t data) return; } #endif - processSerialData(data); + processTelemetryData(data); } #endif @@ -115,7 +115,7 @@ void telemetryWakeup() if (telemetryProtocol == PROTOCOL_FRSKY_D_SECONDARY) { uint8_t data; while (telemetrySecondPortReceive(data)) { - processSerialData(data); + processTelemetryData(data); } } else {