summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--check_future_slots.py2
-rw-r--r--date.txt2
-rw-r--r--error_bash.txt48
-rw-r--r--myadmin/views.py2
-rw-r--r--new.csv30
-rwxr-xr-xproduction_static_files/img/webcam/image01.jpegbin4362 -> 4364 bytes
-rwxr-xr-xsbhs_server/scan_rpis.sh2
-rw-r--r--slot/views.py2
-rw-r--r--switch_off.py2
-rw-r--r--switch_onn.py2
10 files changed, 85 insertions, 7 deletions
diff --git a/check_future_slots.py b/check_future_slots.py
index c955453..9e46834 100644
--- a/check_future_slots.py
+++ b/check_future_slots.py
@@ -14,7 +14,7 @@ django.setup()
from sbhs_server.tables.models import Booking, Account, Board
# ser.close()
-ser = serial.Serial('/dev/ttyACM0')
+ser = serial.Serial('/dev/ttyUSB0')
def switch_on(b_id, booking_Date, nowhour,slot_id):
if datetime.now().date() == booking_Date: #This must be booking date:
diff --git a/date.txt b/date.txt
index 4ff1258..6d086bb 100644
--- a/date.txt
+++ b/date.txt
@@ -1 +1 @@
-Mon Feb 19 15:58:06 IST 2018
+Tue Feb 20 14:25:39 IST 2018
diff --git a/error_bash.txt b/error_bash.txt
index 3826e70..bf781d7 100644
--- a/error_bash.txt
+++ b/error_bash.txt
@@ -466,6 +466,54 @@ removed '/home/vlabs-sbhs/code/venv/lib/python2.7/os.pyc'
removed '/home/vlabs-sbhs/code/venv/lib/python2.7/sre_constants.pyc'
removed '/home/vlabs-sbhs/code/venv/lib/python2.7/_abcoll.pyc'
removed '/home/vlabs-sbhs/code/venv/lib/python2.7/codecs.pyc'
+10.102.7.148
+receiving incremental file list
+./
+receiving incremental file list
+./
+dkoder/
+suser7/
+10.102.7.167
+receiving incremental file list
+./
+receiving incremental file list
+./
+dkoder/
+suser7/
+10.102.7.149
+receiving incremental file list
+./
+10.log
+ 0 0% 0.00kB/s 0:00:00 2,178 100% 2.08MB/s 0:00:00 (xfr#1, to-chk=3/5)
+13.log
+ 0 0% 0.00kB/s 0:00:00 2,266 100% 2.16MB/s 0:00:00 (xfr#2, to-chk=2/5)
+14.log
+ 0 0% 0.00kB/s 0:00:00 1,848 100% 1.76MB/s 0:00:00 (xfr#3, to-chk=1/5)
+15.log
+ 0 0% 0.00kB/s 0:00:00 2,552 100% 2.43MB/s 0:00:00 (xfr#4, to-chk=0/5)
+receiving incremental file list
+./
+suser10/
+suser13/
+suser14/
+suser15/
+10.102.7.183
+receiving incremental file list
+./
+10.log
+ 0 0% 0.00kB/s 0:00:00 88 100% 85.94kB/s 0:00:00 (xfr#1, to-chk=7/9)
+13.log
+ 0 0% 0.00kB/s 0:00:00 88 100% 85.94kB/s 0:00:00 (xfr#2, to-chk=4/9)
+14.log
+ 0 0% 0.00kB/s 0:00:00 88 100% 85.94kB/s 0:00:00 (xfr#3, to-chk=3/9)
+15.log
+ 0 0% 0.00kB/s 0:00:00 88 100% 85.94kB/s 0:00:00 (xfr#4, to-chk=2/9)
+receiving incremental file list
+./
+suser10/
+suser13/
+suser14/
+suser15/
No of machines online : 16
inside model
inside webcam views.py
diff --git a/myadmin/views.py b/myadmin/views.py
index 2e82773..a9bf5cd 100644
--- a/myadmin/views.py
+++ b/myadmin/views.py
@@ -26,7 +26,7 @@ sys.path.insert(0,parentdir)
import switch_onn, switch_off#, check_future_slots
# ser.close()
-ser = serial.Serial('/dev/ttyACM0')
+ser = serial.Serial('/dev/ttyUSB0')
def checkadmin(req):
diff --git a/new.csv b/new.csv
index 1f6a2d4..971fcd6 100644
--- a/new.csv
+++ b/new.csv
@@ -1109,3 +1109,33 @@
2018-02-19 13:58:06.491050 True True True True True True True True True True True True True True True True False False False False False False False False False False False False False False False False False False False False False False False False False False False
2018-02-19 14:58:03.237137 True True True True True True True True True True True True True True True True False False False False False False False False False False False False False False False False False False False False False False False False False False False
2018-02-19 15:58:06.317974 True True True True True True True True True True True True True True True True False False False False False False False False False False False False False False False False False False False False False False False False False False False
+2018-02-19 16:58:03.430452 True True True True True True True True True True True True True True True True False False False False False False False False False False False False False False False False False False False False False False False False False False False
+2018-02-19 17:58:15.258100 True True True True True True True True True True True True True True True True False False False False False False False False False False False False False False False False False False False False False False False False False False False
+2018-02-19 18:58:03.614766 True True True True True True True True True True True True True True True True False False False False False False False False False False False False False False False False False False False False False False False False False False False
+2018-02-19 19:58:03.349460 True True True True True True True True True True True True True True True True False False False False False False False False False False False False False False False False False False False False False False False False False False False
+2018-02-19 20:58:03.349373 True True True True True True True True True True True True True True True True False False False False False False False False False False False False False False False False False False False False False False False False False False False
+2018-02-19 21:58:03.342084 True True True True True True True True True True True True True True True True False False False False False False False False False False False False False False False False False False False False False False False False False False False
+2018-02-19 22:58:03.560455 True True True True True True True True True True True True True True True True False False False False False False False False False False False False False False False False False False False False False False False False False False False
+2018-02-19 23:58:03.838461 True True True True True True True True True True True True True True True True False False False False False False False False False False False False False False False False False False False False False False False False False False False
+2018-02-20 00:58:04.107101 True True True True True True True True True True True True True True True True False False False False False False False False False False False False False False False False False False False False False False False False False False False
+2018-02-20 01:58:04.099395 True True True True True True True True True True True True True True True True False False False False False False False False False False False False False False False False False False False False False False False False False False False
+2018-02-20 02:58:04.116674 True True True True True True True True True True True True True True True True False False False False False False False False False False False False False False False False False False False False False False False False False False False
+2018-02-20 03:58:03.199615 True True True True True True True True True True True True True True True True False False False False False False False False False False False False False False False False False False False False False False False False False False False
+2018-02-20 04:58:03.453365 True True True True True True True True True True True True True True True True False False False False False False False False False False False False False False False False False False False False False False False False False False False
+2018-02-20 05:58:03.529509 True True True True True True True True True True True True True True True True False False False False False False False False False False False False False False False False False False False False False False False False False False False
+2018-02-20 06:58:03.810478 True True True True True True True True True True True True True True True True False False False False False False False False False False False False False False False False False False False False False False False False False False False
+2018-02-20 07:58:03.951509 True True True True True True True True True True True True True True True True False False False False False False False False False False False False False False False False False False False False False False False False False False False
+2018-02-20 08:58:04.099274 True True True True True True True True True True True True True True True True False False False False False False False False False False False False False False False False False False False False False False False False False False False
+2018-02-20 09:58:04.115456 True True True True True True True True True True True True True True True True False False False False False False False False False False False False False False False False False False False False False False False False False False False
+2018-02-20 10:58:03.443132 True True True True True True True True True True True True True True True True False False False False False False False False False False False False False False False False False False False False False False False False False False False
+2018-02-20 11:58:03.609398 True True True True True True True True True True True True True True True True False False False False False False False False False False False False False False False False False False False False False False False False False False False
+2018-02-20 12:58:04.091074 False False False False True True True True False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False
+2018-02-20 13:06:15.364092 False False False False True True True True False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False
+2018-02-20 13:10:01.116498 False False False False True True True True False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False
+2018-02-20 13:21:21.826677 False False False False True True True True False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False
+2018-02-20 13:23:57.243263 False False False False True True True True False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False
+2018-02-20 13:58:06.739571 True True True True True True True True False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False
+2018-02-20 14:02:33.578635 True True True True True True True True False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False False
+2018-02-20 14:18:15.631115 True True True True True True True True True False True True False False False True False False False False False False False False False False False False False False False False False False False False False False False False False False False
+2018-02-20 14:22:19.271112 True True True True True True True True True False True True False False False True False False False False False False False False False False False False False False False False False False False False False False False False False False False
+2018-02-20 14:25:39.444351 True True True True True True True True True False True True False False False True False False False False False False False False False False False False False False False False False False False False False False False False False False False
diff --git a/production_static_files/img/webcam/image01.jpeg b/production_static_files/img/webcam/image01.jpeg
index e278660..1ee8921 100755
--- a/production_static_files/img/webcam/image01.jpeg
+++ b/production_static_files/img/webcam/image01.jpeg
Binary files differ
diff --git a/sbhs_server/scan_rpis.sh b/sbhs_server/scan_rpis.sh
index a3bf724..4acc1cf 100755
--- a/sbhs_server/scan_rpis.sh
+++ b/sbhs_server/scan_rpis.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-cd sbhs_server
+#cd sbhs_server
mkdir -p RPi_data
mkdir -p RPi_data/map RPi_data/report
diff --git a/slot/views.py b/slot/views.py
index 359a147..badd0ce 100644
--- a/slot/views.py
+++ b/slot/views.py
@@ -5,7 +5,7 @@ from sbhs_server.tables.models import Account, Slot, Booking, Board
import datetime
import serial
# ser.close()
-ser = serial.Serial('/dev/ttyACM0')
+ser = serial.Serial('/dev/ttyUSB0')
LIMIT = 2
diff --git a/switch_off.py b/switch_off.py
index 3fe6670..6284dc9 100644
--- a/switch_off.py
+++ b/switch_off.py
@@ -3,7 +3,7 @@ import time
import sys
import os
-ser = serial.Serial('/dev/ttyACM0')
+ser = serial.Serial('/dev/ttyUSB0')
def switchOff(args):
try:
diff --git a/switch_onn.py b/switch_onn.py
index 2cb6636..4b04b58 100644
--- a/switch_onn.py
+++ b/switch_onn.py
@@ -13,7 +13,7 @@ import os
# except:
# pass
-ser = serial.Serial('/dev/ttyACM0')
+ser = serial.Serial('/dev/ttyUSB0')
def switchOnn(args):
try:
for i in range(1,17):
generated by cgit (git 2.34.1) at 2024-12-19 09:42:27 +0000