merge: move float precision resolve

Author: yiweisong

src/aceinna/bootstrap/web.py

@@ -3,7 +3,7 @@
 """
 import os
 import sys
-#import asyncio
+# import asyncio
 import json
 import time
 import traceback
@@ -289,6 +289,48 @@ def stop_log(self, *args):  # pylint: disable=invalid-name
         self.response_message('stopLog', {'packetType': 'success', 'data': ''})
 
 
+class UploadHandler(tornado.web.RequestHandler):
+    def set_default_headers(self):
+        self.set_header('Access-Control-Allow-Origin', '*')
+        self.set_header('Access-Control-Allow-Headers',
+                        'x-requested-with, authorization')
+        self.set_header('Access-Control-Allow-Methods',
+                        'POST, GET, PUT, DELETE')
+
+    def get(self):
+        self.write('some get')
+
+    def post(self, *args, **kwargs):
+        files = self.request.files
+        uploaded_files = []
+
+        try:
+            for inputname in files:
+                http_file = files[inputname]
+                for file_inst in http_file:
+                    file_path = os.path.join(
+                        resource.get_executor_path(), 'upgrade', file_inst.filename)
+
+                    with open(file_path, 'wb') as file_writer:
+                        file_writer.write(file_inst.body)
+
+                    uploaded_files.append(
+                        {'name': file_inst.filename, 'path': file_path})
+            self.write({
+                'success': True,
+                'data': uploaded_files
+            })
+        except:
+            self.write({
+                'success': False
+            })
+
+    def options(self):
+        # no body
+        self.set_status(204)
+        self.finish()
+
+
 class MessageStore(object):
     def __init__(self):
         self.messages = Queue()
@@ -330,8 +372,8 @@ class LoggerServerSentEvent(tornado.web.RequestHandler):
 
     def __init__(self, *args, **kwargs):
         super(LoggerServerSentEvent, self).__init__(*args, **kwargs)
-        #self.set_header('Content-Type', 'text/event-stream')
-        #self.set_header('Access-Control-Allow-Origin', '*')
+        # self.set_header('Content-Type', 'text/event-stream')
+        # self.set_header('Access-Control-Allow-Origin', '*')
 
     def initialize(self, store):
         '''
@@ -408,7 +450,7 @@ def listen(self):
             target=self.detect_device_wrapper, args=(loop,))
         thread.start()
 
-        #self.non_main_ioloop = tornado.ioloop.IOLoop.current()
+        # self.non_main_ioloop = tornado.ioloop.IOLoop.current()
         # loop.run_forever()
 
     def prepare_logger(self):
@@ -524,7 +566,8 @@ def start_websocket_server(self):
             application = tornado.web.Application(
                 [
                     (r'/', WSHandler, dict(server=self)),
-                    (r'/sse', LoggerServerSentEvent, dict(store=store))
+                    (r'/sse', LoggerServerSentEvent, dict(store=store)),
+                    (r'/upload', UploadHandler)
                 ])
             self.http_server = tornado.httpserver.HTTPServer(application)
             # self.http_server.listen(self.options.port)
@@ -584,7 +627,7 @@ def detect_device_wrapper(self, current_loop):
                 asyncio.set_event_loop(asyncio.new_event_loop())
                 # asyncio.set_event_loop(current_loop)
 
-            #self.non_main_ioloop = tornado.ioloop.IOLoop.current()
+            # self.non_main_ioloop = tornado.ioloop.IOLoop.current()
             self.detect_device(self.device_discover_handler)
         except Exception as ex:
             print_red(ex)

src/aceinna/devices/base/rtk_provider_base.py

@@ -67,6 +67,7 @@ def prepare_folders(self):
         '''
         Prepare folders for data storage and configuration
         '''
+
         executor_path = resource.get_executor_path()
         setting_folder_name = 'setting'
         config_file_name = 'openrtk.json'
@@ -87,6 +88,11 @@ def prepare_folders(self):
             if not os.path.isdir(product_folder):
                 os.makedirs(product_folder)
 
+            if product == 'RTK330L':
+                config_file_name = 'RTK330L.json'
+            else:
+                config_file_name = 'openrtk.json'
+
             for app_name in all_products[product]:
                 app_name_path = os.path.join(product_folder, app_name)
                 app_name_config_path = os.path.join(
@@ -153,18 +159,23 @@ def _build_app_info(self, text):
         }
 
     def load_properties(self):
+        product_name = self.device_info['name']
+        app_name = self.app_info['app_name']
+
+        json_file_name = 'openrtk.json'
+        if product_name == 'RTK330L':
+            json_file_name = 'RTK330L.json'
+
         # Load config from user working path
-        local_config_file_path = os.path.join(os.getcwd(), 'openrtk.json')
+        local_config_file_path = os.path.join(os.getcwd(), json_file_name)
         if os.path.isfile(local_config_file_path):
             with open(local_config_file_path) as json_data:
                 self.properties = json.load(json_data)
                 return
 
         # Load the openimu.json based on its app
-        product_name = self.device_info['name']
-        app_name = self.app_info['app_name']
         app_file_path = os.path.join(
-            self.setting_folder_path, product_name, app_name, 'openrtk.json')
+            self.setting_folder_path, product_name, app_name, json_file_name)
 
         if not self.is_app_matched:
             print_yellow(

src/aceinna/devices/openimu/uart_provider.py

@@ -140,9 +140,12 @@ def _build_app_info(self, text):
         }
 
         # Change the device model name if got model name from the first split string of version
-        if split_text[0] in get_openimu_products():
+        if len(split_text) > 0 and split_text[0] in get_openimu_products():
             self.device_info['name'] = split_text[0]
 
+        if len(split_text) == 0:
+            self.device_info['name'] = 'OpenIMU300ZI'
+
     def load_properties(self):
         # Load config from user working path
         local_config_file_path = os.path.join(os.getcwd(), 'openimu.json')
@@ -636,10 +639,17 @@ def hard_iron_cal(self, value, data_type):
             pi_value = 2 ** 15 / math.pi
             return decoded_value / pi_value
 
-    def upgrade_framework(self, file, *args):  # pylint: disable=invalid-name
+    def upgrade_framework(self, params, *args):  # pylint: disable=invalid-name
         '''
         upgrade framework
         '''
+        file = ''
+        if isinstance(params, str):
+            file = params
+
+        if isinstance(params, dict):
+            file = params['file']
+
         # start a thread to do upgrade
         if not self.is_upgrading:
             self.is_upgrading = True

src/aceinna/devices/parsers/open_field_parser.py

@@ -1,8 +1,9 @@
 import math
 import struct
+import decimal
 
 
-def do_decode_value(data_type, data):
+def do_decode_value(data_type, data, conf):
     if data_type == 'uint64':
         try:
             pack_item = struct.pack('8B', *data)
@@ -38,7 +39,14 @@ def do_decode_value(data_type, data):
             pack_item = struct.pack('4B', *data)
         except:  # pylint: disable=bare-except
             return False
-        return struct.unpack('<f', pack_item)[0]
+
+        unpack_value = struct.unpack('<f', pack_item)[0]
+        # use decimal, float type is a special case
+        if conf and conf['value_accuracy']:
+            precision = conf['value_accuracy']
+            decimal_wrapped = decimal.Decimal(unpack_value)
+            unpack_value = float(round(decimal_wrapped, precision))
+        return unpack_value
     elif data_type == 'uint16':
         try:
             pack_item = struct.pack('2B', *data)
@@ -104,8 +112,8 @@ def do_decode_value(data_type, data):
         return False
 
 
-def decode_value(data_type, data):
-    ret_value = do_decode_value(data_type, data)
+def decode_value(data_type, data, conf=None):
+    ret_value = do_decode_value(data_type, data, conf)
 
     if not isinstance(ret_value, float):
         return ret_value

src/aceinna/devices/parsers/open_packet_parser.py

@@ -104,7 +104,7 @@ def get_parameters_by_block_parser(payload, user_configuration):
                 data_len = data_len + 2
             elif param_type == 'uint32' or param_type == 'int32' or param_type == 'float':
                 value = decode_value(
-                    param_type, payload[data_len:data_len + 4])
+                    param_type, payload[data_len:data_len + 4], exist_param_conf)
                 data_len = data_len + 4
             elif param_type == 'uint64' or param_type == 'int64' or param_type == 'double':
                 value = decode_value(

src/aceinna/setting/RTK330L/RTK_INS/openrtk.json renamed to src/aceinna/setting/RTK330L/RTK_INS/RTK330L.json

@@ -1,5 +1,5 @@
 {
-	"appVersion": "RTK330LA INS 27.00",
+	"appVersion": "RTK330LA INS 24.00",
 	"type": "openrtk",
     "description": "6-axis OpenRTK with INS application",
     "initial":{