commit 10/31

test.py

@@ -1,80 +1,62 @@
 import csv, requests
 from instruments import Camera_Debug2 as Camera
 from datahandling import Datareporter_Debug3 as Datareporter
+from system import System_Debug
 import serial
 import sys
-import json
-
-REPORTIMAGETOURL = "http://10.0.1.4:5010/photo"
-
-LOG_FILE = "log2.txt"
-
-import binascii
-
+import logging
 import base64
-from base64 import urlsafe_b64encode
+from requests_toolbelt import MultipartEncoder
 
-with open('log2.txt','rb') as f:
-    g=f.read()
-    e=urlsafe_b64encode(g)
+logging.getLogger("datahandling")
 
-# a=binascii.b2a_uu(f)
-
-# e = f.encode('base64')
-
-# e = str(e, "ascii")
-
-data = {"temp":1,
-        "press":3,
-        "altitude":2,
-        "image":"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-        }
-
-# data = json.dumps(data,ensure_ascii=True)
-
-# camera = Camera(low_quality_resolution=(320, 180),
-#                 low_quality_compression_pct=50)
-
-# image = camera.capture()
-
-# print (image)
+data = {"temp":1,"press":3,"altitude":2,"cheetas":"just enough"}
 
 pass
-from requests_toolbelt import MultipartEncoder, MultipartEncoderMonitor
+
+com_port_name = "/dev/ttyAMA0"
+
+image = open("resized_image.jpg", 'rb')
+# image = image.read()
+
+# e=base64.b64encode(image)
+
+# e=b'alksdjnfkljanslkjnaklsfnglkanlkfgnlakalksdjnaklsfnglkajnaklsfnglkanlkfgnlakalksdjnfkljanslkjnglkjnaklsfnglkanlkfgnlakalksdjnfkljanslkjnglknlkfgnlakalksdjnfkljanslkjnglkanlkfgnlakalksdjnfkljanngnlakalksdjnfkljanslkjnglkanlkfgnlakalksdjnfkljannlkanlkfgnlakalksdjnfkljannglkanlkfgnlakalksdjnfkljannglkanlkfgnlakalksdjnfkl=='
+
+# m = MultipartEncoder(fields={'image': ('image', image, 'image/jpeg')})
+
+report = Datareporter (
+    use_lan = True,
+    url = "http://home.ascorrea.com",
+    server_port = 5010,
+    data_path = "upload-data",
+    image_path = "upload-file",
+    com_port_name="/dev/ttyAMA0",
+    ping_path="ping",
+    baud_rate = 9600)
+
+camera = Camera (low_quality_compression_pct=10,
+                 low_quality_resolution=(320, 240),
+                 high_quality_compression_pct=100,
+                 high_quality_resolution=(2592,1944),
+                 vflip=True,
+                 hflip=True,
+                 exposure_mode='sports'
+                 )
+
+# print (report.check())
+# print (image)
+# report.send(m.to_string(), message_type="image")
+# report.send(data, message_type="data")
+
+img = camera.capture()
+report.send(img.get('lo'), message_type="image")
+
+# report.send(image, message_type="image")
 
 
-# i=open('resized_image.jpg','rb')
-# r=i.read()
+# execfile("test_sms.py")
 
-# def callback(encoder, bytes_read):
-#         # Do something with this information
-#         pass
-#
-# monitor = MultipartEncoderMonitor.from_fields(
-#     fields={'field0': 'value0'}, callback
-#     )
-
-
-
-# m = MultipartEncoder(fields={"field":("image", open("resized_image.jpg", 'rb'), "image/jpeg")})
-#
-reporter = Datareporter (content_type="form-data")
-#
-# f = open('resized_image.jpg','rb')
-# r=f.read()
-
-#report image
-# response = requests.post("http://home.ascorrea.com:5010/upload-file", data=m.read())
-# print(type(r))
-# reporter.send(str(r)[2:-5].replace("\\\", "\\"), type="image")
-# reporter.send("Content-Disposition: {0}; name=\"{1}\"; filename=\"{2}\" {4}".format(
-#     'application/octet-stream',
-#     'field',
-#     'resized_image',
-#     'image/jpeg',""), type="image")
-
-
-
-reporter.send(data, type="image")
+# report.send("1",message_type="ping")
 
 pass