Commit 29488aa1 authored by Kristian Tan's avatar Kristian Tan

Supress warnings and move constructor for daily_usage

parent 52750848
...@@ -3,11 +3,14 @@ import RPi.GPIO as GPIO ...@@ -3,11 +3,14 @@ import RPi.GPIO as GPIO
from flask_sqlalchemy import SQLAlchemy from flask_sqlalchemy import SQLAlchemy
from sqlalchemy import create_engine from sqlalchemy import create_engine
import os import os
# from daily_usage import DailyUsage # from daily_usage import DailyUsage
app = Flask(__name__) app = Flask(__name__)
os.environ['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///energyUsage' os.environ['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///energyUsage'
app.config['SQLALCHEMY_DATABASE_URI'] = os.environ['SQLALCHEMY_DATABASE_URI'] app.config['SQLALCHEMY_DATABASE_URI'] = os.environ['SQLALCHEMY_DATABASE_URI']
# To suppress warnings
app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
GPIO.setmode(GPIO.BCM) GPIO.setmode(GPIO.BCM)
GPIO.setwarnings(False) GPIO.setwarnings(False)
...@@ -15,19 +18,22 @@ GPIO.setwarnings(False) ...@@ -15,19 +18,22 @@ GPIO.setwarnings(False)
db = SQLAlchemy(app) db = SQLAlchemy(app)
db.create_all() db.create_all()
# TODO: Move this into daily_usage class file # TODO: Move this into daily_usage class file
class DailyUsage(db.Model): class DailyUsage(db.Model):
id = db.Column(db.Integer, primary_key=True, autoincrement=True) id = db.Column(db.Integer, primary_key=True, autoincrement=True)
date = db.Column(db.String(80), unique=True, nullable=False) date = db.Column(db.String(80), unique=True, nullable=False)
hours = db.Column(db.Integer(120), unique=False) hours = db.Column(db.Integer(120), unique=False)
def __repr__(self):
return '<DailyUsage %r>' % self.id
def __init__(self, date_, hours_): def __init__(self, date_, hours_):
self.date = date_ self.date = date_
self.hours = hours_ self.hours = hours_
def __repr__(self):
return '<DailyUsage %r>' % self.id
test = DailyUsage(date="12/11/2019", hours=5) test = DailyUsage(date="12/11/2019", hours=5)
db.session.add(test) db.session.add(test)
...@@ -39,7 +45,6 @@ pins = { ...@@ -39,7 +45,6 @@ pins = {
25: {'name': 'Light', 'state': GPIO.LOW} 25: {'name': 'Light', 'state': GPIO.LOW}
} }
# Setup each pin # Setup each pin
for pin in pins: for pin in pins:
GPIO.setup(pin, GPIO.OUT) GPIO.setup(pin, GPIO.OUT)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment