Merge pull request #1623 from 0xc0170/fix_uvision_asm

uvision exporter - fix - asm does not like string defined macros

Author: 0xc0170

workspace_tools/export/uvision4.py

@@ -62,13 +62,15 @@ def generate(self):
 
         project_data['tool_specific'] = {}
         project_data['tool_specific'].update(tool_specific)
-        # armasm does not like floating numbers in macros, timestamp to int
         i = 0
         for macro in project_data['common']['macros']:
+            # armasm does not like floating numbers in macros, timestamp to int
             if macro.startswith('MBED_BUILD_TIMESTAMP'):
                 timestamp = macro[len('MBED_BUILD_TIMESTAMP='):]
                 project_data['common']['macros'][i] = 'MBED_BUILD_TIMESTAMP=' + str(int(float(timestamp)))
-                break
+            # armasm does not even accept MACRO=string
+            if macro.startswith('MBED_USERNAME'):
+                project_data['common']['macros'].pop(i)
             i += 1
         project_data['common']['macros'].append('__ASSERT_MSG')
         self.progen_gen_file('uvision', project_data)