aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToni Uhlig <Toni.Uhlig@tq-group.com>2017-12-01 14:44:15 +0100
committerToni Uhlig <Toni.Uhlig@tq-group.com>2017-12-01 14:44:15 +0100
commit2263f4f6a537c443c7ce89694179d10bcad7e334 (patch)
treef042e40b8f5d799326f69641a41f2d878930c24e
parentc0523ebbe05e4add1c6872310a40d3390c89694c (diff)
removed wrong/unreleased energy manager firmware version from the firmware map
-rw-r--r--src/UpdateFactory.cpp8
-rw-r--r--src/UpdateFactory.hpp9
2 files changed, 4 insertions, 13 deletions
diff --git a/src/UpdateFactory.cpp b/src/UpdateFactory.cpp
index 539835c..ba11376 100644
--- a/src/UpdateFactory.cpp
+++ b/src/UpdateFactory.cpp
@@ -31,16 +31,10 @@ static std::string toHex(const std::string& s, bool upper_case)
* Remember to retain the order of all mapped versions!
*/
static const std::vector<std::pair<std::string, const EMCVersion>> version_map {
- { "1.30", EMC_130 }, { "1.31", EMC_131 }, { "1.32", EMC_132 }, { "1.33", EMC_133 },
- { "1.34", EMC_134 }, { "1.35", EMC_135 }, { "1.36", EMC_136 }, { "1.37", EMC_137 },
{ "1.38", EMC_138 }, { "1.39", EMC_139 },
- { "1.40", EMC_140 }, { "1.41", EMC_141 }, { "1.42", EMC_142 }, { "1.43", EMC_143 },
- { "1.44", EMC_144 }, { "1.45", EMC_145 }, { "1.46", EMC_146 }, { "1.47", EMC_147 },
- { "1.48", EMC_148 }, { "1.49", EMC_149 },
- { "1.50", EMC_150 }, { "1.501", EMC_1501 },
+ { "1.50", EMC_150 }, { "1.50.1", EMC_1501 },
{ "2.00", EMC_200 }, { "2.01", EMC_201 }, { "2.02", EMC_202 }, { "2.03", EMC_203 },
{ "2.04", EMC_204 },
- { "2.04~rc5", EMC_204RC5 }, { "2.04~rc6", EMC_204RC6 }
};
enum EMCVersion mapEmcVersion(std::string& emc_version)
diff --git a/src/UpdateFactory.hpp b/src/UpdateFactory.hpp
index 7932f5a..190ddf1 100644
--- a/src/UpdateFactory.hpp
+++ b/src/UpdateFactory.hpp
@@ -19,13 +19,10 @@
enum EMCVersion {
- EMC_130, EMC_131, EMC_132, EMC_133, EMC_134, EMC_135,
- EMC_136, EMC_137, EMC_138, EMC_139,
- EMC_140, EMC_141, EMC_142, EMC_143, EMC_144, EMC_145,
- EMC_146, EMC_147, EMC_148, EMC_149,
+ EMC_138, EMC_139,
EMC_150, EMC_1501,
- EMC_200, EMC_201, EMC_202, EMC_203, EMC_204,
- EMC_204RC5, EMC_204RC6, /* only for testing */
+ EMC_200, EMC_201, EMC_202, EMC_203,
+ EMC_204,
EMC_UNKNOWN
};