Updated to mbed 5.9

Author: sysprogs

generators/mbed/MbedBSPGenerator.cs

@@ -65,7 +65,7 @@ private void LoadMCUDefinitionsFromOtherBSPs()
             }
         }
 
-        public void UpdateGitAndRescanTargets()
+        public void UpdateGitAndRescanTargets(bool skipRescan = false)
         {
             string gitExe = (Registry.CurrentUser.OpenSubKey(@"Software\Sysprogs\BSPGenerators")?.GetValue("git") as string) ?? "git.exe";
             string pythonExe = (Registry.CurrentUser.OpenSubKey(@"Software\Sysprogs\BSPGenerators")?.GetValue("python") as string) ?? "python.exe";
@@ -127,6 +127,17 @@ public void UpdateGitAndRescanTargets()
                 File.WriteAllLines(patchedFile, lines);
             }
 
+            patchedFile = Path.Combine(mbedRoot, @"tools\config\__init__.py");
+            lines = File.ReadAllLines(patchedFile).ToList();
+            str = "raise NotSupportedException(\"Target does not support mbed OS 5\")";
+            idx2 = Enumerable.Range(0, lines.Count).FirstOrDefault(i => lines[i].Contains(str));
+            if (idx2 > 0)
+            {
+                int subIdx = lines[idx2].IndexOf(str);
+                lines[idx2] = lines[idx2].Substring(0, subIdx) + "print(\"library does not support mbed OS 5\")";
+                File.WriteAllLines(patchedFile, lines);
+            }
+
             string sampleDir = Path.Combine(mbedRoot, "samples");
             if (Directory.Exists(sampleDir))
                 Directory.Delete(sampleDir, true);
@@ -136,11 +147,15 @@ public void UpdateGitAndRescanTargets()
             bspGenInfo.UseShellExecute = false;
             bspGenInfo.EnvironmentVariables["PYTHONPATH"] = mbedRoot;
             bspGenInfo.EnvironmentVariables["PATH"] += $@";{toolchainDir}\bin";
-            proc = Process.Start(bspGenInfo);
-            proc.WaitForExit();
 
-            if (proc.ExitCode != 0)
-                throw new Exception("BSP generator exited with code " + proc.ExitCode);
+            if (!skipRescan)
+            {
+                proc = Process.Start(bspGenInfo);
+                proc.WaitForExit();
+
+                if (proc.ExitCode != 0)
+                    throw new Exception("BSP generator exited with code " + proc.ExitCode);
+            }
         }
 
         public void PatchBuggyFiles()
@@ -352,7 +367,7 @@ public void DetectAndApplyMemorySizes(MCU mcu, string linkerScript)
 
             mcu.MemoryMap = new AdvancedMemoryMap { Memories = memories };
             var flash = memories.FirstOrDefault(m => m.Name.ToUpper() == "FLASH" || m.Name == "m_text" || m.Name == "ROM" || m.Name == "rom" || m.Name == "MFlash256");
-            var ram = memories.First(m => m.Name.ToUpper() == "RAM" || m.Name == "m_data" || m.Name == "RAM_INTERN" || m.Name == "SRAM1" || m.Name == "RAM0" || m.Name.StartsWith("Ram0_"));
+            var ram = memories.First(m => m.Name.ToUpper() == "RAM" || m.Name == "m_data" || m.Name == "RAM_INTERN" || m.Name == "SRAM1" || m.Name == "RAM0" || m.Name.StartsWith("Ram0_") || m.Name.StartsWith("DSRAM_"));
 
             if (flash == null)
             {

generators/mbed/ParsedTargetList.cs

@@ -20,6 +20,16 @@ public struct RawConfigurationVariable
 
             public bool IsFixed => string.IsNullOrEmpty(Description);
 
+            public bool IsUnsupported
+            {
+                get
+                {
+                    if (IsBool != "True" && DefaultValue == "None")
+                        return true;   //In mbed, setting the variable to 'none' completely removes the corresponding macro. VisualGDB can only replicate this for variables with a fixed list of options, that isn't the case for mbed.
+                    return false;
+                }
+            }
+
             public override string ToString()
             {
                 return ID;
@@ -60,14 +70,14 @@ public PropertyEntry ToPropertyEntry()
                         int defaultIdx = Array.IndexOf(options, DefaultValue);
                         if (defaultIdx < 0)
                             throw new Exception("Default value is not a part of suggestion list");
-                        if (options.FirstOrDefault(s=>!IsValidIdentifier(s)) == null)
+                        if (options.FirstOrDefault(s => !IsValidIdentifier(s)) == null)
                         {
                             //All options are valid identifiers
                             return new PropertyEntry.Enumerated
                             {
                                 UniqueID = ID,
                                 Name = ID,
-                                SuggestionList = options.Select(s=>new PropertyEntry.Enumerated.Suggestion { InternalValue = s}).ToArray(),
+                                SuggestionList = options.Select(s => new PropertyEntry.Enumerated.Suggestion { InternalValue = s }).ToArray(),
                                 DefaultEntryIndex = defaultIdx
                             };
                         }
@@ -94,12 +104,13 @@ public string[] EffectivePreprocessorMacros
                 {
                     return NormalPreprocessorMacros
                         .Concat(ConfigurationVariables.Where(c => c.IsFixed).Select(c => $"{c.MacroName}={c.DefaultValue}"))
-                        .Concat(ConfigurationVariables.Where(c => !c.IsFixed).Select(c => $"{c.MacroName}=$$com.sysprogs.mbed.{c.ID}$$"))
+                        .Concat(ConfigurationVariables.Where(c => !c.IsFixed && !c.IsUnsupported).Select(c => $"{c.MacroName}=$$com.sysprogs.mbed.{c.ID}$$"))
                         .ToArray();
                 }
             }
 
-            public PropertyEntry[] EffectiveConfigurableProperties => ConfigurationVariables.Where(c => !c.IsFixed).Select(c => c.ToPropertyEntry()).ToArray();
+
+            public PropertyEntry[] EffectiveConfigurableProperties => ConfigurationVariables.Where(c => !c.IsFixed && !c.IsUnsupported).Select(c => c.ToPropertyEntry()).ToArray();
 
             static string[] SubtractOrThrow(string[] left, string[] right, bool throwIfBaseValuesAreNotPresent, string hint)
             {
@@ -150,6 +161,11 @@ public class DerivedConfiguration
 
             public string CanonicalKey => Library != null ? "L:" + Library : "F:" + Feature;
 
+            public override string ToString()
+            {
+                return CanonicalKey;
+            }
+
             public BuildConfiguration Configuration;
 
             public BuildConfiguration[] ConfigurationsToMerge;

generators/mbed/Program.cs

@@ -177,6 +177,11 @@ public ConditionalConfigAggregator(ParsedTargetList.DerivedConfiguration cfg)
             }
 
             public readonly string ID, Name;
+
+            public override string ToString()
+            {
+                return ID;
+            }
         }
 
         class PropertyComparerByID : IEqualityComparer<PropertyEntry>
@@ -194,10 +199,12 @@ public int GetHashCode(PropertyEntry obj)
 
         static void Main(string[] args)
         {
-            var generator = new MbedBSPGenerator("5.7.7");
+            var generator = new MbedBSPGenerator("5.9");
+
+            bool skipRescan = args.Contains("/norescan");
 
             string suffix = "";
-            generator.UpdateGitAndRescanTargets();
+            generator.UpdateGitAndRescanTargets(skipRescan);
 
             ParsedTargetList parsedTargets = XmlTools.LoadObject<ParsedTargetList>(Path.Combine(generator.outputDir, "mbed", "ParsedTargets.xml"));
             generator.PatchBuggyFiles();
@@ -212,16 +219,18 @@ static void Main(string[] args)
                 BSPSourceFolderName = "mbed Files"
             };
 
+            var validTargets = parsedTargets.Targets.Where(t => t.BaseConfiguration != null).ToArray();
+
             MCUFamily commonFamily = new MCUFamily
             {
                 ID = "MBED_CORE",
-                AdditionalSourceFiles = generator.ConvertPaths(Intersect(parsedTargets.Targets.Select(t => t.BaseConfiguration.SourceFiles))),
-                AdditionalHeaderFiles = generator.ConvertPaths(Intersect(parsedTargets.Targets.Select(t => t.BaseConfiguration.HeaderFiles))),
+                AdditionalSourceFiles = generator.ConvertPaths(Intersect(validTargets.Select(t => t.BaseConfiguration.SourceFiles))),
+                AdditionalHeaderFiles = generator.ConvertPaths(Intersect(validTargets.Select(t => t.BaseConfiguration.HeaderFiles))),
                 SymbolsRequiredByLinkerScript = new[] { "__Vectors", "Stack_Size" },
                 CompilationFlags = new ToolFlags
                 {
-                    IncludeDirectories = generator.ConvertPaths(Intersect(parsedTargets.Targets.Select(t => t.BaseConfiguration.IncludeDirectories))),
-                    PreprocessorMacros = Intersect(parsedTargets.Targets.Select(t => t.BaseConfiguration.EffectivePreprocessorMacros))
+                    IncludeDirectories = generator.ConvertPaths(Intersect(validTargets.Select(t => t.BaseConfiguration.IncludeDirectories))),
+                    PreprocessorMacros = Intersect(validTargets.Select(t => t.BaseConfiguration.EffectivePreprocessorMacros))
                 }
             };
 
@@ -232,7 +241,7 @@ static void Main(string[] args)
 
             Console.WriteLine("Generating target definitions...");
 
-            foreach (var target in parsedTargets.Targets)
+            foreach (var target in validTargets)
             {
                 if (string.IsNullOrEmpty(target.BaseConfiguration.LinkerScript))
                 {

generators/mbed/data/BuildConfigExtractor.py

@@ -24,6 +24,7 @@
 from tools.settings import ROOT
 import bootloader_scanner
 from tools.targets import TARGET_NAMES, TARGET_MAP
+from tools.utils import NotSupportedException
 import re;
 
 
@@ -114,7 +115,8 @@ def main():
         'fat': "FAT File System support",
         'eth': "Ethernet support",
         'rtx': "Keil RTX RTOS",
-        'features': 'Device features'
+        'features': 'Device features',
+        'mbedtls' : 'TLS Support (mbedtls)'
     }
 
     print("Parsing targets...")
@@ -123,7 +125,7 @@ def main():
     copy._deepcopy_dispatch[type(re.compile('x'))] = copy_regex
 
     #IPV6 is configured, but not listed as supported.Ignore it.
-    supported_targets = [t for t in supported_targets if "Super_Target" not in t]
+    supported_targets = [t for t in supported_targets if t not in ("Super_Target", "VBLUNO51_OTA", "VBLUNO51_BOOT", "VBLUNO51_LEGACY", "VBLUNO51")]
 
     rootNode = ElementTree.Element('ParsedTargetList')
     targetListNode = append_node(rootNode, 'Targets')
@@ -135,7 +137,11 @@ def main():
         targetNode = append_node(targetListNode, 'Target')
         targetNode.append(make_node('ID', target))
 
-        toolchain = ba.prepare_toolchain([ROOT], "", target, 'GCC_ARM', silent=True)
+        try:
+            toolchain = ba.prepare_toolchain([ROOT], "", target, 'GCC_ARM')
+        except NotSupportedException:
+            print(t + " is not supported!")
+            continue
 
         fullRes = toolchain.scan_resources(ROOT)
         fullRes.toolchain = toolchain
@@ -171,7 +177,7 @@ def main():
             libCfg = BuildConfiguration(libToolchain, libRes)
             libNode.append(libCfg.ToXML('Configuration'))
 
-        for feature in copy.copy(fullRes.features):
+        for feature in list(fullRes.features):
             featureNode = append_node(derivedCfgListNode, 'DerivedConfiguration')
             featureNode.append(make_node('Feature', feature))
 
@@ -181,9 +187,10 @@ def main():
             featureCfg = BuildConfiguration(featureToolchain, featureRes)
             featureNode.append(featureCfg.ToXML('Configuration'))
 
-        for lib in LIBRARIES:
+        for lib in LIBRARIES + [{"id" : "mbedtls", "source_dir" : ROOT + "/features/mbedtls"}]:
             if lib['id'] in ['rtos' ,'rtx']:
                 continue   #Already handled via mbed_library_dirs
+
             sourceDirs = lib['source_dir']
             if isinstance(sourceDirs, str):
                 sourceDirs = [sourceDirs]

generators/mbed/data/samples/04_BLE_UART/USB_CDC.cpp

@@ -35,15 +35,15 @@
 #define DEBUG(...) /* nothing */
 #endif /* #if NEED_CONSOLE_OUTPUT */
 
-BLEDevice  ble;
+BLEDevice  g_BLE;
 DigitalOut led1(LED1);
 UARTService *uart;
 
 void disconnectionCallback(const Gap::DisconnectionCallbackParams_t *params)
 {
 	DEBUG("Disconnected!\n\r");
 	DEBUG("Restarting the advertising process\n\r");
-	ble.startAdvertising();
+	g_BLE.startAdvertising();
 }
 
 void periodicCallback(void)
@@ -59,26 +59,26 @@ int main(void)
 	ticker.attach(periodicCallback, 1);
 
 	DEBUG("Initialising the nRF51822\n\r");
-	ble.init();
-	ble.onDisconnection(disconnectionCallback);
+	g_BLE.init();
+	g_BLE.onDisconnection(disconnectionCallback);
 
-	uart = new UARTService(ble);
+	uart = new UARTService(g_BLE);
 
     /* setup advertising */
-	ble.accumulateAdvertisingPayload(GapAdvertisingData::BREDR_NOT_SUPPORTED);
-	ble.setAdvertisingType(GapAdvertisingParams::ADV_CONNECTABLE_UNDIRECTED);
-	ble.accumulateAdvertisingPayload(GapAdvertisingData::SHORTENED_LOCAL_NAME,
+	g_BLE.accumulateAdvertisingPayload(GapAdvertisingData::BREDR_NOT_SUPPORTED);
+	g_BLE.setAdvertisingType(GapAdvertisingParams::ADV_CONNECTABLE_UNDIRECTED);
+	g_BLE.accumulateAdvertisingPayload(GapAdvertisingData::SHORTENED_LOCAL_NAME,
 		(const uint8_t *)"BLE UART",
 		sizeof("BLE UART") - 1);
-	ble.accumulateAdvertisingPayload(GapAdvertisingData::COMPLETE_LIST_128BIT_SERVICE_IDS,
+	g_BLE.accumulateAdvertisingPayload(GapAdvertisingData::COMPLETE_LIST_128BIT_SERVICE_IDS,
 		(const uint8_t *)UARTServiceUUID_reversed,
 		sizeof(UARTServiceUUID_reversed));
 
-	ble.setAdvertisingInterval(160); /* 100ms; in multiples of 0.625ms. */
-	ble.startAdvertising();
+	g_BLE.setAdvertisingInterval(160); /* 100ms; in multiples of 0.625ms. */
+	g_BLE.startAdvertising();
 
 	while (true) {
-		ble.waitForEvent();
+		g_BLE.waitForEvent();
 	}
 }
 

generators/mbed/data/samples/04_BLE_UART/sample.xml

@@ -8,5 +8,6 @@
   <RequiredFrameworks>
 	<string>com.sysprogs.arm.mbed.drivers</string>
 	<string>com.sysprogs.arm.mbed.feature.BLE</string>
+	<string>com.sysprogs.arm.mbed.mbedtls</string>
   </RequiredFrameworks>
 </EmbeddedProjectSample>

generators/mbed/data/stubs.cpp

@@ -14,4 +14,10 @@ extern "C"
 	{
 		return 0;
 	}
+	
+	//Only needed for nRF5x-based targets. Will get overridden once the BLE-related frameworks are added.
+	void __attribute__((weak)) assert_nrf_callback(unsigned short line_num, const unsigned char *p_file_name)
+	{
+		asm("bkpt 255");
+	}
 }