Merge branch 'develop' into feature/RVR-1520-drive-target-slewing-example

Author: jkonish

sphero_sdk/asyncio/server/handler/api_sphero_handler.py

@@ -204,16 +204,16 @@ def _remove_worker(self, worker_list, key):
         worker_list.pop(key)
 
     async def _handle_message(self, worker_list, msg, key):
-        logger.debug('Looking up worker for key: {}'.format(', '.join('0x{:02x}'.format(x) for x in key)))
+        logger.debug('Looking up worker for key: ({})'.format(', '.join('0x{:02x}'.format(x) for x in key)))
         try:
             worker = worker_list[key]
             logger.debug('Response handler for key found, invoking worker.')
             return await worker(msg)
-        except KeyError:
-            logger.warning('Response Handler Missing: {}'.format(', '.join('0x{:02x}'.format(x) for x in key)))
+        except KeyError as key_error:
+            logger.warning('KeyError for key {}'.format(key_error))
             pass
-        except Exception as e:
-            logger.error('Exception {} in {}'.format(e, ', '.join('0x{:02x}'.format(x) for x in key)))
+        except Exception as exception:
+            logger.error('Exception {} for key ({})'.format(exception, ', '.join('0x{:02x}'.format(x) for x in key)))
             pass
 
     async def _handle_command(self, msg):

sphero_sdk/common/sensors/sensor_streaming_control.py

@@ -177,7 +177,7 @@ def _stop_and_clear_streaming_service(self, processor):
 
     def _process_streaming_response(self, processor, response):
         response_token_uint8 = response['token']
-        raw_sensor_data = response['sensorData']
+        raw_sensor_data = response['sensor_data']
         raw_start_index = 0
         status_flag = response_token_uint8 & 0xF0  # Check the upper nibble for flag value: 0x0 = OK, 0x1 = Invalid Data
         token_id = response_token_uint8 & 0x0F # Check the lower nibble for token id