Merge branch 'feature/ootb-pascal' into develop

nwoolls · Jan 15, 2018 · 55ba060 · 55ba060
2 parents 20ca6ac + 2946d9d
commit 55ba060
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/MultiMiner.Engine/Data/AlgorithmParameter.cs b/MultiMiner.Engine/Data/AlgorithmParameter.cs
@@ -17,5 +17,6 @@ class AlgorithmParameter
         public const string AlgorithmEthash = "--algorithm ethash";
         public const string AlgorithmCryptoNight = "--algorithm cryptonight";
         public const string AlgorithmEquihash = "--algorithm equihash";
+        public const string AlgorithmPascal = "--algorithm pascal";
     }
 }
diff --git a/MultiMiner.Engine/Data/MinerNames.cs b/MultiMiner.Engine/Data/MinerNames.cs
@@ -12,5 +12,6 @@ public class MinerNames
         public const string AZNSGMiner = "AZNSGMiner";
         public const string MaxcoinCGMiner = "MaxcoinCGMiner";
         public const string SGMinerGM = "SGMinerGM";
+        public const string SGMinerPascal = "SGMinerPascal";
     }
 }
diff --git a/MultiMiner.Engine/MiningEngine.cs b/MultiMiner.Engine/MiningEngine.cs
@@ -197,6 +197,13 @@ private static void RegisterBuiltInAgorithms()
             algorithm.DefaultMiner = MinerNames.SGMinerGM;
             algorithm.MinerArguments[MinerNames.SGMinerGM] = AlgorithmParameter.AlgorithmEquihash;
             algorithm.BuiltIn = true;
+
+            algorithm = factory.RegisterAlgorithm(AlgorithmNames.Pascal, AlgorithmFullNames.Pascal);
+            algorithm.PoolMultiplier = 1;
+            algorithm.DifficultyMultiplier = Math.Pow(2, 32);
+            algorithm.DefaultMiner = MinerNames.SGMinerPascal;
+            algorithm.MinerArguments[MinerNames.SGMinerPascal] = AlgorithmParameter.AlgorithmPascal;
+            algorithm.BuiltIn = true;
         }
 
         private static void RegisterMiners()
@@ -212,6 +219,7 @@ private static void RegisterMiners()
             factory.RegisterMiner(MinerNames.MaxcoinCGMiner, MinerNames.CGMiner, true);
             factory.RegisterMiner(MinerNames.SGMiner5, MinerNames.SGMiner, true);
             factory.RegisterMiner(MinerNames.SGMinerGM, MinerNames.SGMiner, true);
+            factory.RegisterMiner(MinerNames.SGMinerPascal, MinerNames.SGMiner, true);
 
             string minersDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Miners");
             factory.RegisterMiners(minersDirectory);

diff --git a/MultiMiner.Xgminer/Data/AlgorithmNames.cs b/MultiMiner.Xgminer/Data/AlgorithmNames.cs
@@ -19,6 +19,7 @@ public static class AlgorithmNames
         public const string Ethash = "Ethash";
         public const string CryptoNight = "CryptoNight";
         public const string Equihash = "Equihash";
+        public const string Pascal = "Pascal";
     }
 
     public static class AlgorithmFullNames
@@ -40,6 +41,7 @@ public static class AlgorithmFullNames
         public const string Ethash = "Ethash";
         public const string CryptoNight = "CryptoNight";
         public const string Equihash = "Equihash";
+        public const string Pascal = "Pascal";
     }
 
     //how difficult is each algo on the same hardware relative to SHA256