Fixes #1527
This commit is contained in:
@@ -505,7 +505,7 @@ class ConversionTable {
|
|||||||
{
|
{
|
||||||
after = 0;
|
after = 0;
|
||||||
|
|
||||||
for (std::list<ConversionTuple>::iterator it=internalTable.begin(); it!=internalTable.end(); it++) {
|
for (std::list<ConversionTuple>::iterator it=exportTable.begin(); it!=exportTable.end(); it++) {
|
||||||
ConversionTuple tuple = *it;
|
ConversionTuple tuple = *it;
|
||||||
if (before == tuple.a) {
|
if (before == tuple.a) {
|
||||||
after = tuple.b;
|
after = tuple.b;
|
||||||
@@ -520,7 +520,7 @@ class ConversionTable {
|
|||||||
{
|
{
|
||||||
after = 0;
|
after = 0;
|
||||||
|
|
||||||
for (std::list<ConversionTuple>::iterator it=internalTable.begin(); it!=internalTable.end(); it++) {
|
for (std::list<ConversionTuple>::iterator it=importTable.begin(); it!=importTable.end(); it++) {
|
||||||
ConversionTuple tuple = *it;
|
ConversionTuple tuple = *it;
|
||||||
if (before == tuple.b) {
|
if (before == tuple.b) {
|
||||||
after = tuple.a;
|
after = tuple.a;
|
||||||
@@ -547,10 +547,23 @@ class ConversionTable {
|
|||||||
|
|
||||||
void addConversion(const int a, const int b)
|
void addConversion(const int a, const int b)
|
||||||
{
|
{
|
||||||
internalTable.push_back(ConversionTuple(a, b));
|
ConversionTuple conversion(a, b);
|
||||||
|
importTable.push_back(conversion);
|
||||||
|
exportTable.push_back(conversion);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::list<ConversionTuple> internalTable;
|
void addImportConversion(const int a, const int b)
|
||||||
|
{
|
||||||
|
importTable.push_back(ConversionTuple(a, b));
|
||||||
|
}
|
||||||
|
|
||||||
|
void addExportConversion(const int a, const int b)
|
||||||
|
{
|
||||||
|
exportTable.push_back(ConversionTuple(a, b));
|
||||||
|
}
|
||||||
|
|
||||||
|
std::list<ConversionTuple> importTable;
|
||||||
|
std::list<ConversionTuple> exportTable;
|
||||||
};
|
};
|
||||||
|
|
||||||
template<class T>
|
template<class T>
|
||||||
|
|||||||
@@ -56,8 +56,15 @@ class SwitchesConversionTable: public ConversionTable {
|
|||||||
|
|
||||||
for (int i=1; i<=MAX_SWITCHES_POSITION(board); i++) {
|
for (int i=1; i<=MAX_SWITCHES_POSITION(board); i++) {
|
||||||
int s = switchIndex(i, board, version);
|
int s = switchIndex(i, board, version);
|
||||||
addConversion(RawSwitch(SWITCH_TYPE_SWITCH, -s), -val+offset);
|
addConversion(RawSwitch(SWITCH_TYPE_SWITCH, s), val);
|
||||||
addConversion(RawSwitch(SWITCH_TYPE_SWITCH, s), val++);
|
if (IS_TARANIS(board) && s>=21/*SHup/SHdown*/) {
|
||||||
|
addImportConversion(RawSwitch(SWITCH_TYPE_SWITCH, 21+22-s), -val+offset);
|
||||||
|
addExportConversion(RawSwitch(SWITCH_TYPE_SWITCH, -s), -val+offset);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
addConversion(RawSwitch(SWITCH_TYPE_SWITCH, -s), -val+offset);
|
||||||
|
}
|
||||||
|
val++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (IS_TARANIS(board) && version >= 216) {
|
if (IS_TARANIS(board) && version >= 216) {
|
||||||
@@ -124,6 +131,16 @@ class SwitchesConversionTable: public ConversionTable {
|
|||||||
ConversionTable::addConversion(sw.toValue(), b);
|
ConversionTable::addConversion(sw.toValue(), b);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void addImportConversion(const RawSwitch & sw, const int b)
|
||||||
|
{
|
||||||
|
ConversionTable::addImportConversion(sw.toValue(), b);
|
||||||
|
}
|
||||||
|
|
||||||
|
void addExportConversion(const RawSwitch & sw, const int b)
|
||||||
|
{
|
||||||
|
ConversionTable::addExportConversion(sw.toValue(), b);
|
||||||
|
}
|
||||||
|
|
||||||
class Cache {
|
class Cache {
|
||||||
public:
|
public:
|
||||||
Cache(BoardEnum board, unsigned int version, unsigned long flags, SwitchesConversionTable * table):
|
Cache(BoardEnum board, unsigned int version, unsigned long flags, SwitchesConversionTable * table):
|
||||||
|
|||||||
Reference in New Issue
Block a user