浏览代码

Merge pull request #1 from Manuel83/master

Update
tags/3.1_alpha
swimIan GitHub 8 年前
父节点
当前提交
9c44d3ff62
共有 2 个文件被更改,包括 4 次插入3 次删除
  1. +1
    -1
      install.sh
  2. +3
    -2
      modules/buzzer/__init__.py

+ 1
- 1
install.sh 查看文件

@@ -136,7 +136,7 @@ show_menu () {
fi fi
;; ;;
10) 10)
confirmAnswer "Are you sure you want to reboo the Raspberry Pi?"
confirmAnswer "Are you sure you want to reboot the Raspberry Pi?"
if [ $? = 0 ]; then if [ $? = 0 ]; then
sudo reboot sudo reboot
else else


+ 3
- 2
modules/buzzer/__init__.py 查看文件

@@ -13,12 +13,13 @@ class Buzzer(object):
def __init__(self, gpio): def __init__(self, gpio):
try: try:
cbpi.app.logger.info("INIT BUZZER NOW GPIO%s" % gpio) cbpi.app.logger.info("INIT BUZZER NOW GPIO%s" % gpio)
self.gpio = gpio
self.gpio = int(gpio)
GPIO.setmode(GPIO.BCM) GPIO.setmode(GPIO.BCM)
GPIO.setup(gpio, GPIO.OUT)
GPIO.setup(self.gpio, GPIO.OUT)
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:
cbpi.app.logger.info("BUZZER EXCEPTION %s" % str(e))
self.state = False self.state = False


def beep(self): def beep(self):


正在加载...
取消
保存