update

README.md

@@ -1,7 +1,38 @@
-# raspberrypirobot
-Date: 2017.8.11<br>
-A RaspberryPi robot website supported by flask<br>
-It has multi functions, feel free to explore.<br>
-A repository for raspberrypi robot source codes<br>
-Still under developing<br>
-Visit <a href="http://www.karachiwarship.top">KarachiWarship</a> for more details.
+# RaspberryPi Robot #
+## Date: 2017.8.16<br> ##
+### 
+A RaspberryPi robot web terminal programmed with flask and some tools that helps to set up a complete robot.<br>
+It has multiple functions, can act as the homeautomation center.<br>
+It is still under developing<br>
+###
+
+### login ###
+<img src=http://chuantu.biz/t5/168/1502445429x2093065985.png />
+
+### index ###
+<img src=http://chuantu.biz/t5/168/1502445406x2093065985.png />
+
+### patrol ###
+<img src=http://chuantu.biz/t5/168/1502445447x2093065985.png />
+
+### sensor graph ###
+<img src=http://chuantu.biz/t5/168/1502445470x2093065985.png />
+
+### home automation ###
+<img src=http://chuantu.biz/t5/168/1502445378x2093065985.png />
+
+### 404 ###
+<img src=http://chuantu.biz/t5/168/1502445259x2093065985.png />
+
+### 403 ###
+<img src=http://chuantu.biz/t5/168/1502445354x2093065985.png />
+
+Visit [KarachiWarship](http://www.karachiwarship.top) for more details.
+
+
+# Tools #
+* [Fritzing](http://fritzing.org)
+* [xmind](http://www.xmind.net/)
+* [Arduino IDE](http://arduino.cc/en/Main/Software)
+* [Pycharm]()
+* [VSCode]()

Web-Terminal/Modules/gpiostat.py

@@ -0,0 +1,22 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+"""
+Judge gpio status
+"""
+
+import RPi.GPIO as GPIO
+import time
+
+def gpio_status(GPIO_PIN):
+    GPIO.setmode(GPIO.BCM)
+    GPIO.setup(GPIO_PIN, GPIO.IN)
+    if(GPIO.input(GPIO_PIN) == 1):
+        return "on"
+    else:
+        return "off"
+    GPIO.cleanup()
+
+if __name__ == '__main__':
+    GPIO_PIN = 12
+    print gpio_status(GPIO_PIN)

Web-Terminal/README.md

@@ -0,0 +1,29 @@
+# raspberrypirobot
+Date: 2017.8.11<br>
+A RaspberryPi robot website supported by flask<br>
+It has multi functions, feel free to explore.<br>
+A repository for raspberrypi robot source codes<br>
+Still under developing<br>
+
+<h3>login</h3>
+<img src=http://chuantu.biz/t5/168/1502445429x2093065985.png />
+
+<h3>index</h3>
+<img src=http://chuantu.biz/t5/168/1502445406x2093065985.png />
+
+<h3>patrol</h3>
+<img src=http://chuantu.biz/t5/168/1502445447x2093065985.png />
+
+<h3>sensor graph</h3>
+<img src=http://chuantu.biz/t5/168/1502445470x2093065985.png />
+
+<h3>homeauto</h3>
+<img src=http://chuantu.biz/t5/168/1502445378x2093065985.png />
+
+<h3>404</h3>
+<img src=http://chuantu.biz/t5/168/1502445259x2093065985.png />
+
+<h3>403</h3>
+<img src=http://chuantu.biz/t5/168/1502445354x2093065985.png />
+
+Visit <a href="http://www.karachiwarship.top">KarachiWarship</a> for more details.

Web-Terminal/TASK

@@ -0,0 +1,14 @@
+#添加全局登录(finished)
+#添加amaze me slide图片展示
+#添加cmd页面链接(finished)
+#优化cmd命令结果展示(finished)
+#添加cmd命令路由(finished)
+#添加数据库温湿度数据录入和展示
+#添加管理后台，增加用户管理
+#用户邮件和自动化操作通知
+#人体感应通知
+#RESTful API
+#电量检测*
+#红外遥控操作*（空调，夜灯）
+#无线遥控操作*（插座开关）
+#蓝牙遥控操作*（电视）

raspberry.py → Web-Terminal/raspberry.py

@@ -32,7 +32,7 @@
     PASSWORD='111'
 ))
 app.config.from_envvar('FLASKR_SETTINGS', silent=True)
-app.permanent_session_lifetime = timedelta(hours=24)
+app.permanent_session_lifetime = timedelta(hours=5)
 
 
 
@@ -48,15 +48,15 @@ def page_not_found(error):
     title = 'Error 404'
     return render_template('404.html', title=title), 404
 
-@app.errorhandler(503)
+@app.errorhandler(500)
 def server_error(error):
     title = 'Error 503'
-    return render_template('503.html', title=title), 503
+    return render_template('503.html', title=title), 500
 
 
 #command page
 @app.route('/command')
-def show_entries():
+def command():
     title = 'Command'
     if not session.get('logged_in'):
         abort(403)
@@ -83,19 +83,19 @@ def login():
 
 
 #logout page
-# @app.route('/logout')
-# def logout():
-#     session.pop('logged_in', None)
-#     flash('You were logged out, fucker?')
-#     return redirect(url_for('login'))
+@app.route('/logout')
+def logout():
+    session.pop('logged_in', None)
+    flash('Warning: You were logged out!')
+    return redirect(url_for('login'))
 
 
 
 '''##########Pi Pages##########'''
 #raspberrypi pages
 @app.route('/index')
 def index():
-    session.permanent = True
+    # session.permanent = True
     if not session.get('logged_in'):
         abort(403)
     return render_template('index.html')
@@ -137,19 +137,50 @@ def get_humidity():
 def get_time():
     return "['2:00', '2:05', '2:10', '2:15', '2:20', '2:25', '2:30', '2:35', '2:40', '2:45', '2:50', '2:55']"
 
-
-'''##########CGI drivers##########'''
+'''##########Pi Power Control##########'''
+# from Modules.gpiostat import gpio_status
+
+@app.route('/power')
+def query():
+    # querystatus
+    return "on"
+    # GPIO_PIN = 12
+    # return gpio_status(GPIO_PIN)
+
+@app.route('/power/<control>')
+def switch(control):
+    if control == "on":
+        # switchon
+        return "on"
+    if control == "off":
+        # switchoff
+        return "off"
+
+
+'''##########Robot drivers##########'''
+
+@app.route('/driver/<control>')
+def robot_driver(control):
+    from Modules import driver as d
+    d.init_driver()
+    if control == "forward":
+        d.forward()
+    if control == "backward":
+        d.backward()
+    if control == "stop":
+        d.stop()
+    if control == "left":
+        d.left()
+    if control == "right":
+        d.right()
 
 '''##########Servo drivers##########'''
 # @app.route('/servo/<float:post_value>')
 # def servo_ctrl(post_value):
 #     servo.somefunc(post_value)
 
 
-'''##########Wheel drivers##########'''
-# @app.route('/wheel/<direction>')
-# def wheel_ctrl(direction):
-#     driver.somefunc(direction)
+