From 53f1dcef4b1b0c54915493b461bf20ef7ed089b1 Mon Sep 17 00:00:00 2001
From: aazhou <aazhou@protonmail.com>
Date: Sun, 2 Jul 2023 22:41:35 +0800
Subject: [PATCH] add macd signals

---
 main.py          | 6 +++++-
 strategy_test.py | 7 ++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/main.py b/main.py
index 748b65e..9999986 100644
--- a/main.py
+++ b/main.py
@@ -3,21 +3,25 @@ import bn
 import setting
 import time
 import signals.ema_arrangement as maa
+import signals.macd as macd
 import monitors.large_transfer as lt
 
-# symbols = ['BTCUSDT','ETHUSDT','FILUSDT','MASKUSDT','DOGEUSDT','CFXUSDT','LTCUSDT']
 
 symbols = bn.symbols()
 
 for s in symbols:
     #15m
     schedule.every(15).minutes.do(maa.run, symbol=s, interval='15m')
+    schedule.every(15).minutes.do(macd.run, symbol=s, interval='15m')
 
     #1h
     schedule.every(1).hours.do(maa.run, symbol=s, interval='1h')
+    schedule.every(1).hours.do(macd.run, symbol=s, interval='1h')
+
 
     #4h
     schedule.every(4).hours.do(maa.run, symbol=s, interval='4h')
+    schedule.every(4).hours.do(macd.run, symbol=s, interval='4h')
 
 # 监控
 schedule.every(setting.whaleAlert_minutes).minutes.do(lt.run)
diff --git a/strategy_test.py b/strategy_test.py
index c6da030..409ad15 100644
--- a/strategy_test.py
+++ b/strategy_test.py
@@ -2,13 +2,10 @@ import monitors.large_transfer as lt
 import bn
 import signals.ema_arrangement as maa
 import signals.volume_growing as vg
+import signals.macd as macd
 
-# symbols = bn.symbols()
-
-# for s in symbols:
-# maa.run('LINKUSDT', '1h')
 
 symbols = bn.symbols()
 
 for s in symbols:
-    vg.run(s, '1h')
\ No newline at end of file
+    macd.run(s, '1h')
\ No newline at end of file