Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 01:35:21 +03:00
Code Issues Wiki Activity

Function rename

Browse source
This commit is contained in:
bsongis 2012-03-28 18:51:03 +00:00
parent 9c16acb445
commit 2007b88ae1
5 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/eeprom_arm.cpp
View file

@ -192,7 +192,7 @@ void eeSwapModels(uint8_t id1, uint8_t id2)
memset(ModelNames[id2], 0, sizeof(g_model.name)); memset(ModelNames[id2], 0, sizeof(g_model.name));
Eeprom32_source_address = (uint8_t *)&Eeprom_buffer.data.model_data; // Get data from here Eeprom32_source_address = (uint8_t *)&Eeprom_buffer.data.model_data; // Get data from here
Eeprom32_data_size = sizeof(g_model) ; // This much Eeprom32_data_size = id1_size ; // This much
Eeprom32_file_index = id2 + 1 ; // This file system entry Eeprom32_file_index = id2 + 1 ; // This file system entry
Eeprom32_process_state = E32_BLANKCHECK ; Eeprom32_process_state = E32_BLANKCHECK ;
eeWaitFinished(); eeWaitFinished();

18
src/gtests.cpp
View file

@ -42,27 +42,27 @@ uint16_t anaIn(uint8_t chan)
TEST(trims, greaterTrimLink) TEST(trims, greaterTrimLink)
{ {
memset(&g_model, 0, sizeof(g_model)); memset(&g_model, 0, sizeof(g_model));
setRawTrimValue(1, 0, TRIM_EXTENDED_MAX+3); // link to FP3 trim setTrimValue(1, 0, TRIM_EXTENDED_MAX+3); // link to FP3 trim
setRawTrimValue(3, 0, 32); setTrimValue(3, 0, 32);
EXPECT_EQ(getRawTrimValue(getTrimFlightPhase(0, 1), 0), 32); EXPECT_EQ(getRawTrimValue(getTrimFlightPhase(0, 1), 0), 32);
} }
TEST(trims, chainedTrims) TEST(trims, chainedTrims)
{ {
memset(&g_model, 0, sizeof(g_model)); memset(&g_model, 0, sizeof(g_model));
setRawTrimValue(0, 0, 32); setTrimValue(0, 0, 32);
setRawTrimValue(1, 0, TRIM_EXTENDED_MAX+1); // link to FP0 trim setTrimValue(1, 0, TRIM_EXTENDED_MAX+1); // link to FP0 trim
setRawTrimValue(2, 0, TRIM_EXTENDED_MAX+2); // link to FP1 trim setTrimValue(2, 0, TRIM_EXTENDED_MAX+2); // link to FP1 trim
EXPECT_EQ(getRawTrimValue(getTrimFlightPhase(0, 2), 0), 32); EXPECT_EQ(getRawTrimValue(getTrimFlightPhase(0, 2), 0), 32);
} }
TEST(trims, infiniteChainedTrims) TEST(trims, infiniteChainedTrims)
{ {
memset(&g_model, 0, sizeof(g_model)); memset(&g_model, 0, sizeof(g_model));
setRawTrimValue(0, 0, 32); setTrimValue(0, 0, 32);
setRawTrimValue(1, 0, TRIM_EXTENDED_MAX+3); // link to FP3 trim setTrimValue(1, 0, TRIM_EXTENDED_MAX+3); // link to FP3 trim
setRawTrimValue(2, 0, TRIM_EXTENDED_MAX+2); // link to FP1 trim setTrimValue(2, 0, TRIM_EXTENDED_MAX+2); // link to FP1 trim
setRawTrimValue(3, 0, TRIM_EXTENDED_MAX+3); // link to FP2 trim setTrimValue(3, 0, TRIM_EXTENDED_MAX+3); // link to FP2 trim
EXPECT_EQ(getRawTrimValue(getTrimFlightPhase(0, 2), 0), 32); EXPECT_EQ(getRawTrimValue(getTrimFlightPhase(0, 2), 0), 32);
} }

2
src/model_menus.cpp
View file

@ -668,7 +668,7 @@ void menuProcPhaseOne(uint8_t event)
v = checkIncDec(event, v, TRIM_EXTENDED_MAX, TRIM_EXTENDED_MAX+MAX_PHASES-1, EE_MODEL); v = checkIncDec(event, v, TRIM_EXTENDED_MAX, TRIM_EXTENDED_MAX+MAX_PHASES-1, EE_MODEL);
if (checkIncDec_Ret) { if (checkIncDec_Ret) {
if (v == TRIM_EXTENDED_MAX) v = 0; if (v == TRIM_EXTENDED_MAX) v = 0;
setRawTrimValue(s_currIdx, t, v); setTrimValue(s_currIdx, t, v);
} }
} }
} }

8
src/open9x.cpp
View file

@ -589,7 +589,7 @@ int16_t getTrimValue(uint8_t phase, uint8_t idx)
return getRawTrimValue(getTrimFlightPhase(phase, idx), idx); return getRawTrimValue(getTrimFlightPhase(phase, idx), idx);
} }
void setRawTrimValue(uint8_t phase, uint8_t idx, int16_t trim) void setTrimValue(uint8_t phase, uint8_t idx, int16_t trim)
{ {
if (s_trimPtr[idx]) { if (s_trimPtr[idx]) {
*s_trimPtr[idx] = limit((int16_t)-125, trim, (int16_t)+125); *s_trimPtr[idx] = limit((int16_t)-125, trim, (int16_t)+125);
@ -837,7 +837,7 @@ uint8_t checkTrim(uint8_t event)
after = TRIM_EXTENDED_MAX; after = TRIM_EXTENDED_MAX;
} }
setRawTrimValue(phase, idx, after); setTrimValue(phase, idx, after);
#if defined (AUDIO) #if defined (AUDIO)
// toneFreq higher/lower according to trim position // toneFreq higher/lower according to trim position
@ -2224,7 +2224,7 @@ void instantTrim()
if (trim > TRIM_EXTENDED_MAX) { if (trim > TRIM_EXTENDED_MAX) {
trim = TRIM_EXTENDED_MAX; trim = TRIM_EXTENDED_MAX;
} }
setRawTrimValue(trim_phase, i, trim); setTrimValue(trim_phase, i, trim);
} }
} }
@ -2263,7 +2263,7 @@ void moveTrimsToOffsets() // copy state of 3 primary to subtrim
for (uint8_t phase=0; phase<MAX_PHASES; phase++) { for (uint8_t phase=0; phase<MAX_PHASES; phase++) {
int16_t trim = getRawTrimValue(phase, i); int16_t trim = getRawTrimValue(phase, i);
if (trim <= TRIM_EXTENDED_MAX) if (trim <= TRIM_EXTENDED_MAX)
setRawTrimValue(phase, i, trim - original_trim); setTrimValue(phase, i, trim - original_trim);
} }
} }
} }

2
src/open9x.h
View file

@ -490,7 +490,7 @@ extern uint8_t getFlightPhase();
extern uint8_t getTrimFlightPhase(uint8_t phase, uint8_t idx); extern uint8_t getTrimFlightPhase(uint8_t phase, uint8_t idx);
extern int16_t getRawTrimValue(uint8_t phase, uint8_t idx); extern int16_t getRawTrimValue(uint8_t phase, uint8_t idx);
extern int16_t getTrimValue(uint8_t phase, uint8_t idx); extern int16_t getTrimValue(uint8_t phase, uint8_t idx);
extern void setRawTrimValue(uint8_t phase, uint8_t idx, int16_t trim); extern void setTrimValue(uint8_t phase, uint8_t idx, int16_t trim);
extern uint16_t s_timeCumTot; extern uint16_t s_timeCumTot;
extern uint16_t s_timeCumThr; //gewichtete laufzeit in 1/16 sec extern uint16_t s_timeCumThr; //gewichtete laufzeit in 1/16 sec