Core in import of EEPROMS < 216

This commit is contained in:
bsongis
2014-02-26 09:54:25 +01:00
parent 0029f57413
commit f5b9ebfcc3
+8 -4
View File
@@ -650,12 +650,14 @@ class ConversionField: public TransformedField {
if (!error.isEmpty()) if (!error.isEmpty())
EEPROMWarnings += error + "\n"; EEPROMWarnings += error + "\n";
} }
else if (shift) {
if (shift) {
if (val < min) _field = min + shift; if (val < min) _field = min + shift;
else if (val > max) _field = max + shift; else if (val > max) _field = max + shift;
else _field = val + shift; else _field = val + shift;
} }
else {
if (exportFunc) {
_field = exportFunc(val); _field = exportFunc(val);
} }
} }
@@ -666,10 +668,12 @@ class ConversionField: public TransformedField {
if (table->importValue(_field, field)) if (table->importValue(_field, field))
return; return;
} }
else if (shift) {
if (shift) {
field = _field - shift; field = _field - shift;
} }
else {
if (importFunc) {
field = importFunc(_field); field = importFunc(_field);
} }