Просмотр исходного кода

Support passive buzzer

pull/219/head
Alexander Solncev Alexander Solncev 7 лет назад
Родитель
Сommit
60ab783698
3 измененных файлов: 22 добавлений и 6 удалений
  1. +1
    -0
      config/schema.sql
  2. +20
    -6
      modules/buzzer/__init__.py
  3. +1
    -0
      update/4_passive_buzzer.sql

+ 1
- 0
config/schema.sql Просмотреть файл

@@ -86,6 +86,7 @@ INSERT OR IGNORE INTO config VALUES ('unit', 'C', 'select', 'Temperature Unit',
INSERT OR IGNORE INTO config VALUES ('brewery_name', 'My Home Brewery', 'text', 'Your brewery name', NULL ); INSERT OR IGNORE INTO config VALUES ('brewery_name', 'My Home Brewery', 'text', 'Your brewery name', NULL );
INSERT OR IGNORE INTO config VALUES ('buzzer', 16, 'select', 'Buzzer GPIO', '[16,17,18,19,20]'); INSERT OR IGNORE INTO config VALUES ('buzzer', 16, 'select', 'Buzzer GPIO', '[16,17,18,19,20]');
INSERT OR IGNORE INTO config VALUES ('buzzer_beep_level', 'HIGH', 'select', 'Buzzer Logic Beep Level', '["HIGH", "LOW"]'); INSERT OR IGNORE INTO config VALUES ('buzzer_beep_level', 'HIGH', 'select', 'Buzzer Logic Beep Level', '["HIGH", "LOW"]');
INSERT OR IGNORE INTO config VALUES ('buzzer_type', 'ACTIVE', 'select', 'Buzzer type', '["ACTIVE", "PASSIVE"]');
INSERT OR IGNORE INTO config VALUES ('setup', 'YES', 'select', 'Show the Setup dialog', '["YES","NO"]'); INSERT OR IGNORE INTO config VALUES ('setup', 'YES', 'select', 'Show the Setup dialog', '["YES","NO"]');
INSERT OR IGNORE INTO config VALUES ('brew_name', '', 'text', 'Brew Name', NULL); INSERT OR IGNORE INTO config VALUES ('brew_name', '', 'text', 'Brew Name', NULL);
INSERT OR IGNORE INTO config VALUES ('donation_notification', 'YES', 'select', 'Disable Donation Notification', '["YES","NO"]'); INSERT OR IGNORE INTO config VALUES ('donation_notification', 'YES', 'select', 'Disable Donation Notification', '["YES","NO"]');


+ 20
- 6
modules/buzzer/__init__.py Просмотреть файл

@@ -10,13 +10,16 @@ except Exception as e:
class Buzzer(object): class Buzzer(object):


sound = ["H", 0.1, "L", 0.1, "H", 0.1, "L", 0.1, "H", 0.1, "L"] sound = ["H", 0.1, "L", 0.1, "H", 0.1, "L", 0.1, "H", 0.1, "L"]
def __init__(self, gpio, beep_level):
def __init__(self, gpio, buzzer_type, beep_level):
try: try:
cbpi.app.logger.info("INIT BUZZER NOW GPIO%s" % gpio) cbpi.app.logger.info("INIT BUZZER NOW GPIO%s" % gpio)
self.gpio = int(gpio) self.gpio = int(gpio)
self.beep_level = beep_level self.beep_level = beep_level
self.buzzer_type = buzzer_type
GPIO.setmode(GPIO.BCM) GPIO.setmode(GPIO.BCM)
GPIO.setup(self.gpio, GPIO.OUT) GPIO.setup(self.gpio, GPIO.OUT)
if buzzer_type == "PASSIVE":
self.p = GPIO.PWM(int(gpio), 5000)
self.state = True self.state = True
cbpi.app.logger.info("BUZZER SETUP OK") cbpi.app.logger.info("BUZZER SETUP OK")
except Exception as e: except Exception as e:
@@ -29,19 +32,29 @@ class Buzzer(object):
return return


def play(sound): def play(sound):
def output(level):
if self.buzzer_type == "PASSIVE" and level == GPIO.LOW:
self.p.stop()
elif self.buzzer_type == "PASSIVE":
self.p.start(50)
else:
GPIO.output(int(self.gpio), level)

try: try:
for i in sound: for i in sound:
if (isinstance(i, str)): if (isinstance(i, str)):
if i == "H" and self.beep_level == "HIGH": if i == "H" and self.beep_level == "HIGH":
GPIO.output(int(self.gpio), GPIO.HIGH)
output(GPIO.HIGH)
elif i == "H" and self.beep_level != "HIGH": elif i == "H" and self.beep_level != "HIGH":
GPIO.output(int(self.gpio), GPIO.LOW)
output(GPIO.LOW)
elif i == "L" and self.beep_level == "HIGH": elif i == "L" and self.beep_level == "HIGH":
GPIO.output(int(self.gpio), GPIO.LOW)
output(GPIO.LOW)
else: else:
GPIO.output(int(self.gpio), GPIO.HIGH)
output(GPIO.HIGH)
else: else:
time.sleep(i) time.sleep(i)
if self.buzzer_type == "PASSIVE":
self.p.stop()
except Exception as e: except Exception as e:
pass pass


@@ -51,7 +64,8 @@ class Buzzer(object):
def init(cbpi): def init(cbpi):
gpio = cbpi.get_config_parameter("buzzer", 16) gpio = cbpi.get_config_parameter("buzzer", 16)
beep_level = cbpi.get_config_parameter("buzzer_beep_level", "HIGH") beep_level = cbpi.get_config_parameter("buzzer_beep_level", "HIGH")
buzzer_type = cbpi.get_config_parameter("buzzer_type", "ACTIVE")


cbpi.buzzer = Buzzer(gpio, beep_level)
cbpi.buzzer = Buzzer(gpio, buzzer_type, beep_level)
cbpi.beep() cbpi.beep()
cbpi.app.logger.info("INIT OK") cbpi.app.logger.info("INIT OK")

+ 1
- 0
update/4_passive_buzzer.sql Просмотреть файл

@@ -0,0 +1 @@
INSERT OR IGNORE INTO config VALUES ('buzzer_type', 'ACTIVE', 'select', 'Buzzer type', '["ACTIVE", "PASSIVE"]');

Загрузка…
Отмена
Сохранить