ADD: update

LAB-C · Nov 21, 2018 · 114b326 · 114b326
1 parent 153e40a
commit 114b326
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 48 deletions.
diff --git a/client/utils.py b/client/utils.py
@@ -51,50 +51,6 @@ def report_info(info):
         else:
             print('[*] Firmware-Server: Register failed')
 
-    # [*] REPORT to data_server
-    server_url = info['data_server']
-
-    # 1. Check duplicate -> data server iot device
-    r = requests.get(server_url + '/api/iot/regist/' + info['device']['wallet'])
-    logging.debug('URL: ' + server_url + '/api/iot/regist/' + info['device']['wallet'])
-    logging.debug('response: ' + r.text)
-
-    if not json.loads(r.text)['data']: # not in server
-        # 2. register iot device
-        logging.debug('Info not in Data Server')
-        r = requests.post(server_url + '/api/iot/regist', json={
-            'uuid': info['device']['wallet'], # wallet
-            'key': info['device']['wallet'], # wallet
-            'name': info['device']['name'],
-            'desc': info['device']['desc']
-        })
-        logging.debug('URL: ' + server_url + '/api/iot/regist')
-        logging.debug('response: ' + r.text)
-        if json.loads(r.text)['data']:
-            print('[*] Data-Server: Device Register success')   
-        else:         
-            print('[*] Data-Server: Device Register failed')        
-
-    # 3. Check duplicate -> data server wallet
-    r = requests.get(server_url + '/api/iot/' + info['device']['wallet'])
-    logging.debug('URL: ' + server_url + '/api/iot/' + info['device']['wallet'])
-    logging.debug('response: ' + r.text)
-
-    if not json.loads(r.text)['data']: # not in server
-        # 4. register wallet
-        logging.debug('Info not in Data Server')
-        r = requests.post(server_url + '/api/iot', json={
-            'iot': info['device']['wallet'], # wallet
-        })
-        logging.debug('URL: ' + server_url + '/api/iot')
-        logging.debug('response: ' + r.text)
-        if json.loads(r.text)['data']:
-            print('[*] Data-Server: Wallet Register success')   
-        else:         
-            print('[*] Data-Server: Wallet Register failed')
-
-    return False
-
 def check_update(info):
     wallet = info['device']['wallet']
     server_url = info['firmware_server']
@@ -128,6 +84,7 @@ def get_ext(filepath):
     _, ext = os.path.splitext(filepath)
     return ext
 
-def upload_device(filepath):
-    os.system('arduino-sketch -u ' + filepath)
-    os.system('rm -rf ' + filepath)
+def upload_device():
+    os.chdir('./firms/src')
+    os.system('ino build')
+    os.system('ino upload')
diff --git a/update.py b/update.py
@@ -57,7 +57,7 @@
             # upload to arduino
             if get_ext('./firms/src/' + file_name) == '.ino':
                 print('[*] Success: Firmware file is .ino file!')
-                upload_device('./firms/src/' + file_name)
+                upload_device()
 
             else:
                 print('[*] Error: Firmware file is NOT .ino file!')