From 861e9f9cee34030c29964fda9f2a5a6b886887e7 Mon Sep 17 00:00:00 2001 From: kenorb Date: Sat, 25 Sep 2021 20:31:37 +0100 Subject: [PATCH 1/6] Updates classes to v2.007 tag release and strategies update --- src/include/classes | 2 +- src/include/includes.h | 2 ++ src/include/strategies | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/include/classes b/src/include/classes index fc809c6..8404a7b 160000 --- a/src/include/classes +++ b/src/include/classes @@ -1 +1 @@ -Subproject commit fc809c683db90004dc36cba6e539c5f3bc026229 +Subproject commit 8404a7b647e2afd407cfe1ccc823fc3853a1fa5e diff --git a/src/include/includes.h b/src/include/includes.h index ed4f16c..09ce341 100644 --- a/src/include/includes.h +++ b/src/include/includes.h @@ -38,6 +38,8 @@ #include "classes/Indicators/Indi_AC.mqh" #include "classes/Indicators/Indi_AD.mqh" #include "classes/Indicators/Indi_ADX.mqh" +#include "classes/Indicators/Indi_ADXW.mqh" +#include "classes/Indicators/Indi_AMA.mqh" #include "classes/Indicators/Indi_AO.mqh" #include "classes/Indicators/Indi_ATR.mqh" #include "classes/Indicators/Indi_Alligator.mqh" diff --git a/src/include/strategies b/src/include/strategies index 6918c10..6ab6805 160000 --- a/src/include/strategies +++ b/src/include/strategies @@ -1 +1 @@ -Subproject commit 6918c10314143f29360e4e32193d57b8bd8b3f2f +Subproject commit 6ab6805c631c86dd5957fbe9f20756e5b6880d91 From 78f11497e5769a6b9a4600991605210a63ff5616 Mon Sep 17 00:00:00 2001 From: kenorb Date: Sun, 26 Sep 2021 14:31:59 +0100 Subject: [PATCH 2/6] Adds AMA and ASI strategies --- src/EA31337-Libre.mq5 | 4 ++++ src/include/enum.h | 2 ++ src/include/includes.h | 1 + src/include/strategies | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/EA31337-Libre.mq5 b/src/EA31337-Libre.mq5 index 8a25d93..e724a1e 100644 --- a/src/EA31337-Libre.mq5 +++ b/src/EA31337-Libre.mq5 @@ -245,6 +245,10 @@ bool EAStrategyAdd(ENUM_STRATEGY _stg, int _tfs) { return ea.StrategyAdd(_tfs, _magic_no, _stg); case STRAT_ADX: return ea.StrategyAdd(_tfs, _magic_no, _stg); + case STRAT_AMA: + return ea.StrategyAdd(_tfs, _magic_no, _stg); + case STRAT_ASI: + return ea.StrategyAdd(_tfs, _magic_no, _stg); case STRAT_ATR: return ea.StrategyAdd(_tfs, _magic_no, _stg); case STRAT_ALLIGATOR: diff --git a/src/include/enum.h b/src/include/enum.h index dff5472..7055ef1 100644 --- a/src/include/enum.h +++ b/src/include/enum.h @@ -26,6 +26,8 @@ enum ENUM_STRATEGY { // Define list of strategies. STRAT_AD, // AD STRAT_ADX, // ADX STRAT_ALLIGATOR, // Alligator + STRAT_AMA, // AMA + STRAT_ASI, // ASI STRAT_ATR, // ATR STRAT_AWESOME, // Awesome STRAT_BANDS, // Bands diff --git a/src/include/includes.h b/src/include/includes.h index 09ce341..2876013 100644 --- a/src/include/includes.h +++ b/src/include/includes.h @@ -41,6 +41,7 @@ #include "classes/Indicators/Indi_ADXW.mqh" #include "classes/Indicators/Indi_AMA.mqh" #include "classes/Indicators/Indi_AO.mqh" +#include "classes/Indicators/Indi_ASI.mqh" #include "classes/Indicators/Indi_ATR.mqh" #include "classes/Indicators/Indi_Alligator.mqh" #include "classes/Indicators/Indi_BWMFI.mqh" diff --git a/src/include/strategies b/src/include/strategies index 6ab6805..5de3994 160000 --- a/src/include/strategies +++ b/src/include/strategies @@ -1 +1 @@ -Subproject commit 6ab6805c631c86dd5957fbe9f20756e5b6880d91 +Subproject commit 5de3994f16a6fabb45c10e51d78cf5ab734ba956 From a4a28df27da22d92808238d02643c61d5cbb91de Mon Sep 17 00:00:00 2001 From: kenorb Date: Sun, 26 Sep 2021 14:34:48 +0100 Subject: [PATCH 3/6] Sets version to v1.007 --- src/EA31337-Libre.mqproj | 2 +- src/include/define.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/EA31337-Libre.mqproj b/src/EA31337-Libre.mqproj index 10303a4..e330fea 100644 --- a/src/EA31337-Libre.mqproj +++ b/src/EA31337-Libre.mqproj @@ -3,7 +3,7 @@ "program_type":"expert", "copyright" :"Copyright 2016-2021, EA31337 Ltd", "link" :"https:\/\/github.com\/EA31337\/EA31337-Libre", - "version" :"1.006", + "version" :"1.007", "description" :"Forex trading robot", "optimize" :"0", "fpzerocheck" :"1", diff --git a/src/include/define.h b/src/include/define.h index 1b385c3..39cced5 100644 --- a/src/include/define.h +++ b/src/include/define.h @@ -21,7 +21,7 @@ // EA defines. #define ea_name "EA31337 Libre" -#define ea_version "1.006" +#define ea_version "1.007" #define ea_desc "Forex trading robot" #define ea_link "https://github.com/EA31337/EA31337-Libre" #define ea_author "kenorb" From db560134c03ddded9fdcdaad3812a38fecb0c903 Mon Sep 17 00:00:00 2001 From: kenorb Date: Sun, 26 Sep 2021 16:06:21 +0100 Subject: [PATCH 4/6] Adds Chaikin strategy --- src/EA31337-Libre.mq5 | 2 ++ src/include/enum.h | 1 + src/include/includes.h | 1 + src/include/strategies | 2 +- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/EA31337-Libre.mq5 b/src/EA31337-Libre.mq5 index e724a1e..94620fc 100644 --- a/src/EA31337-Libre.mq5 +++ b/src/EA31337-Libre.mq5 @@ -265,6 +265,8 @@ bool EAStrategyAdd(ENUM_STRATEGY _stg, int _tfs) { return ea.StrategyAdd(_tfs, _magic_no, _stg); case STRAT_CCI: return ea.StrategyAdd(_tfs, _magic_no, _stg); + case STRAT_CHAIKIN: + return ea.StrategyAdd(_tfs, _magic_no, _stg); case STRAT_DEMA: return ea.StrategyAdd(_tfs, _magic_no, _stg); case STRAT_DEMARKER: diff --git a/src/include/enum.h b/src/include/enum.h index 7055ef1..bb52de6 100644 --- a/src/include/enum.h +++ b/src/include/enum.h @@ -35,6 +35,7 @@ enum ENUM_STRATEGY { // Define list of strategies. STRAT_BULLS_POWER, // Bulls Power STRAT_BWMFI, // BWMFI STRAT_CCI, // CCI + STRAT_CHAIKIN, // Chaikin STRAT_DEMA, // DEMA STRAT_DEMARKER, // DeMarker STRAT_ENVELOPES, // Envelopes diff --git a/src/include/includes.h b/src/include/includes.h index 2876013..8271941 100644 --- a/src/include/includes.h +++ b/src/include/includes.h @@ -49,6 +49,7 @@ #include "classes/Indicators/Indi_BearsPower.mqh" #include "classes/Indicators/Indi_BullsPower.mqh" #include "classes/Indicators/Indi_CCI.mqh" +#include "classes/Indicators/Indi_CHO.mqh" #include "classes/Indicators/Indi_DEMA.mqh" #include "classes/Indicators/Indi_DeMarker.mqh" #include "classes/Indicators/Indi_Envelopes.mqh" diff --git a/src/include/strategies b/src/include/strategies index 5de3994..d14fc46 160000 --- a/src/include/strategies +++ b/src/include/strategies @@ -1 +1 @@ -Subproject commit 5de3994f16a6fabb45c10e51d78cf5ab734ba956 +Subproject commit d14fc46e1be15f1ea3deede7b8f1b1439bfde2b7 From 2f827f13093e341d52520428ef14b2de4adc7ad6 Mon Sep 17 00:00:00 2001 From: kenorb Date: Sun, 26 Sep 2021 21:24:02 +0100 Subject: [PATCH 5/6] Adds Pivot strategy --- src/EA31337-Libre.mq5 | 2 ++ src/include/enum.h | 1 + src/include/includes.h | 1 + src/include/strategies | 2 +- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/EA31337-Libre.mq5 b/src/EA31337-Libre.mq5 index 94620fc..98b8dc7 100644 --- a/src/EA31337-Libre.mq5 +++ b/src/EA31337-Libre.mq5 @@ -297,6 +297,8 @@ bool EAStrategyAdd(ENUM_STRATEGY _stg, int _tfs) { return ea.StrategyAdd(_tfs, _magic_no, _stg); case STRAT_PATTERN: return ea.StrategyAdd(_tfs, _magic_no, _stg); + case STRAT_PIVOT: + return ea.StrategyAdd(_tfs, _magic_no, _stg); case STRAT_RSI: return ea.StrategyAdd(_tfs, _magic_no, _stg); case STRAT_RVI: diff --git a/src/include/enum.h b/src/include/enum.h index bb52de6..40beba6 100644 --- a/src/include/enum.h +++ b/src/include/enum.h @@ -51,6 +51,7 @@ enum ENUM_STRATEGY { // Define list of strategies. STRAT_OBV, // OBV STRAT_OSMA, // OSMA STRAT_PATTERN, // Pattern + STRAT_PIVOT, // Pivot STRAT_RSI, // RSI STRAT_RVI, // RVI STRAT_SAR, // SAR diff --git a/src/include/includes.h b/src/include/includes.h index 8271941..0836b95 100644 --- a/src/include/includes.h +++ b/src/include/includes.h @@ -65,6 +65,7 @@ #include "classes/Indicators/Indi_OBV.mqh" #include "classes/Indicators/Indi_OsMA.mqh" #include "classes/Indicators/Indi_Pattern.mqh" +#include "classes/Indicators/Indi_Pivot.mqh" #include "classes/Indicators/Indi_Price.mqh" #include "classes/Indicators/Indi_RSI.mqh" #include "classes/Indicators/Indi_RVI.mqh" diff --git a/src/include/strategies b/src/include/strategies index d14fc46..31d707d 160000 --- a/src/include/strategies +++ b/src/include/strategies @@ -1 +1 @@ -Subproject commit d14fc46e1be15f1ea3deede7b8f1b1439bfde2b7 +Subproject commit 31d707d0b0cff5cd45df71ecaef032207fe9bcee From 3907e65e808ee728e3a10cb9fa13a67efccf2bf0 Mon Sep 17 00:00:00 2001 From: kenorb Date: Mon, 27 Sep 2021 00:10:24 +0100 Subject: [PATCH 6/6] Updates strategies to v1.007 tag release --- src/include/strategies | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/include/strategies b/src/include/strategies index 31d707d..5ad9ec2 160000 --- a/src/include/strategies +++ b/src/include/strategies @@ -1 +1 @@ -Subproject commit 31d707d0b0cff5cd45df71ecaef032207fe9bcee +Subproject commit 5ad9ec20e9a4708c2f96dccf678936d71671e1ec