github annotations

- documentation: change `aeon` to `aeon7`
- change `case` order in `switch` statements
- update README.txt

5 files changed, 13 insertions, 16 deletions

diff --git a/README.md b/README.md
index 7573d32..2c0b385 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,9 @@
 ###### Ported by nioroso-x3
 # XMR-Stak - Monero/Aeon All-in-One Mining Software
 
-XMR-Stak is a universal Stratum pool miner. This miner supports CPUs, with AMD and NVIDIA gpus untested and can be used to mine the crypto currency Monero and Aeon.
+**XMR-Stak is ready for the POW change of Monero-v7, Aeon-v7 and Sumukoin-v3**
+
+XMR-Stak is a universal Stratum pool miner. This miner supports CPUs, AMD and NVIDIA gpus and can be used to mine the crypto currency Monero and Aeon.
 
 ## Overview
 
diff --git a/doc/FAQ.md b/doc/FAQ.md
index a5b2083..d3cbb62 100644
--- a/doc/FAQ.md
+++ b/doc/FAQ.md
@@ -28,7 +28,7 @@ You can also do it Windows-style and simply run-as-root, but this is NOT recomme
 
 If the miner is compiled for Monero and Aeon than you can change
  - the value `currency` in the config *or*
- - start the miner with the [command line option](usage.md) `--currency monero7` or `--currency aeon`
+ - start the miner with the [command line option](usage.md) `--currency monero7` or `--currency aeon7`
  - run `xmr-stak --help` to see all supported currencies and algorithms
 
 ## How can I mine Monero
diff --git a/xmrstak/backend/cryptonight.hpp b/xmrstak/backend/cryptonight.hpp
index 538f1d8..8a8e259 100644
--- a/xmrstak/backend/cryptonight.hpp
+++ b/xmrstak/backend/cryptonight.hpp
@@ -49,16 +49,14 @@ inline size_t cn_select_memory(xmrstak_algo algo)
 {
 	switch(algo)
 	{
+	case cryptonight_monero:
 	case cryptonight:
-		return CRYPTONIGHT_MEMORY;
+		return CRYPTONIGHT_MEMORY;	
+	case cryptonight_aeon:
 	case cryptonight_lite:
 		return CRYPTONIGHT_LITE_MEMORY;
-	case cryptonight_monero:
-		return CRYPTONIGHT_MEMORY;
 	case cryptonight_heavy:
 		return CRYPTONIGHT_HEAVY_MEMORY;
-	case cryptonight_aeon:
-		return CRYPTONIGHT_LITE_MEMORY;
 	default:
 		return 0;
 	}
@@ -86,16 +84,14 @@ inline size_t cn_select_mask(xmrstak_algo algo)
 {
 	switch(algo)
 	{
+	case cryptonight_monero:
 	case cryptonight:
 		return CRYPTONIGHT_MASK;
+	case cryptonight_aeon:
 	case cryptonight_lite:
 		return CRYPTONIGHT_LITE_MASK;
-	case cryptonight_monero:
-		return CRYPTONIGHT_MASK;
 	case cryptonight_heavy:
 		return CRYPTONIGHT_HEAVY_MASK;
-	case cryptonight_aeon:
-		return CRYPTONIGHT_LITE_MASK;
 	default:
 		return 0;
 	}
@@ -123,16 +119,14 @@ inline size_t cn_select_iter(xmrstak_algo algo)
 {
 	switch(algo)
 	{
+	case cryptonight_monero:
 	case cryptonight:
 		return CRYPTONIGHT_ITER;
+	case cryptonight_aeon:
 	case cryptonight_lite:
 		return CRYPTONIGHT_LITE_ITER;
-	case cryptonight_monero:
-		return CRYPTONIGHT_ITER;
 	case cryptonight_heavy:
 		return CRYPTONIGHT_HEAVY_ITER;
-	case cryptonight_aeon:
-		return CRYPTONIGHT_LITE_ITER;
 	default:
 		return 0;
 	}
diff --git a/xmrstak/misc/executor.cpp b/xmrstak/misc/executor.cpp
index d7ff521..96f359b 100644
--- a/xmrstak/misc/executor.cpp
+++ b/xmrstak/misc/executor.cpp
@@ -572,6 +572,7 @@ void executor::ex_main()
 		break;
 
 	case cryptonight_aeon:
+	case cryptonight_lite:
 		if(dev_tls)
 			pools.emplace_front(0, "donate.xmr-stak.net:7777", "", "", "", 0.0, true, true, "", true);
 		else
diff --git a/xmrstak/pools.tpl b/xmrstak/pools.tpl
index d3a8a5a..f5afff6 100644
--- a/xmrstak/pools.tpl
+++ b/xmrstak/pools.tpl
@@ -20,7 +20,7 @@ POOLCONF],
 /*
  * Currency to mine. Supported values:
  *
- *    aeon
+ *    aeon7 (use this for Aeon's new PoW)
  *    cryptonight (try this if your coin is not listed)
  *    cryptonight_lite
  *    edollar