One more rename

This commit is contained in:
Damjan Adamic
2014-05-17 17:06:29 +02:00
parent c2031934e0
commit 6e5f064c31
4 changed files with 10 additions and 10 deletions
+3 -3
View File
@@ -242,7 +242,7 @@ bool getSwitch(int8_t swtch)
lsLastValue[cs_idx] = CS_LAST_VALUE_INIT;
result = false;
}
else if ((s=cswFamily(ls->func)) == LS_FAMILY_BOOL) {
else if ((s=lswFamily(ls->func)) == LS_FAMILY_BOOL) {
bool res1 = getSwitch(ls->v1);
bool res2 = getSwitch(ls->v2);
switch (ls->func) {
@@ -672,7 +672,7 @@ LogicalSwitchData *lswAddress(uint8_t idx)
return &g_model.logicalSw[idx];
}
uint8_t cswFamily(uint8_t func)
uint8_t lswFamily(uint8_t func)
{
if (func <= LS_FUNC_ANEG)
return LS_FAMILY_OFS;
@@ -707,7 +707,7 @@ getvalue_t convertLswTelemValue(LogicalSwitchData * ls)
#if defined(CPUARM)
val = convert16bitsTelemValue(ls->v1 - MIXSRC_FIRST_TELEM + 1, ls->v2);
#else
if (cswFamily(ls->func)==LS_FAMILY_OFS)
if (lswFamily(ls->func)==LS_FAMILY_OFS)
val = convert8bitsTelemValue(ls->v1 - MIXSRC_FIRST_TELEM + 1, 128+ls->v2);
else
val = convert8bitsTelemValue(ls->v1 - MIXSRC_FIRST_TELEM + 1, 128+ls->v2) - convert8bitsTelemValue(ls->v1 - MIXSRC_FIRST_TELEM + 1, 128);