Fixed #14; corrected scout log types except for Emma deltas

Emma/emma_libs/configuration.py

@@ -78,7 +78,7 @@ def readConfiguration(self, configurationPath, mapfilesPath, noPrompt):
                 self.specificConfigurations[configId].readConfiguration(configurationPath, mapfilesPathForThisConfigId, configId, self.globalConfig[configId])
                 # Validating the the configuration
                 if not self.specificConfigurations[configId].checkConfiguration(configId, self.globalConfig[configId]):
-                    sc().warning("The specificConfiguration object of the configId \"" + configId + "\" reported that the configuration is invalid!\n" + "The configId \"" + configId + "\" will not be analysed!")
+                    sc().warning("The specificConfiguration of the configId \"" + configId + "\" is invalid!\n" + "The configId \"" + configId + "\" will not be analysed!")
                     configIDsToRemove.append(configId)
             else:
                 sc().error("The configuration of the configID \"" + configId + "\" does not contain a \"compiler\" key!")
@@ -130,7 +130,7 @@ def __readAddressSpacesJson(path):
             for memoryToIgnore in addressSpaces[IGNORE_MEMORY]:
                 if addressSpaces["memory"][memoryToIgnore]:
                     addressSpaces["memory"].pop(memoryToIgnore)
-                    sc().info("Memory entry \"" + memoryToIgnore + "\" defined in \"" + path + "\" is marked to be ignored...")
+                    sc().debug("Memory entry \"" + memoryToIgnore + "\" defined in \"" + path + "\" is marked to be ignored...")
                 else:
                     sc().error("The key " + memoryToIgnore + " which is in the ignore list, does not exist in the memory object of " + path)
 

Emma/emma_libs/ghsConfiguration.py

@@ -154,7 +154,7 @@ def __addFilesToConfiguration(path, configuration, fileType):
                 # If we have found any file for this file type
                 if foundFiles:
                     # We will add it to the configuration and also check whether more than one file was found to this pattern
-                    configuration["patterns"][fileType][entry]["associatedFilename"] = foundFiles[0]
+                    configuration["patterns"][fileType][entry]["associatedFilename"] = foundFiles[0]            # Take only the first match and warn afterwards
                     sc().info(LISTING_INDENT + "Found " + fileType + ": ", foundFiles[0])
                     if len(foundFiles) > 1:
                         sc().warning("Ambiguous regex pattern in '" + configuration["patternsPath"] + "'. Selected '" + foundFiles[0] + "'. Regex matched: " + "".join(foundFiles))
@@ -204,7 +204,7 @@ def loadMonolithFile(configuration, noprompt):
                     sc().info("Choose the index of the desired monolith file")
                     mapfileIndexChosen = Emma.shared_libs.emma_helper.Prompt.idx()
                     while not 0 <= mapfileIndexChosen < numMonolithFiles:               # Accept only values within the range [0, numMonolithFiles)
-                        sc().warning("Invalid value; try again:")
+                        sc().wwarning("Invalid value; try again:")
                         mapfileIndexChosen = Emma.shared_libs.emma_helper.Prompt.idx()
             elif numMonolithFiles < 1:
                 sc().error("No monolith file found but needed for processing")

Emma/emma_libs/ghsMapfileProcessor.py

@@ -127,7 +127,7 @@ def __importData(self, configId, configuration, defaultRegexPattern):
                         if physicalAddress is None:
                             warningSectionName = lineComponents.group(regexPatternData.Groups.section).rstrip()
                             warningObjectName = ("::" + lineComponents.group(regexPatternData.Groups.module).rstrip()) if hasattr(regexPatternData.Groups, "module") else ""
-                            sc().warning("Address translation failed for the element: " + f"{configId}::{mapfileName}:{lineNumber}::{warningSectionName}" + ("::"  + warningObjectName if warningObjectName != "" else "")
+                            sc().wwarning("Address translation failed for the element: " + f"{configId}::{mapfileName}:{lineNumber}::{warningSectionName}" + ("::"  + warningObjectName if warningObjectName != "" else "")
                                          + " (size: " + str(int(lineComponents.group(regexPatternData.Groups.size), 16)) + " B)! Section name not found in VAS or outside address range.")
                             # We will not store this element and continue with the next one
                             continue

Emma/emma_libs/memoryEntry.py

@@ -73,7 +73,7 @@ def __init__(self, configID, mapfileName, addressStart, addressLength=None, addr
         elif addressLength is not None and addressEnd is None:
             self.setAddressesGivenLength(addressLength)
         else:
-            sc().warning("MemEntry: addressLength AND addressEnd were both given. The addressLength will be used.")
+            sc().wwarning("MemEntry: addressLength AND addressEnd were both given. The addressLength will be used.")
             self.setAddressesGivenLength(addressLength)
 
         self.sectionName = sectionName

Emma/emma_vis_libs/helper.py

@@ -79,7 +79,7 @@ def getLastModFileOrPrompt(subStringIdentifier: str, inOutPath: str, quiet: bool
 
         # Check if the fixed file name portions are within the found file name
         if Emma.shared_libs.stringConstants.FILE_IDENTIFIER_OBJECT_SUMMARY is Emma.shared_libs.emma_helper.evalSummary(lastModifiedFiles[-1]):
-            sc().warning("Last modified file is a " + Emma.shared_libs.stringConstants.FILE_IDENTIFIER_OBJECT_SUMMARY + "\n")
+            sc().wwarning("Last modified file is a " + Emma.shared_libs.stringConstants.FILE_IDENTIFIER_OBJECT_SUMMARY + "\n")
 
     if fileToUse is None:
         sc().error("No file containing '" + subStringIdentifier + "' found in " + path)