diff --git a/artifacts/README.md b/artifacts/README.md new file mode 100644 index 00000000..a579926b --- /dev/null +++ b/artifacts/README.md @@ -0,0 +1 @@ +Build outputs go here. Doing a build.cmd/build.sh generates artifacts here (nupkgs, dlls, pdbs, etc.) \ No newline at end of file diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7fcf1b61..d49b6c5e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -19,7 +19,7 @@ jobs: ############################## - job: Check_Build_Options pool: - vmImage: 'VS2017-Win2016' + vmImage: 'windows-2019' steps: @@ -47,68 +47,74 @@ jobs: condition: or( eq( variables['StartReleaseCandidate'], true ), ne(variables['system.pullrequest.isfork'], true) ) displayName: Install NBGV tool - - powershell: | - - # compute authorization header in format "AUTHORIZATION: basic 'encoded token'" - # 'encoded token' is the Base64 of the string "nfbot:personal-token" - $auth = "basic $([System.Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes("nfbot:$(GitHubToken)"))))" - - cd "$env:Agent_TempDirectory" > $null - - git init "$env:Agent_TempDirectory\repo" - cd repo > $null - git remote add origin "$env:Build_Repository_Uri" - git config --global gc.auto 0 - git config --global user.name nfbot - git config --global user.email nanoframework@outlook.com - git config --global core.autocrlf true - git -c http.extraheader="AUTHORIZATION: $auth" fetch --progress origin - - git checkout develop - - cd source - - # prepare release and capture output - $release = nbgv prepare-release - - # get commit message for the merge - $commitMessage = git log -1 --pretty=%B - - # amend commit message to skip build - git commit --amend -m "$commitMessage" -m "***NO_CI***" > $null - - # push all changes to github - git -c http.extraheader="AUTHORIZATION: $auth" push --all origin - - # get release branch name - $branch = $release.Split(' ')[0] - - # start PR for release - $prRequestBody = @{title="Release $branch";body="";head="$branch";base="master"} | ConvertTo-Json - $githubApiEndpoint = "https://api.github.com/repos/$env:Build_Repository_Name/pulls" - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 - - $headers = @{} - $headers.Add("Authorization","$auth") - $headers.Add("Accept","application/vnd.github.symmetra-preview+json") - - try - { - $result = Invoke-RestMethod -Method Post -UserAgent [Microsoft.PowerShell.Commands.PSUserAgent]::InternetExplorer -Uri $githubApiEndpoint -Header $headers -ContentType "application/json" -Body $prRequestBody - 'Started PR for new release...' | Write-Host -NoNewline - 'OK' | Write-Host -ForegroundColor Green - } - catch - { - $result = $_.Exception.Response.GetResponseStream() - $reader = New-Object System.IO.StreamReader($result) - $reader.BaseStream.Position = 0 - $reader.DiscardBufferedData() - $responseBody = $reader.ReadToEnd(); - - "Error starting PR: $responseBody" | Write-Host -ForegroundColor Red - } - + - task: PowerShell@2 + inputs: + targetType: 'inline' + script: | + # compute authorization header in format "AUTHORIZATION: basic 'encoded token'" + # 'encoded token' is the Base64 of the string "nfbot:personal-token" + $auth = "basic $([System.Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes("nfbot:$(GitHubToken)"))))" + + cd "$env:Agent_TempDirectory" > $null + + Write-Host "Cloning from: $env:BUILD_REPOSITORY_URI" + + git clone $env:BUILD_REPOSITORY_URI repo + cd repo > $null + git config --global gc.auto 0 + git config --global user.name nfbot + git config --global user.email nanoframework@outlook.com + git config --global core.autocrlf true + + Write-Host "Checkout develop branch..." + git checkout --quiet develop > $null + + # prepare release and capture output + Write-Host "Prepare release with NBGV..." + $release = nbgv prepare-release -p source + + Write-Host "Prepare commit..." + # get commit message for the merge + $commitMessage = git log -1 --pretty=%B + + # amend commit message to skip build + git commit --amend -m "$commitMessage" -m "***NO_CI***" > $null + + Write-Host "Pushing changes to GitHub..." + # push all changes to github + git -c http.extraheader="AUTHORIZATION: $auth" push --quiet --all origin + + # get release branch name + $branch = $release.Split(' ')[0] + + Write-Host "Prepare PR..." + # start PR for release + $prRequestBody = @{title="Release $branch";body="";head="$branch";base="master"} | ConvertTo-Json + $githubApiEndpoint = "https://api.github.com/repos/$env:BUILD_REPOSITORY_NAME/pulls" + [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 + + $headers = @{} + $headers.Add("Authorization","$auth") + $headers.Add("Accept","application/vnd.github.symmetra-preview+json") + + try + { + $result = Invoke-RestMethod -Method Post -UserAgent [Microsoft.PowerShell.Commands.PSUserAgent]::InternetExplorer -Uri $githubApiEndpoint -Header $headers -ContentType "application/json" -Body $prRequestBody + 'Started PR for new release...' | Write-Host -NoNewline + 'OK' | Write-Host -ForegroundColor Green + } + catch + { + $result = $_.Exception.Response.GetResponseStream() + $reader = New-Object System.IO.StreamReader($result) + $reader.BaseStream.Position = 0 + $reader.DiscardBufferedData() + $responseBody = $reader.ReadToEnd(); + + "Error starting PR: $responseBody" | Write-Host -ForegroundColor Red + } + workingDirectory: $(Agent.TempDirectory) + ignoreLASTEXITCODE: true condition: eq( variables['StartReleaseCandidate'], true ) displayName: NBGV prepare release @@ -120,13 +126,13 @@ jobs: - Check_Build_Options pool: - vmImage: 'VS2017-Win2016' + vmImage: 'windows-2019' variables: DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - buildPlatform: 'Any CPU' + buildPlatform: 'x64' buildConfiguration: 'Release' - solution: 'source\nanoFirmwareFlasher.sln' + solution: 'nanoFirmwareFlasher.sln' steps: @@ -144,10 +150,10 @@ jobs: versionSpec: '4.9.3' displayName: 'Install specifc version of NuGet' - - task: DotNetCoreInstaller@0 + - task: UseDotNet@2 inputs: packageType: sdk - version: 2.1.500 + version: 3.1.101 displayName: Install .NET Core SDK - task: DotNetCoreCLI@2 @@ -160,11 +166,11 @@ jobs: workingDirectory: source displayName: Restore NuGet packages - - script: dotnet build -c $(BuildConfiguration) /p:PublicRelease=true --no-restore /t:build,pack + - script: dotnet build -r win-x64 -c $(BuildConfiguration) /p:PublicRelease=true --no-restore /t:build,pack workingDirectory: source displayName: Build NuGet package - - script: dotnet build -c $(BuildConfiguration) /p:PublicRelease=true /p:PackGlobalTool=true --no-restore /t:build,pack" + - script: dotnet pack --runtime win-x64 -c $(BuildConfiguration) -p:PublicRelease=true -p:PackGlobalTool=true --no-restore workingDirectory: source displayName: Build .NET Core Tool NuGet package @@ -327,7 +333,7 @@ jobs: condition: or( failed('Check_Build_Options'), failed('Build_tool') ) pool: - vmImage: 'VS2017-Win2016' + vmImage: 'windows-2019' steps: diff --git a/source/nanoFirmwareFlasher/esptool/VCRUNTIME140.dll b/lib/esptool/VCRUNTIME140.dll similarity index 100% rename from source/nanoFirmwareFlasher/esptool/VCRUNTIME140.dll rename to lib/esptool/VCRUNTIME140.dll diff --git a/source/nanoFirmwareFlasher/esptool/_bz2.pyd b/lib/esptool/_bz2.pyd similarity index 100% rename from source/nanoFirmwareFlasher/esptool/_bz2.pyd rename to lib/esptool/_bz2.pyd diff --git a/source/nanoFirmwareFlasher/esptool/_ctypes.pyd b/lib/esptool/_ctypes.pyd similarity index 100% rename from source/nanoFirmwareFlasher/esptool/_ctypes.pyd rename to lib/esptool/_ctypes.pyd diff --git a/source/nanoFirmwareFlasher/esptool/_hashlib.pyd b/lib/esptool/_hashlib.pyd similarity index 100% rename from source/nanoFirmwareFlasher/esptool/_hashlib.pyd rename to lib/esptool/_hashlib.pyd diff --git a/source/nanoFirmwareFlasher/esptool/_lzma.pyd b/lib/esptool/_lzma.pyd similarity index 100% rename from source/nanoFirmwareFlasher/esptool/_lzma.pyd rename to lib/esptool/_lzma.pyd diff --git a/source/nanoFirmwareFlasher/esptool/_socket.pyd b/lib/esptool/_socket.pyd similarity index 100% rename from source/nanoFirmwareFlasher/esptool/_socket.pyd rename to lib/esptool/_socket.pyd diff --git a/source/nanoFirmwareFlasher/esptool/_ssl.pyd b/lib/esptool/_ssl.pyd similarity index 100% rename from source/nanoFirmwareFlasher/esptool/_ssl.pyd rename to lib/esptool/_ssl.pyd diff --git a/source/nanoFirmwareFlasher/esptool/base_library.zip b/lib/esptool/base_library.zip similarity index 100% rename from source/nanoFirmwareFlasher/esptool/base_library.zip rename to lib/esptool/base_library.zip diff --git a/source/nanoFirmwareFlasher/esptool/blank.bin b/lib/esptool/blank.bin similarity index 100% rename from source/nanoFirmwareFlasher/esptool/blank.bin rename to lib/esptool/blank.bin diff --git a/source/nanoFirmwareFlasher/esptool/esp_init_data_default.bin b/lib/esptool/esp_init_data_default.bin similarity index 100% rename from source/nanoFirmwareFlasher/esptool/esp_init_data_default.bin rename to lib/esptool/esp_init_data_default.bin diff --git a/source/nanoFirmwareFlasher/esptool/esptool.exe b/lib/esptool/esptool.exe similarity index 100% rename from source/nanoFirmwareFlasher/esptool/esptool.exe rename to lib/esptool/esptool.exe diff --git a/source/nanoFirmwareFlasher/esptool/esptool.exe.manifest b/lib/esptool/esptool.exe.manifest similarity index 100% rename from source/nanoFirmwareFlasher/esptool/esptool.exe.manifest rename to lib/esptool/esptool.exe.manifest diff --git a/source/nanoFirmwareFlasher/esptool/libcrypto-1_1-x64.dll b/lib/esptool/libcrypto-1_1-x64.dll similarity index 100% rename from source/nanoFirmwareFlasher/esptool/libcrypto-1_1-x64.dll rename to lib/esptool/libcrypto-1_1-x64.dll diff --git a/source/nanoFirmwareFlasher/esptool/libssl-1_1-x64.dll b/lib/esptool/libssl-1_1-x64.dll similarity index 100% rename from source/nanoFirmwareFlasher/esptool/libssl-1_1-x64.dll rename to lib/esptool/libssl-1_1-x64.dll diff --git a/source/nanoFirmwareFlasher/esptool/pyexpat.pyd b/lib/esptool/pyexpat.pyd similarity index 100% rename from source/nanoFirmwareFlasher/esptool/pyexpat.pyd rename to lib/esptool/pyexpat.pyd diff --git a/source/nanoFirmwareFlasher/esptool/python37.dll b/lib/esptool/python37.dll similarity index 100% rename from source/nanoFirmwareFlasher/esptool/python37.dll rename to lib/esptool/python37.dll diff --git a/source/nanoFirmwareFlasher/esptool/select.pyd b/lib/esptool/select.pyd similarity index 100% rename from source/nanoFirmwareFlasher/esptool/select.pyd rename to lib/esptool/select.pyd diff --git a/source/nanoFirmwareFlasher/esptool/unicodedata.pyd b/lib/esptool/unicodedata.pyd similarity index 100% rename from source/nanoFirmwareFlasher/esptool/unicodedata.pyd rename to lib/esptool/unicodedata.pyd diff --git a/lib/stdfu/x64/STDFU.dll b/lib/stdfu/x64/STDFU.dll new file mode 100644 index 00000000..6ef75b58 Binary files /dev/null and b/lib/stdfu/x64/STDFU.dll differ diff --git a/lib/stdfu/x64/STTubeDevice30.dll b/lib/stdfu/x64/STTubeDevice30.dll new file mode 100644 index 00000000..3a7945f8 Binary files /dev/null and b/lib/stdfu/x64/STTubeDevice30.dll differ diff --git a/source/nanoFirmwareFlasher/stdfu/STDFU.dll b/lib/stdfu/x86/STDFU.dll similarity index 100% rename from source/nanoFirmwareFlasher/stdfu/STDFU.dll rename to lib/stdfu/x86/STDFU.dll diff --git a/source/nanoFirmwareFlasher/stdfu/STTubeDevice30.dll b/lib/stdfu/x86/STTubeDevice30.dll similarity index 100% rename from source/nanoFirmwareFlasher/stdfu/STTubeDevice30.dll rename to lib/stdfu/x86/STTubeDevice30.dll diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x410.stldr b/lib/stlink/FlashLoader/0x410.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x410.stldr rename to lib/stlink/FlashLoader/0x410.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x411.stldr b/lib/stlink/FlashLoader/0x411.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x411.stldr rename to lib/stlink/FlashLoader/0x411.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x412.stldr b/lib/stlink/FlashLoader/0x412.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x412.stldr rename to lib/stlink/FlashLoader/0x412.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x413.stldr b/lib/stlink/FlashLoader/0x413.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x413.stldr rename to lib/stlink/FlashLoader/0x413.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x414.stldr b/lib/stlink/FlashLoader/0x414.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x414.stldr rename to lib/stlink/FlashLoader/0x414.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x415.stldr b/lib/stlink/FlashLoader/0x415.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x415.stldr rename to lib/stlink/FlashLoader/0x415.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x416.stldr b/lib/stlink/FlashLoader/0x416.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x416.stldr rename to lib/stlink/FlashLoader/0x416.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x417.stldr b/lib/stlink/FlashLoader/0x417.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x417.stldr rename to lib/stlink/FlashLoader/0x417.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x418.stldr b/lib/stlink/FlashLoader/0x418.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x418.stldr rename to lib/stlink/FlashLoader/0x418.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x419.stldr b/lib/stlink/FlashLoader/0x419.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x419.stldr rename to lib/stlink/FlashLoader/0x419.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x419_DB1M_On.stldr b/lib/stlink/FlashLoader/0x419_DB1M_On.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x419_DB1M_On.stldr rename to lib/stlink/FlashLoader/0x419_DB1M_On.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x420.stldr b/lib/stlink/FlashLoader/0x420.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x420.stldr rename to lib/stlink/FlashLoader/0x420.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x421.stldr b/lib/stlink/FlashLoader/0x421.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x421.stldr rename to lib/stlink/FlashLoader/0x421.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x422.stldr b/lib/stlink/FlashLoader/0x422.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x422.stldr rename to lib/stlink/FlashLoader/0x422.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x423.stldr b/lib/stlink/FlashLoader/0x423.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x423.stldr rename to lib/stlink/FlashLoader/0x423.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x425.stldr b/lib/stlink/FlashLoader/0x425.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x425.stldr rename to lib/stlink/FlashLoader/0x425.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x427.stldr b/lib/stlink/FlashLoader/0x427.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x427.stldr rename to lib/stlink/FlashLoader/0x427.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x428.stldr b/lib/stlink/FlashLoader/0x428.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x428.stldr rename to lib/stlink/FlashLoader/0x428.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x429.stldr b/lib/stlink/FlashLoader/0x429.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x429.stldr rename to lib/stlink/FlashLoader/0x429.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x430.stldr b/lib/stlink/FlashLoader/0x430.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x430.stldr rename to lib/stlink/FlashLoader/0x430.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x431.stldr b/lib/stlink/FlashLoader/0x431.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x431.stldr rename to lib/stlink/FlashLoader/0x431.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x432.stldr b/lib/stlink/FlashLoader/0x432.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x432.stldr rename to lib/stlink/FlashLoader/0x432.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x433.stldr b/lib/stlink/FlashLoader/0x433.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x433.stldr rename to lib/stlink/FlashLoader/0x433.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x434.stldr b/lib/stlink/FlashLoader/0x434.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x434.stldr rename to lib/stlink/FlashLoader/0x434.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x434_DB1M_On.stldr b/lib/stlink/FlashLoader/0x434_DB1M_On.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x434_DB1M_On.stldr rename to lib/stlink/FlashLoader/0x434_DB1M_On.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x435.stldr b/lib/stlink/FlashLoader/0x435.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x435.stldr rename to lib/stlink/FlashLoader/0x435.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x436.stldr b/lib/stlink/FlashLoader/0x436.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x436.stldr rename to lib/stlink/FlashLoader/0x436.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x437.stldr b/lib/stlink/FlashLoader/0x437.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x437.stldr rename to lib/stlink/FlashLoader/0x437.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x438.stldr b/lib/stlink/FlashLoader/0x438.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x438.stldr rename to lib/stlink/FlashLoader/0x438.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x439.stldr b/lib/stlink/FlashLoader/0x439.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x439.stldr rename to lib/stlink/FlashLoader/0x439.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x440.stldr b/lib/stlink/FlashLoader/0x440.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x440.stldr rename to lib/stlink/FlashLoader/0x440.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x441.stldr b/lib/stlink/FlashLoader/0x441.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x441.stldr rename to lib/stlink/FlashLoader/0x441.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x442.stldr b/lib/stlink/FlashLoader/0x442.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x442.stldr rename to lib/stlink/FlashLoader/0x442.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x444.stldr b/lib/stlink/FlashLoader/0x444.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x444.stldr rename to lib/stlink/FlashLoader/0x444.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x445.stldr b/lib/stlink/FlashLoader/0x445.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x445.stldr rename to lib/stlink/FlashLoader/0x445.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x446.stldr b/lib/stlink/FlashLoader/0x446.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x446.stldr rename to lib/stlink/FlashLoader/0x446.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x447.stldr b/lib/stlink/FlashLoader/0x447.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x447.stldr rename to lib/stlink/FlashLoader/0x447.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x448.stldr b/lib/stlink/FlashLoader/0x448.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x448.stldr rename to lib/stlink/FlashLoader/0x448.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x449.stldr b/lib/stlink/FlashLoader/0x449.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x449.stldr rename to lib/stlink/FlashLoader/0x449.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x450.stldr b/lib/stlink/FlashLoader/0x450.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x450.stldr rename to lib/stlink/FlashLoader/0x450.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x451.stldr b/lib/stlink/FlashLoader/0x451.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x451.stldr rename to lib/stlink/FlashLoader/0x451.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x451_DB_On.stldr b/lib/stlink/FlashLoader/0x451_DB_On.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x451_DB_On.stldr rename to lib/stlink/FlashLoader/0x451_DB_On.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x452.stldr b/lib/stlink/FlashLoader/0x452.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x452.stldr rename to lib/stlink/FlashLoader/0x452.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x457.stldr b/lib/stlink/FlashLoader/0x457.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x457.stldr rename to lib/stlink/FlashLoader/0x457.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x458.stldr b/lib/stlink/FlashLoader/0x458.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x458.stldr rename to lib/stlink/FlashLoader/0x458.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x460.stldr b/lib/stlink/FlashLoader/0x460.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x460.stldr rename to lib/stlink/FlashLoader/0x460.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x461.stldr b/lib/stlink/FlashLoader/0x461.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x461.stldr rename to lib/stlink/FlashLoader/0x461.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x462.stldr b/lib/stlink/FlashLoader/0x462.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x462.stldr rename to lib/stlink/FlashLoader/0x462.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x463.stldr b/lib/stlink/FlashLoader/0x463.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x463.stldr rename to lib/stlink/FlashLoader/0x463.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x464.stldr b/lib/stlink/FlashLoader/0x464.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x464.stldr rename to lib/stlink/FlashLoader/0x464.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x466.stldr b/lib/stlink/FlashLoader/0x466.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x466.stldr rename to lib/stlink/FlashLoader/0x466.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x468.stldr b/lib/stlink/FlashLoader/0x468.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x468.stldr rename to lib/stlink/FlashLoader/0x468.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x469.stldr b/lib/stlink/FlashLoader/0x469.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x469.stldr rename to lib/stlink/FlashLoader/0x469.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x470.stldr b/lib/stlink/FlashLoader/0x470.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x470.stldr rename to lib/stlink/FlashLoader/0x470.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x472.stldr b/lib/stlink/FlashLoader/0x472.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x472.stldr rename to lib/stlink/FlashLoader/0x472.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x495.stldr b/lib/stlink/FlashLoader/0x495.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x495.stldr rename to lib/stlink/FlashLoader/0x495.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x9A8.stldr b/lib/stlink/FlashLoader/0x9A8.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x9A8.stldr rename to lib/stlink/FlashLoader/0x9A8.stldr diff --git a/source/nanoFirmwareFlasher/stlink/FlashLoader/0x9B0.stldr b/lib/stlink/FlashLoader/0x9B0.stldr similarity index 100% rename from source/nanoFirmwareFlasher/stlink/FlashLoader/0x9B0.stldr rename to lib/stlink/FlashLoader/0x9B0.stldr diff --git a/source/nanoFirmwareFlasher/stlink/ST-LINK_CLI.exe b/lib/stlink/ST-LINK_CLI.exe similarity index 100% rename from source/nanoFirmwareFlasher/stlink/ST-LINK_CLI.exe rename to lib/stlink/ST-LINK_CLI.exe diff --git a/source/nanoFirmwareFlasher/stlink/STLinkUSBDriver.dll b/lib/stlink/STLinkUSBDriver.dll similarity index 100% rename from source/nanoFirmwareFlasher/stlink/STLinkUSBDriver.dll rename to lib/stlink/STLinkUSBDriver.dll diff --git a/source/nanoFirmwareFlasher/uniflash/CC1352P1F3.ccxml b/lib/uniflash/CC1352P1F3.ccxml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/CC1352P1F3.ccxml rename to lib/uniflash/CC1352P1F3.ccxml diff --git a/source/nanoFirmwareFlasher/uniflash/CC1352R1F3.ccxml b/lib/uniflash/CC1352R1F3.ccxml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/CC1352R1F3.ccxml rename to lib/uniflash/CC1352R1F3.ccxml diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/BatchDriverInstaller.exe b/lib/uniflash/DebugServer/bin/BatchDriverInstaller.exe similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/BatchDriverInstaller.exe rename to lib/uniflash/DebugServer/bin/BatchDriverInstaller.exe diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/DSLite.exe b/lib/uniflash/DebugServer/bin/DSLite.exe similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/DSLite.exe rename to lib/uniflash/DebugServer/bin/DSLite.exe diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/DebugProperties.dll b/lib/uniflash/DebugServer/bin/DebugProperties.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/DebugProperties.dll rename to lib/uniflash/DebugServer/bin/DebugProperties.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/DebugServer.dll b/lib/uniflash/DebugServer/bin/DebugServer.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/DebugServer.dll rename to lib/uniflash/DebugServer/bin/DebugServer.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/FlashCC26x2.dll b/lib/uniflash/DebugServer/bin/FlashCC26x2.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/FlashCC26x2.dll rename to lib/uniflash/DebugServer/bin/FlashCC26x2.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/FlashCC26xx.dll b/lib/uniflash/DebugServer/bin/FlashCC26xx.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/FlashCC26xx.dll rename to lib/uniflash/DebugServer/bin/FlashCC26xx.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/FlashCC3230SF.dll b/lib/uniflash/DebugServer/bin/FlashCC3230SF.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/FlashCC3230SF.dll rename to lib/uniflash/DebugServer/bin/FlashCC3230SF.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/FlashCC3235SF.dll b/lib/uniflash/DebugServer/bin/FlashCC3235SF.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/FlashCC3235SF.dll rename to lib/uniflash/DebugServer/bin/FlashCC3235SF.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/FlashDFUStellaris.dll b/lib/uniflash/DebugServer/bin/FlashDFUStellaris.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/FlashDFUStellaris.dll rename to lib/uniflash/DebugServer/bin/FlashDFUStellaris.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/FlashDLLDB.xml b/lib/uniflash/DebugServer/bin/FlashDLLDB.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/FlashDLLDB.xml rename to lib/uniflash/DebugServer/bin/FlashDLLDB.xml diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/FlashEthernetStellaris.dll b/lib/uniflash/DebugServer/bin/FlashEthernetStellaris.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/FlashEthernetStellaris.dll rename to lib/uniflash/DebugServer/bin/FlashEthernetStellaris.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/FlashFTDStellaris.dll b/lib/uniflash/DebugServer/bin/FlashFTDStellaris.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/FlashFTDStellaris.dll rename to lib/uniflash/DebugServer/bin/FlashFTDStellaris.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/FlashGeneric.dll b/lib/uniflash/DebugServer/bin/FlashGeneric.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/FlashGeneric.dll rename to lib/uniflash/DebugServer/bin/FlashGeneric.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/FlashHercules.dll b/lib/uniflash/DebugServer/bin/FlashHercules.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/FlashHercules.dll rename to lib/uniflash/DebugServer/bin/FlashHercules.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/FlashMSP432.dll b/lib/uniflash/DebugServer/bin/FlashMSP432.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/FlashMSP432.dll rename to lib/uniflash/DebugServer/bin/FlashMSP432.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/FlashSerialStellaris.dll b/lib/uniflash/DebugServer/bin/FlashSerialStellaris.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/FlashSerialStellaris.dll rename to lib/uniflash/DebugServer/bin/FlashSerialStellaris.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/FlashStellaris.dll b/lib/uniflash/DebugServer/bin/FlashStellaris.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/FlashStellaris.dll rename to lib/uniflash/DebugServer/bin/FlashStellaris.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/LibraryLoader.dll b/lib/uniflash/DebugServer/bin/LibraryLoader.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/LibraryLoader.dll rename to lib/uniflash/DebugServer/bin/LibraryLoader.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/SerialFlashProgrammer.dll b/lib/uniflash/DebugServer/bin/SerialFlashProgrammer.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/SerialFlashProgrammer.dll rename to lib/uniflash/DebugServer/bin/SerialFlashProgrammer.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/XPCOMUtility.dll b/lib/uniflash/DebugServer/bin/XPCOMUtility.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/XPCOMUtility.dll rename to lib/uniflash/DebugServer/bin/XPCOMUtility.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-console-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-console-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-console-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-console-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-datetime-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-datetime-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-datetime-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-datetime-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-debug-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-debug-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-debug-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-debug-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-delayload-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-delayload-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-delayload-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-delayload-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-errorhandling-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-errorhandling-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-errorhandling-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-errorhandling-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-fibers-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-fibers-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-fibers-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-fibers-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-file-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-file-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-file-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-file-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-file-l1-2-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-file-l1-2-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-file-l1-2-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-file-l1-2-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-file-l2-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-file-l2-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-file-l2-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-file-l2-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-handle-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-handle-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-handle-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-handle-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-heap-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-heap-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-heap-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-heap-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-interlocked-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-interlocked-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-interlocked-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-interlocked-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-io-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-io-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-io-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-io-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-libraryloader-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-libraryloader-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-libraryloader-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-libraryloader-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-localization-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-localization-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-localization-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-localization-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-localization-l1-2-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-localization-l1-2-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-localization-l1-2-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-localization-l1-2-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-localregistry-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-localregistry-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-localregistry-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-localregistry-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-memory-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-memory-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-memory-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-memory-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-misc-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-misc-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-misc-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-misc-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-namedpipe-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-namedpipe-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-namedpipe-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-namedpipe-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-processenvironment-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-processenvironment-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-processenvironment-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-processenvironment-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-processthreads-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-processthreads-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-processthreads-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-processthreads-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-processthreads-l1-1-1.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-processthreads-l1-1-1.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-processthreads-l1-1-1.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-processthreads-l1-1-1.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-profile-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-profile-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-profile-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-profile-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-rtlsupport-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-rtlsupport-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-rtlsupport-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-rtlsupport-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-string-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-string-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-string-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-string-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-synch-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-synch-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-synch-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-synch-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-synch-l1-2-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-synch-l1-2-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-synch-l1-2-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-synch-l1-2-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-sysinfo-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-sysinfo-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-sysinfo-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-sysinfo-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-threadpool-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-threadpool-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-threadpool-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-threadpool-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-timezone-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-timezone-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-timezone-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-timezone-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-util-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-util-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-util-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-util-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-xstate-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-xstate-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-xstate-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-xstate-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-xstate-l2-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-core-xstate-l2-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-core-xstate-l2-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-core-xstate-l2-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-crt-conio-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-crt-conio-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-crt-conio-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-crt-conio-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-crt-convert-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-crt-convert-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-crt-convert-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-crt-convert-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-crt-environment-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-crt-environment-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-crt-environment-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-crt-environment-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-crt-filesystem-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-crt-filesystem-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-crt-filesystem-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-crt-filesystem-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-crt-heap-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-crt-heap-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-crt-heap-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-crt-heap-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-crt-locale-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-crt-locale-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-crt-locale-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-crt-locale-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-crt-math-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-crt-math-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-crt-math-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-crt-math-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-crt-multibyte-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-crt-multibyte-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-crt-multibyte-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-crt-multibyte-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-crt-private-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-crt-private-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-crt-private-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-crt-private-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-crt-process-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-crt-process-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-crt-process-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-crt-process-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-crt-runtime-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-crt-runtime-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-crt-runtime-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-crt-runtime-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-crt-stdio-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-crt-stdio-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-crt-stdio-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-crt-stdio-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-crt-string-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-crt-string-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-crt-string-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-crt-string-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-crt-time-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-crt-time-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-crt-time-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-crt-time-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-crt-utility-l1-1-0.dll b/lib/uniflash/DebugServer/bin/api-ms-win-crt-utility-l1-1-0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/api-ms-win-crt-utility-l1-1-0.dll rename to lib/uniflash/DebugServer/bin/api-ms-win-crt-utility-l1-1-0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/msvcp120.dll b/lib/uniflash/DebugServer/bin/msvcp120.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/msvcp120.dll rename to lib/uniflash/DebugServer/bin/msvcp120.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/msvcp140.dll b/lib/uniflash/DebugServer/bin/msvcp140.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/msvcp140.dll rename to lib/uniflash/DebugServer/bin/msvcp140.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/msvcr120.dll b/lib/uniflash/DebugServer/bin/msvcr120.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/msvcr120.dll rename to lib/uniflash/DebugServer/bin/msvcr120.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/ti_xpcom.dll b/lib/uniflash/DebugServer/bin/ti_xpcom.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/ti_xpcom.dll rename to lib/uniflash/DebugServer/bin/ti_xpcom.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/tiofr11.dll b/lib/uniflash/DebugServer/bin/tiofr11.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/tiofr11.dll rename to lib/uniflash/DebugServer/bin/tiofr11.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/tiofr_gnu.dll b/lib/uniflash/DebugServer/bin/tiofr_gnu.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/tiofr_gnu.dll rename to lib/uniflash/DebugServer/bin/tiofr_gnu.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/tiofr_tial.dll b/lib/uniflash/DebugServer/bin/tiofr_tial.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/tiofr_tial.dll rename to lib/uniflash/DebugServer/bin/tiofr_tial.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/ucrtbase.dll b/lib/uniflash/DebugServer/bin/ucrtbase.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/ucrtbase.dll rename to lib/uniflash/DebugServer/bin/ucrtbase.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/bin/vcruntime140.dll b/lib/uniflash/DebugServer/bin/vcruntime140.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/bin/vcruntime140.dll rename to lib/uniflash/DebugServer/bin/vcruntime140.dll diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/components/components.txt b/lib/uniflash/DebugServer/components/components.txt similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/components/components.txt rename to lib/uniflash/DebugServer/components/components.txt diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/CC13_FlashProperties.xml b/lib/uniflash/DebugServer/propertyDB/CC13_FlashProperties.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/CC13_FlashProperties.xml rename to lib/uniflash/DebugServer/propertyDB/CC13_FlashProperties.xml diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/CC13x2_FlashProperties.xml b/lib/uniflash/DebugServer/propertyDB/CC13x2_FlashProperties.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/CC13x2_FlashProperties.xml rename to lib/uniflash/DebugServer/propertyDB/CC13x2_FlashProperties.xml diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/CC26_FlashProperties.xml b/lib/uniflash/DebugServer/propertyDB/CC26_FlashProperties.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/CC26_FlashProperties.xml rename to lib/uniflash/DebugServer/propertyDB/CC26_FlashProperties.xml diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/CC26x2_FlashProperties.xml b/lib/uniflash/DebugServer/propertyDB/CC26x2_FlashProperties.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/CC26x2_FlashProperties.xml rename to lib/uniflash/DebugServer/propertyDB/CC26x2_FlashProperties.xml diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/CC3230SF_FlashProperties.xml b/lib/uniflash/DebugServer/propertyDB/CC3230SF_FlashProperties.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/CC3230SF_FlashProperties.xml rename to lib/uniflash/DebugServer/propertyDB/CC3230SF_FlashProperties.xml diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/CC3235SF_FlashProperties.xml b/lib/uniflash/DebugServer/propertyDB/CC3235SF_FlashProperties.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/CC3235SF_FlashProperties.xml rename to lib/uniflash/DebugServer/propertyDB/CC3235SF_FlashProperties.xml diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/DFUTIVALM_FlashProperties.xml b/lib/uniflash/DebugServer/propertyDB/DFUTIVALM_FlashProperties.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/DFUTIVALM_FlashProperties.xml rename to lib/uniflash/DebugServer/propertyDB/DFUTIVALM_FlashProperties.xml diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/FlashPropertiesTranslator.xml b/lib/uniflash/DebugServer/propertyDB/FlashPropertiesTranslator.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/FlashPropertiesTranslator.xml rename to lib/uniflash/DebugServer/propertyDB/FlashPropertiesTranslator.xml diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/LMx_FlashProperties.xml b/lib/uniflash/DebugServer/propertyDB/LMx_FlashProperties.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/LMx_FlashProperties.xml rename to lib/uniflash/DebugServer/propertyDB/LMx_FlashProperties.xml diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/MSP432E401Y_FlashProperties.xml b/lib/uniflash/DebugServer/propertyDB/MSP432E401Y_FlashProperties.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/MSP432E401Y_FlashProperties.xml rename to lib/uniflash/DebugServer/propertyDB/MSP432E401Y_FlashProperties.xml diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/MSP432E411Y_FlashProperties.xml b/lib/uniflash/DebugServer/propertyDB/MSP432E411Y_FlashProperties.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/MSP432E411Y_FlashProperties.xml rename to lib/uniflash/DebugServer/propertyDB/MSP432E411Y_FlashProperties.xml diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/MSP432P4011_FlashProperties.xml b/lib/uniflash/DebugServer/propertyDB/MSP432P4011_FlashProperties.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/MSP432P4011_FlashProperties.xml rename to lib/uniflash/DebugServer/propertyDB/MSP432P4011_FlashProperties.xml diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/MSP432P401M_FlashProperties.xml b/lib/uniflash/DebugServer/propertyDB/MSP432P401M_FlashProperties.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/MSP432P401M_FlashProperties.xml rename to lib/uniflash/DebugServer/propertyDB/MSP432P401M_FlashProperties.xml diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/MSP432P401R_FlashProperties.xml b/lib/uniflash/DebugServer/propertyDB/MSP432P401R_FlashProperties.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/MSP432P401R_FlashProperties.xml rename to lib/uniflash/DebugServer/propertyDB/MSP432P401R_FlashProperties.xml diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/MSP432P401V_FlashProperties.xml b/lib/uniflash/DebugServer/propertyDB/MSP432P401V_FlashProperties.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/MSP432P401V_FlashProperties.xml rename to lib/uniflash/DebugServer/propertyDB/MSP432P401V_FlashProperties.xml diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/MSP432P401Y_FlashProperties.xml b/lib/uniflash/DebugServer/propertyDB/MSP432P401Y_FlashProperties.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/MSP432P401Y_FlashProperties.xml rename to lib/uniflash/DebugServer/propertyDB/MSP432P401Y_FlashProperties.xml diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/MSP432P4111_FlashProperties.xml b/lib/uniflash/DebugServer/propertyDB/MSP432P4111_FlashProperties.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/MSP432P4111_FlashProperties.xml rename to lib/uniflash/DebugServer/propertyDB/MSP432P4111_FlashProperties.xml diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/MSP432P411V_FlashProperties.xml b/lib/uniflash/DebugServer/propertyDB/MSP432P411V_FlashProperties.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/MSP432P411V_FlashProperties.xml rename to lib/uniflash/DebugServer/propertyDB/MSP432P411V_FlashProperties.xml diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/MSP432P411Y_FlashProperties.xml b/lib/uniflash/DebugServer/propertyDB/MSP432P411Y_FlashProperties.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/MSP432P411Y_FlashProperties.xml rename to lib/uniflash/DebugServer/propertyDB/MSP432P411Y_FlashProperties.xml diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/PropertiesDB.xml b/lib/uniflash/DebugServer/propertyDB/PropertiesDB.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/PropertiesDB.xml rename to lib/uniflash/DebugServer/propertyDB/PropertiesDB.xml diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/Serial_FlashProperties.xml b/lib/uniflash/DebugServer/propertyDB/Serial_FlashProperties.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/propertyDB/Serial_FlashProperties.xml rename to lib/uniflash/DebugServer/propertyDB/Serial_FlashProperties.xml diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/schemas/PropertiesDB.xsd b/lib/uniflash/DebugServer/schemas/PropertiesDB.xsd similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/schemas/PropertiesDB.xsd rename to lib/uniflash/DebugServer/schemas/PropertiesDB.xsd diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/schemas/PropertiesSaveSetting.xsd b/lib/uniflash/DebugServer/schemas/PropertiesSaveSetting.xsd similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/schemas/PropertiesSaveSetting.xsd rename to lib/uniflash/DebugServer/schemas/PropertiesSaveSetting.xsd diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/scripts/flash.dsls b/lib/uniflash/DebugServer/scripts/flash.dsls similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/scripts/flash.dsls rename to lib/uniflash/DebugServer/scripts/flash.dsls diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/scripts/help.dsls b/lib/uniflash/DebugServer/scripts/help.dsls similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/scripts/help.dsls rename to lib/uniflash/DebugServer/scripts/help.dsls diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/scripts/load.dsls b/lib/uniflash/DebugServer/scripts/load.dsls similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/scripts/load.dsls rename to lib/uniflash/DebugServer/scripts/load.dsls diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/scripts/memory.dsls b/lib/uniflash/DebugServer/scripts/memory.dsls similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/scripts/memory.dsls rename to lib/uniflash/DebugServer/scripts/memory.dsls diff --git a/source/nanoFirmwareFlasher/uniflash/DebugServer/scripts/serial.dsls b/lib/uniflash/DebugServer/scripts/serial.dsls similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/DebugServer/scripts/serial.dsls rename to lib/uniflash/DebugServer/scripts/serial.dsls diff --git a/source/nanoFirmwareFlasher/uniflash/arm/FlashLoaderCC26x0.out b/lib/uniflash/arm/FlashLoaderCC26x0.out similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/arm/FlashLoaderCC26x0.out rename to lib/uniflash/arm/FlashLoaderCC26x0.out diff --git a/source/nanoFirmwareFlasher/uniflash/arm/FlashLoaderCC26x2.out b/lib/uniflash/arm/FlashLoaderCC26x2.out similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/arm/FlashLoaderCC26x2.out rename to lib/uniflash/arm/FlashLoaderCC26x2.out diff --git a/source/nanoFirmwareFlasher/uniflash/common/bin/CCReg.dll b/lib/uniflash/common/bin/CCReg.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/bin/CCReg.dll rename to lib/uniflash/common/bin/CCReg.dll diff --git a/source/nanoFirmwareFlasher/uniflash/common/bin/MiniDump.dll b/lib/uniflash/common/bin/MiniDump.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/bin/MiniDump.dll rename to lib/uniflash/common/bin/MiniDump.dll diff --git a/source/nanoFirmwareFlasher/uniflash/common/bin/fsutil.dll b/lib/uniflash/common/bin/fsutil.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/bin/fsutil.dll rename to lib/uniflash/common/bin/fsutil.dll diff --git a/source/nanoFirmwareFlasher/uniflash/common/bin/libusb-1.0.dll b/lib/uniflash/common/bin/libusb-1.0.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/bin/libusb-1.0.dll rename to lib/uniflash/common/bin/libusb-1.0.dll diff --git a/source/nanoFirmwareFlasher/uniflash/common/bin/setup_parser.dll b/lib/uniflash/common/bin/setup_parser.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/bin/setup_parser.dll rename to lib/uniflash/common/bin/setup_parser.dll diff --git a/source/nanoFirmwareFlasher/uniflash/common/bin/ti_logger.dll b/lib/uniflash/common/bin/ti_logger.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/bin/ti_logger.dll rename to lib/uniflash/common/bin/ti_logger.dll diff --git a/source/nanoFirmwareFlasher/uniflash/common/bin/ti_targetdb_parser.dll b/lib/uniflash/common/bin/ti_targetdb_parser.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/bin/ti_targetdb_parser.dll rename to lib/uniflash/common/bin/ti_targetdb_parser.dll diff --git a/source/nanoFirmwareFlasher/uniflash/common/bin/xerces-c_2_8.dll b/lib/uniflash/common/bin/xerces-c_2_8.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/bin/xerces-c_2_8.dll rename to lib/uniflash/common/bin/xerces-c_2_8.dll diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/ADI_4_AUX.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/ADI_4_AUX.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/ADI_4_AUX.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/ADI_4_AUX.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/AON_BATMON.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/AON_BATMON.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/AON_BATMON.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/AON_BATMON.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/AON_EVENT.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/AON_EVENT.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/AON_EVENT.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/AON_EVENT.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/AON_IOC.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/AON_IOC.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/AON_IOC.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/AON_IOC.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/AON_PMCTL.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/AON_PMCTL.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/AON_PMCTL.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/AON_PMCTL.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/AON_RTC.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/AON_RTC.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/AON_RTC.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/AON_RTC.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_AIODIO.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_AIODIO.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_AIODIO.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_AIODIO.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_ANAIF.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_ANAIF.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_ANAIF.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_ANAIF.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_EVCTL.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_EVCTL.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_EVCTL.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_EVCTL.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_MAC.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_MAC.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_MAC.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_MAC.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_SCE.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_SCE.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_SCE.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_SCE.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_SMPH.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_SMPH.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_SMPH.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_SMPH.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_SPIM.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_SPIM.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_SPIM.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_SPIM.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_SYSIF.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_SYSIF.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_SYSIF.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_SYSIF.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_TDC.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_TDC.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_TDC.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_TDC.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_TIMER01.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_TIMER01.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_TIMER01.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_TIMER01.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_TIMER2.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_TIMER2.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_TIMER2.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/AUX_TIMER2.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/CC26x2_JSTATE_2_NotVisible.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/CC26x2_JSTATE_2_NotVisible.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/CC26x2_JSTATE_2_NotVisible.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/CC26x2_JSTATE_2_NotVisible.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/CCFG.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/CCFG.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/CCFG.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/CCFG.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/CPU_DWT.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/CPU_DWT.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/CPU_DWT.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/CPU_DWT.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/CPU_FPB.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/CPU_FPB.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/CPU_FPB.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/CPU_FPB.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/CPU_ITM.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/CPU_ITM.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/CPU_ITM.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/CPU_ITM.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/CPU_SCS.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/CPU_SCS.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/CPU_SCS.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/CPU_SCS.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/CPU_TIPROP.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/CPU_TIPROP.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/CPU_TIPROP.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/CPU_TIPROP.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/CPU_TPIU.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/CPU_TPIU.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/CPU_TPIU.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/CPU_TPIU.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/CRYPTO.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/CRYPTO.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/CRYPTO.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/CRYPTO.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/DDI_0_OSC.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/DDI_0_OSC.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/DDI_0_OSC.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/DDI_0_OSC.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/EVENT.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/EVENT.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/EVENT.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/EVENT.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/FCFG1.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/FCFG1.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/FCFG1.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/FCFG1.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/FLASH.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/FLASH.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/FLASH.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/FLASH.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/GPIO.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/GPIO.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/GPIO.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/GPIO.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/GPT.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/GPT.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/GPT.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/GPT.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/I2C.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/I2C.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/I2C.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/I2C.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/I2S.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/I2S.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/I2S.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/I2S.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/IOC.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/IOC.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/IOC.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/IOC.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/PKA.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/PKA.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/PKA.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/PKA.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/PKA_INT.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/PKA_INT.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/PKA_INT.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/PKA_INT.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/PRCM.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/PRCM.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/PRCM.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/PRCM.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/RFC_DBELL.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/RFC_DBELL.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/RFC_DBELL.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/RFC_DBELL.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/RFC_PWR.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/RFC_PWR.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/RFC_PWR.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/RFC_PWR.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/RFC_RAT.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/RFC_RAT.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/RFC_RAT.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/RFC_RAT.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/SMPH.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/SMPH.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/SMPH.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/SMPH.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/SRAM_MMR.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/SRAM_MMR.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/SRAM_MMR.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/SRAM_MMR.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/SSI.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/SSI.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/SSI.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/SSI.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/TRNG.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/TRNG.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/TRNG.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/TRNG.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/UART.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/UART.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/UART.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/UART.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/UDMA.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/UDMA.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/UDMA.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/UDMA.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/VIMS.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/VIMS.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/VIMS.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/VIMS.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/WDT.xml b/lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/WDT.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/CC26xx/CC2652/WDT.xml rename to lib/uniflash/common/targetdb/Modules/CC26xx/CC2652/WDT.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/ICEPickCHidden.xml b/lib/uniflash/common/targetdb/Modules/ICEPickCHidden.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/ICEPickCHidden.xml rename to lib/uniflash/common/targetdb/Modules/ICEPickCHidden.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/cortexM4_NotVisible.xml b/lib/uniflash/common/targetdb/Modules/cortexM4_NotVisible.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/cortexM4_NotVisible.xml rename to lib/uniflash/common/targetdb/Modules/cortexM4_NotVisible.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/cs_dap_NotVisible.xml b/lib/uniflash/common/targetdb/Modules/cs_dap_NotVisible.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/Modules/cs_dap_NotVisible.xml rename to lib/uniflash/common/targetdb/Modules/cs_dap_NotVisible.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/connections/TIXDS110_Connection.xml b/lib/uniflash/common/targetdb/connections/TIXDS110_Connection.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/connections/TIXDS110_Connection.xml rename to lib/uniflash/common/targetdb/connections/TIXDS110_Connection.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/cpus/cortex_m0.xml b/lib/uniflash/common/targetdb/cpus/cortex_m0.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/cpus/cortex_m0.xml rename to lib/uniflash/common/targetdb/cpus/cortex_m0.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/cpus/cortex_m0p.xml b/lib/uniflash/common/targetdb/cpus/cortex_m0p.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/cpus/cortex_m0p.xml rename to lib/uniflash/common/targetdb/cpus/cortex_m0p.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/cpus/cortex_m3.xml b/lib/uniflash/common/targetdb/cpus/cortex_m3.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/cpus/cortex_m3.xml rename to lib/uniflash/common/targetdb/cpus/cortex_m3.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/cpus/cortex_m4.xml b/lib/uniflash/common/targetdb/cpus/cortex_m4.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/cpus/cortex_m4.xml rename to lib/uniflash/common/targetdb/cpus/cortex_m4.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/cpus/cortex_m4f.xml b/lib/uniflash/common/targetdb/cpus/cortex_m4f.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/cpus/cortex_m4f.xml rename to lib/uniflash/common/targetdb/cpus/cortex_m4f.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/CC3220.xml b/lib/uniflash/common/targetdb/devices/CC3220.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/CC3220.xml rename to lib/uniflash/common/targetdb/devices/CC3220.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/CC3220S.xml b/lib/uniflash/common/targetdb/devices/CC3220S.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/CC3220S.xml rename to lib/uniflash/common/targetdb/devices/CC3220S.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/CC3220SF.xml b/lib/uniflash/common/targetdb/devices/CC3220SF.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/CC3220SF.xml rename to lib/uniflash/common/targetdb/devices/CC3220SF.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/CC3220SF_SWD.xml b/lib/uniflash/common/targetdb/devices/CC3220SF_SWD.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/CC3220SF_SWD.xml rename to lib/uniflash/common/targetdb/devices/CC3220SF_SWD.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/CC3220S_SWD.xml b/lib/uniflash/common/targetdb/devices/CC3220S_SWD.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/CC3220S_SWD.xml rename to lib/uniflash/common/targetdb/devices/CC3220S_SWD.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/CC3220_SWD.xml b/lib/uniflash/common/targetdb/devices/CC3220_SWD.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/CC3220_SWD.xml rename to lib/uniflash/common/targetdb/devices/CC3220_SWD.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/cc1352p1f3.xml b/lib/uniflash/common/targetdb/devices/cc1352p1f3.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/cc1352p1f3.xml rename to lib/uniflash/common/targetdb/devices/cc1352p1f3.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/cc1352r1f3.xml b/lib/uniflash/common/targetdb/devices/cc1352r1f3.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/cc1352r1f3.xml rename to lib/uniflash/common/targetdb/devices/cc1352r1f3.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/cc2538nf11.xml b/lib/uniflash/common/targetdb/devices/cc2538nf11.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/cc2538nf11.xml rename to lib/uniflash/common/targetdb/devices/cc2538nf11.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/cc2538nf23.xml b/lib/uniflash/common/targetdb/devices/cc2538nf23.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/cc2538nf23.xml rename to lib/uniflash/common/targetdb/devices/cc2538nf23.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/cc2538nf53.xml b/lib/uniflash/common/targetdb/devices/cc2538nf53.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/cc2538nf53.xml rename to lib/uniflash/common/targetdb/devices/cc2538nf53.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/cc2538sf23.xml b/lib/uniflash/common/targetdb/devices/cc2538sf23.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/cc2538sf23.xml rename to lib/uniflash/common/targetdb/devices/cc2538sf23.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/cc2538sf53.xml b/lib/uniflash/common/targetdb/devices/cc2538sf53.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/cc2538sf53.xml rename to lib/uniflash/common/targetdb/devices/cc2538sf53.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/cc2620f128.xml b/lib/uniflash/common/targetdb/devices/cc2620f128.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/cc2620f128.xml rename to lib/uniflash/common/targetdb/devices/cc2620f128.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/cc2630f128.xml b/lib/uniflash/common/targetdb/devices/cc2630f128.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/cc2630f128.xml rename to lib/uniflash/common/targetdb/devices/cc2630f128.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/cc2640f128.xml b/lib/uniflash/common/targetdb/devices/cc2640f128.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/cc2640f128.xml rename to lib/uniflash/common/targetdb/devices/cc2640f128.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/cc2640r2f.xml b/lib/uniflash/common/targetdb/devices/cc2640r2f.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/cc2640r2f.xml rename to lib/uniflash/common/targetdb/devices/cc2640r2f.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/cc2642r1f.xml b/lib/uniflash/common/targetdb/devices/cc2642r1f.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/cc2642r1f.xml rename to lib/uniflash/common/targetdb/devices/cc2642r1f.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/cc2650f128.xml b/lib/uniflash/common/targetdb/devices/cc2650f128.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/cc2650f128.xml rename to lib/uniflash/common/targetdb/devices/cc2650f128.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/cc2652r1f.xml b/lib/uniflash/common/targetdb/devices/cc2652r1f.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/cc2652r1f.xml rename to lib/uniflash/common/targetdb/devices/cc2652r1f.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/cc2652rb1f.xml b/lib/uniflash/common/targetdb/devices/cc2652rb1f.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/devices/cc2652rb1f.xml rename to lib/uniflash/common/targetdb/devices/cc2652rb1f.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/drivers/TI_reg_ids/CS_DAP_0_regids.xml b/lib/uniflash/common/targetdb/drivers/TI_reg_ids/CS_DAP_0_regids.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/drivers/TI_reg_ids/CS_DAP_0_regids.xml rename to lib/uniflash/common/targetdb/drivers/TI_reg_ids/CS_DAP_0_regids.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/drivers/TI_reg_ids/CS_DAP_PC_0_regids.xml b/lib/uniflash/common/targetdb/drivers/TI_reg_ids/CS_DAP_PC_0_regids.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/drivers/TI_reg_ids/CS_DAP_PC_0_regids.xml rename to lib/uniflash/common/targetdb/drivers/TI_reg_ids/CS_DAP_PC_0_regids.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/drivers/TI_reg_ids/ICEPick_C_regids.xml b/lib/uniflash/common/targetdb/drivers/TI_reg_ids/ICEPick_C_regids.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/drivers/TI_reg_ids/ICEPick_C_regids.xml rename to lib/uniflash/common/targetdb/drivers/TI_reg_ids/ICEPick_C_regids.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/drivers/TI_reg_ids/ICEPick_D_regids.xml b/lib/uniflash/common/targetdb/drivers/TI_reg_ids/ICEPick_D_regids.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/drivers/TI_reg_ids/ICEPick_D_regids.xml rename to lib/uniflash/common/targetdb/drivers/TI_reg_ids/ICEPick_D_regids.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/drivers/TI_reg_ids/ICEPick_M_regids.xml b/lib/uniflash/common/targetdb/drivers/TI_reg_ids/ICEPick_M_regids.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/drivers/TI_reg_ids/ICEPick_M_regids.xml rename to lib/uniflash/common/targetdb/drivers/TI_reg_ids/ICEPick_M_regids.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/drivers/TI_reg_ids/TMS470REX_regids.xml b/lib/uniflash/common/targetdb/drivers/TI_reg_ids/TMS470REX_regids.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/drivers/TI_reg_ids/TMS470REX_regids.xml rename to lib/uniflash/common/targetdb/drivers/TI_reg_ids/TMS470REX_regids.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/drivers/TI_reg_ids/TMS470RXX_regids.xml b/lib/uniflash/common/targetdb/drivers/TI_reg_ids/TMS470RXX_regids.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/drivers/TI_reg_ids/TMS470RXX_regids.xml rename to lib/uniflash/common/targetdb/drivers/TI_reg_ids/TMS470RXX_regids.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/drivers/TI_reg_ids/regids.xsd b/lib/uniflash/common/targetdb/drivers/TI_reg_ids/regids.xsd similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/drivers/TI_reg_ids/regids.xsd rename to lib/uniflash/common/targetdb/drivers/TI_reg_ids/regids.xsd diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/drivers/tixds510cortexM.xml b/lib/uniflash/common/targetdb/drivers/tixds510cortexM.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/drivers/tixds510cortexM.xml rename to lib/uniflash/common/targetdb/drivers/tixds510cortexM.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/drivers/tixds510cs_dap.xml b/lib/uniflash/common/targetdb/drivers/tixds510cs_dap.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/drivers/tixds510cs_dap.xml rename to lib/uniflash/common/targetdb/drivers/tixds510cs_dap.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/drivers/tixds510icepick_c.xml b/lib/uniflash/common/targetdb/drivers/tixds510icepick_c.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/drivers/tixds510icepick_c.xml rename to lib/uniflash/common/targetdb/drivers/tixds510icepick_c.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/routers/cs_dap.xml b/lib/uniflash/common/targetdb/routers/cs_dap.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/routers/cs_dap.xml rename to lib/uniflash/common/targetdb/routers/cs_dap.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/routers/icepick_c.xml b/lib/uniflash/common/targetdb/routers/icepick_c.xml similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/routers/icepick_c.xml rename to lib/uniflash/common/targetdb/routers/icepick_c.xml diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/setup_parser.xsd b/lib/uniflash/common/targetdb/setup_parser.xsd similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/setup_parser.xsd rename to lib/uniflash/common/targetdb/setup_parser.xsd diff --git a/source/nanoFirmwareFlasher/uniflash/common/targetdb/setup_parser_cache.xsd b/lib/uniflash/common/targetdb/setup_parser_cache.xsd similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/targetdb/setup_parser_cache.xsd rename to lib/uniflash/common/targetdb/setup_parser_cache.xsd diff --git a/source/nanoFirmwareFlasher/uniflash/common/uscif/jioxds110.dll b/lib/uniflash/common/uscif/jioxds110.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/uscif/jioxds110.dll rename to lib/uniflash/common/uscif/jioxds110.dll diff --git a/source/nanoFirmwareFlasher/uniflash/common/uscif/jscxds110.dll b/lib/uniflash/common/uscif/jscxds110.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/uscif/jscxds110.dll rename to lib/uniflash/common/uscif/jscxds110.dll diff --git a/source/nanoFirmwareFlasher/uniflash/common/uscif/jtagdata.dll b/lib/uniflash/common/uscif/jtagdata.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/uscif/jtagdata.dll rename to lib/uniflash/common/uscif/jtagdata.dll diff --git a/source/nanoFirmwareFlasher/uniflash/common/uscif/xds110/boot_loader.axf b/lib/uniflash/common/uscif/xds110/boot_loader.axf similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/uscif/xds110/boot_loader.axf rename to lib/uniflash/common/uscif/xds110/boot_loader.axf diff --git a/source/nanoFirmwareFlasher/uniflash/common/uscif/xds110/boot_loader.bin b/lib/uniflash/common/uscif/xds110/boot_loader.bin similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/uscif/xds110/boot_loader.bin rename to lib/uniflash/common/uscif/xds110/boot_loader.bin diff --git a/source/nanoFirmwareFlasher/uniflash/common/uscif/xds110/firmware.bin b/lib/uniflash/common/uscif/xds110/firmware.bin similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/uscif/xds110/firmware.bin rename to lib/uniflash/common/uscif/xds110/firmware.bin diff --git a/source/nanoFirmwareFlasher/uniflash/common/uscif/xdsalias.cfg b/lib/uniflash/common/uscif/xdsalias.cfg similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/uscif/xdsalias.cfg rename to lib/uniflash/common/uscif/xdsalias.cfg diff --git a/source/nanoFirmwareFlasher/uniflash/common/uscif/xdsboard.dll b/lib/uniflash/common/uscif/xdsboard.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/uscif/xdsboard.dll rename to lib/uniflash/common/uscif/xdsboard.dll diff --git a/source/nanoFirmwareFlasher/uniflash/common/uscif/xdserror.cfg b/lib/uniflash/common/uscif/xdserror.cfg similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/uscif/xdserror.cfg rename to lib/uniflash/common/uscif/xdserror.cfg diff --git a/source/nanoFirmwareFlasher/uniflash/common/uscif/xdserror.dll b/lib/uniflash/common/uscif/xdserror.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/uscif/xdserror.dll rename to lib/uniflash/common/uscif/xdserror.dll diff --git a/source/nanoFirmwareFlasher/uniflash/common/uscif/xdsfamily.cfg b/lib/uniflash/common/uscif/xdsfamily.cfg similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/uscif/xdsfamily.cfg rename to lib/uniflash/common/uscif/xdsfamily.cfg diff --git a/source/nanoFirmwareFlasher/uniflash/common/uscif/xdsfast3.dll b/lib/uniflash/common/uscif/xdsfast3.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/uscif/xdsfast3.dll rename to lib/uniflash/common/uscif/xdsfast3.dll diff --git a/source/nanoFirmwareFlasher/uniflash/common/uscif/xdsicicle.dll b/lib/uniflash/common/uscif/xdsicicle.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/uscif/xdsicicle.dll rename to lib/uniflash/common/uscif/xdsicicle.dll diff --git a/source/nanoFirmwareFlasher/uniflash/common/uscif/xdsinitial.cfg b/lib/uniflash/common/uscif/xdsinitial.cfg similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/uscif/xdsinitial.cfg rename to lib/uniflash/common/uscif/xdsinitial.cfg diff --git a/source/nanoFirmwareFlasher/uniflash/common/uscif/xdslocal.dll b/lib/uniflash/common/uscif/xdslocal.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/uscif/xdslocal.dll rename to lib/uniflash/common/uscif/xdslocal.dll diff --git a/source/nanoFirmwareFlasher/uniflash/common/uscif/xdsroute.dll b/lib/uniflash/common/uscif/xdsroute.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/uscif/xdsroute.dll rename to lib/uniflash/common/uscif/xdsroute.dll diff --git a/source/nanoFirmwareFlasher/uniflash/common/uscif/xdstrove.dll b/lib/uniflash/common/uscif/xdstrove.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/common/uscif/xdstrove.dll rename to lib/uniflash/common/uscif/xdstrove.dll diff --git a/source/nanoFirmwareFlasher/uniflash/dpinst_64_eng.exe b/lib/uniflash/dpinst_64_eng.exe similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/dpinst_64_eng.exe rename to lib/uniflash/dpinst_64_eng.exe diff --git a/source/nanoFirmwareFlasher/uniflash/emulation/drivers/cmapi.dll b/lib/uniflash/emulation/drivers/cmapi.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/emulation/drivers/cmapi.dll rename to lib/uniflash/emulation/drivers/cmapi.dll diff --git a/source/nanoFirmwareFlasher/uniflash/emulation/drivers/cmapi.out b/lib/uniflash/emulation/drivers/cmapi.out similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/emulation/drivers/cmapi.out rename to lib/uniflash/emulation/drivers/cmapi.out diff --git a/source/nanoFirmwareFlasher/uniflash/emulation/drivers/dap.dll b/lib/uniflash/emulation/drivers/dap.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/emulation/drivers/dap.dll rename to lib/uniflash/emulation/drivers/dap.dll diff --git a/source/nanoFirmwareFlasher/uniflash/emulation/drivers/eti_dap.dll b/lib/uniflash/emulation/drivers/eti_dap.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/emulation/drivers/eti_dap.dll rename to lib/uniflash/emulation/drivers/eti_dap.dll diff --git a/source/nanoFirmwareFlasher/uniflash/emulation/drivers/prsc.dll b/lib/uniflash/emulation/drivers/prsc.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/emulation/drivers/prsc.dll rename to lib/uniflash/emulation/drivers/prsc.dll diff --git a/source/nanoFirmwareFlasher/uniflash/emulation/drivers/tixds510cortexM.dvr b/lib/uniflash/emulation/drivers/tixds510cortexM.dvr similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/emulation/drivers/tixds510cortexM.dvr rename to lib/uniflash/emulation/drivers/tixds510cortexM.dvr diff --git a/source/nanoFirmwareFlasher/uniflash/emulation/drivers/tixds510cs_dap.dvr b/lib/uniflash/emulation/drivers/tixds510cs_dap.dvr similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/emulation/drivers/tixds510cs_dap.dvr rename to lib/uniflash/emulation/drivers/tixds510cs_dap.dvr diff --git a/source/nanoFirmwareFlasher/uniflash/emulation/drivers/tixds510icepick_c.dvr b/lib/uniflash/emulation/drivers/tixds510icepick_c.dvr similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/emulation/drivers/tixds510icepick_c.dvr rename to lib/uniflash/emulation/drivers/tixds510icepick_c.dvr diff --git a/source/nanoFirmwareFlasher/uniflash/emulation/gel/cc26x2.gel b/lib/uniflash/emulation/gel/cc26x2.gel similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/emulation/gel/cc26x2.gel rename to lib/uniflash/emulation/gel/cc26x2.gel diff --git a/source/nanoFirmwareFlasher/uniflash/emulation/gel/cc26x2_xds.gel b/lib/uniflash/emulation/gel/cc26x2_xds.gel similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/emulation/gel/cc26x2_xds.gel rename to lib/uniflash/emulation/gel/cc26x2_xds.gel diff --git a/source/nanoFirmwareFlasher/uniflash/emulation/gel/cc26xx_connect_util.gel b/lib/uniflash/emulation/gel/cc26xx_connect_util.gel similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/emulation/gel/cc26xx_connect_util.gel rename to lib/uniflash/emulation/gel/cc26xx_connect_util.gel diff --git a/source/nanoFirmwareFlasher/uniflash/emulation/gel/cc26xx_icepick.gel b/lib/uniflash/emulation/gel/cc26xx_icepick.gel similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/emulation/gel/cc26xx_icepick.gel rename to lib/uniflash/emulation/gel/cc26xx_icepick.gel diff --git a/source/nanoFirmwareFlasher/uniflash/emulation/gel/cc26xx_jlink.gel b/lib/uniflash/emulation/gel/cc26xx_jlink.gel similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/emulation/gel/cc26xx_jlink.gel rename to lib/uniflash/emulation/gel/cc26xx_jlink.gel diff --git a/source/nanoFirmwareFlasher/uniflash/emulation/gel/images/cc26xx/cc26x2r1f_rtos_rom_syms.out b/lib/uniflash/emulation/gel/images/cc26xx/cc26x2r1f_rtos_rom_syms.out similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/emulation/gel/images/cc26xx/cc26x2r1f_rtos_rom_syms.out rename to lib/uniflash/emulation/gel/images/cc26xx/cc26x2r1f_rtos_rom_syms.out diff --git a/source/nanoFirmwareFlasher/uniflash/emulation/gel/images/cc26xx/cc26x2r1f_rtos_rom_syms_rev1.out b/lib/uniflash/emulation/gel/images/cc26xx/cc26x2r1f_rtos_rom_syms_rev1.out similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/emulation/gel/images/cc26xx/cc26x2r1f_rtos_rom_syms_rev1.out rename to lib/uniflash/emulation/gel/images/cc26xx/cc26x2r1f_rtos_rom_syms_rev1.out diff --git a/source/nanoFirmwareFlasher/uniflash/emulation/tpi/disassemble_capstone.dll b/lib/uniflash/emulation/tpi/disassemble_capstone.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/emulation/tpi/disassemble_capstone.dll rename to lib/uniflash/emulation/tpi/disassemble_capstone.dll diff --git a/source/nanoFirmwareFlasher/uniflash/emulation/tpi/tpi.ini b/lib/uniflash/emulation/tpi/tpi.ini similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/emulation/tpi/tpi.ini rename to lib/uniflash/emulation/tpi/tpi.ini diff --git a/source/nanoFirmwareFlasher/uniflash/emulation/tpi/tpi_cs_dap.dll b/lib/uniflash/emulation/tpi/tpi_cs_dap.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/emulation/tpi/tpi_cs_dap.dll rename to lib/uniflash/emulation/tpi/tpi_cs_dap.dll diff --git a/source/nanoFirmwareFlasher/uniflash/emulation/tpi/tpi_dap_pc.dll b/lib/uniflash/emulation/tpi/tpi_dap_pc.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/emulation/tpi/tpi_dap_pc.dll rename to lib/uniflash/emulation/tpi/tpi_dap_pc.dll diff --git a/source/nanoFirmwareFlasher/uniflash/emulation/tpi/tpi_icepick.dll b/lib/uniflash/emulation/tpi/tpi_icepick.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/emulation/tpi/tpi_icepick.dll rename to lib/uniflash/emulation/tpi/tpi_icepick.dll diff --git a/source/nanoFirmwareFlasher/uniflash/emulation/tpi/tpiarm_x.dll b/lib/uniflash/emulation/tpi/tpiarm_x.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/emulation/tpi/tpiarm_x.dll rename to lib/uniflash/emulation/tpi/tpiarm_x.dll diff --git a/source/nanoFirmwareFlasher/uniflash/emulation/windows/xds110_drivers/x64/WdfCoInstaller01009.dll b/lib/uniflash/emulation/windows/xds110_drivers/x64/WdfCoInstaller01009.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/emulation/windows/xds110_drivers/x64/WdfCoInstaller01009.dll rename to lib/uniflash/emulation/windows/xds110_drivers/x64/WdfCoInstaller01009.dll diff --git a/source/nanoFirmwareFlasher/uniflash/emulation/windows/xds110_drivers/x64/winusbcoinstaller2.dll b/lib/uniflash/emulation/windows/xds110_drivers/x64/winusbcoinstaller2.dll similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/emulation/windows/xds110_drivers/x64/winusbcoinstaller2.dll rename to lib/uniflash/emulation/windows/xds110_drivers/x64/winusbcoinstaller2.dll diff --git a/source/nanoFirmwareFlasher/uniflash/emulation/windows/xds110_drivers/xds110_debug.cat b/lib/uniflash/emulation/windows/xds110_drivers/xds110_debug.cat similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/emulation/windows/xds110_drivers/xds110_debug.cat rename to lib/uniflash/emulation/windows/xds110_drivers/xds110_debug.cat diff --git a/source/nanoFirmwareFlasher/uniflash/emulation/windows/xds110_drivers/xds110_debug.inf b/lib/uniflash/emulation/windows/xds110_drivers/xds110_debug.inf similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/emulation/windows/xds110_drivers/xds110_debug.inf rename to lib/uniflash/emulation/windows/xds110_drivers/xds110_debug.inf diff --git a/source/nanoFirmwareFlasher/uniflash/emulation/windows/xds110_drivers/xds110_ports.cat b/lib/uniflash/emulation/windows/xds110_drivers/xds110_ports.cat similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/emulation/windows/xds110_drivers/xds110_ports.cat rename to lib/uniflash/emulation/windows/xds110_drivers/xds110_ports.cat diff --git a/source/nanoFirmwareFlasher/uniflash/emulation/windows/xds110_drivers/xds110_ports.inf b/lib/uniflash/emulation/windows/xds110_drivers/xds110_ports.inf similarity index 100% rename from source/nanoFirmwareFlasher/uniflash/emulation/windows/xds110_drivers/xds110_ports.inf rename to lib/uniflash/emulation/windows/xds110_drivers/xds110_ports.inf diff --git a/source/nanoFirmwareFlasher.sln b/source/nanoFirmwareFlasher.sln index 6a63df07..22e7715b 100644 --- a/source/nanoFirmwareFlasher.sln +++ b/source/nanoFirmwareFlasher.sln @@ -1,20 +1,24 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.705 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29806.167 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nanoFirmwareFlasher", "nanoFirmwareFlasher\nanoFirmwareFlasher.csproj", "{762BA2A1-B3E9-4E26-9491-AE11D1F1C1EA}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {762BA2A1-B3E9-4E26-9491-AE11D1F1C1EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {762BA2A1-B3E9-4E26-9491-AE11D1F1C1EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {762BA2A1-B3E9-4E26-9491-AE11D1F1C1EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {762BA2A1-B3E9-4E26-9491-AE11D1F1C1EA}.Release|Any CPU.Build.0 = Release|Any CPU + {762BA2A1-B3E9-4E26-9491-AE11D1F1C1EA}.Debug|x64.ActiveCfg = Debug|x64 + {762BA2A1-B3E9-4E26-9491-AE11D1F1C1EA}.Debug|x64.Build.0 = Debug|x64 + {762BA2A1-B3E9-4E26-9491-AE11D1F1C1EA}.Debug|x86.ActiveCfg = Debug|x64 + {762BA2A1-B3E9-4E26-9491-AE11D1F1C1EA}.Release|x64.ActiveCfg = Release|x64 + {762BA2A1-B3E9-4E26-9491-AE11D1F1C1EA}.Release|x64.Build.0 = Release|x64 + {762BA2A1-B3E9-4E26-9491-AE11D1F1C1EA}.Release|x86.ActiveCfg = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/source/nanoFirmwareFlasher/FirmwarePackage.cs b/source/nanoFirmwareFlasher/FirmwarePackage.cs index fc70179b..b2c28147 100644 --- a/source/nanoFirmwareFlasher/FirmwarePackage.cs +++ b/source/nanoFirmwareFlasher/FirmwarePackage.cs @@ -5,10 +5,8 @@ using Newtonsoft.Json; using System; -using System.Collections.Generic; using System.IO; using System.IO.Compression; -using System.Linq; using System.Net; using System.Net.Http; diff --git a/source/nanoFirmwareFlasher/Program.cs b/source/nanoFirmwareFlasher/Program.cs index 54a7d8f9..1e73ae91 100644 --- a/source/nanoFirmwareFlasher/Program.cs +++ b/source/nanoFirmwareFlasher/Program.cs @@ -466,10 +466,6 @@ static async Task RunOptionsAndReturnExitCodeAsync(Options o) if (!string.IsNullOrEmpty(o.DfuFile)) { // there is a DFU file argument, so follow DFU path -#if NETCOREAPP2_1 - throw new Exception("DFU flashing is not currently possible with dotnet core 2.1, please consider installing the 3.1 runtime"); -#else - var dfuDevice = new StmDfuDevice(o.DfuDeviceId); if (!dfuDevice.DevicePresent) @@ -513,7 +509,6 @@ static async Task RunOptionsAndReturnExitCodeAsync(Options o) _exitCode = ExitCodes.E1001; _extraMessage = ex.Message; } -#endif } else if ( o.BinFile.Any() && diff --git a/source/nanoFirmwareFlasher/StDfu.cs b/source/nanoFirmwareFlasher/StDfu.cs index 2a528a08..daf7536e 100644 --- a/source/nanoFirmwareFlasher/StDfu.cs +++ b/source/nanoFirmwareFlasher/StDfu.cs @@ -9,7 +9,6 @@ using System.Runtime.InteropServices; using System.Runtime.Serialization; using System.Text; -using System.Threading.Tasks; namespace nanoFramework.Tools.FirmwareFlasher { @@ -45,7 +44,7 @@ unsafe struct DfuHeader unsafe struct DfuImageTarget { // "Target" - public fixed byte Signature[6]; + public fixed byte Signature[6]; public byte AlternateSetting; // flag that the target has a name public uint IsNamed; @@ -70,7 +69,7 @@ unsafe struct DfuImageElement //this is always at the end of the file, so you can seek there and work backwards [StructLayout(LayoutKind.Sequential, Pack = 1)] unsafe struct DfuTail - { + { public ushort Version; public ushort Pid; public ushort Vid; @@ -86,7 +85,6 @@ unsafe struct DfuTail #endregion - #region DFU descriptors public class DfuFile @@ -170,20 +168,20 @@ public class DfuElement private const char SEPARATOR_NBSECTORS_SECTORSIZE = '*'; // DFU States - public const uint STATE_IDLE = 0x00; - public const uint STATE_DETACH = 0x01; - public const uint STATE_DFU_IDLE = 0x02; - public const uint STATE_DFU_DOWNLOAD_SYNC = 0x03; - public const uint STATE_DFU_DOWNLOAD_BUSY = 0x04; - public const uint STATE_DFU_DOWNLOAD_IDLE = 0x05; - public const uint STATE_DFU_MANIFEST_SYNC = 0x06; - public const uint STATE_DFU_MANIFEST = 0x07; + public const uint STATE_IDLE = 0x00; + public const uint STATE_DETACH = 0x01; + public const uint STATE_DFU_IDLE = 0x02; + public const uint STATE_DFU_DOWNLOAD_SYNC = 0x03; + public const uint STATE_DFU_DOWNLOAD_BUSY = 0x04; + public const uint STATE_DFU_DOWNLOAD_IDLE = 0x05; + public const uint STATE_DFU_MANIFEST_SYNC = 0x06; + public const uint STATE_DFU_MANIFEST = 0x07; public const uint STATE_DFU_MANIFEST_WAIT_RESET = 0x08; - public const uint STATE_DFU_UPLOAD_IDLE = 0x09; - public const uint STATE_DFU_ERROR = 0x0A; + public const uint STATE_DFU_UPLOAD_IDLE = 0x09; + public const uint STATE_DFU_ERROR = 0x0A; - public const uint STATE_DFU_UPLOAD_SYNC = 0x91; - public const uint STATE_DFU_UPLOAD_BUSY = 0x92; + public const uint STATE_DFU_UPLOAD_SYNC = 0x91; + public const uint STATE_DFU_UPLOAD_BUSY = 0x92; [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)] @@ -291,68 +289,68 @@ public MappingSector(string name, SectorType sectorType, uint startAddress, uint //18 11 000012F0 STDFU_Upload - [DllImport(@".\stdfu\STDFU.dll", EntryPoint = "STDFU_GetInterfaceDescriptor", CharSet = CharSet.Ansi)] + [DllImport(@"stdfu\STDFU.dll", EntryPoint = "STDFU_GetInterfaceDescriptor", CharSet = CharSet.Ansi)] internal static extern uint STDFU_GetInterfaceDescriptor( - ref IntPtr handle, - uint nConfigIdx, - uint nInterfaceIdx, - uint nAltSetIdx, + ref IntPtr handle, + uint nConfigIdx, + uint nInterfaceIdx, + uint nAltSetIdx, ref UsbInterfaceDescriptor pDesc); - [DllImport(@".\stdfu\STDFU.dll", EntryPoint = "STDFU_SelectCurrentConfiguration", CharSet = CharSet.Ansi)] + [DllImport(@"stdfu\STDFU.dll", EntryPoint = "STDFU_SelectCurrentConfiguration", CharSet = CharSet.Ansi)] private static extern uint STDFU_SelectCurrentConfiguration( - ref IntPtr hDevice, - uint ConfigIndex, - uint InterfaceIndex, + ref IntPtr hDevice, + uint ConfigIndex, + uint InterfaceIndex, uint AlternateSetIndex); - [DllImport(@".\stdfu\STDFU.dll", EntryPoint = "STDFU_GetDFUDescriptor", CharSet = CharSet.Ansi)] + [DllImport(@"stdfu\STDFU.dll", EntryPoint = "STDFU_GetDFUDescriptor", CharSet = CharSet.Ansi)] internal static extern uint STDFU_GetDFUDescriptor( - ref IntPtr handle, - ref uint DFUInterfaceNum, - ref uint NBOfAlternates, + ref IntPtr handle, + ref uint DFUInterfaceNum, + ref uint NBOfAlternates, ref DfuFunctionalDescriptor dfuDescriptor); - [DllImport(@".\stdfu\STDFU.dll", EntryPoint = "STDFU_GetDeviceDescriptor", CharSet = CharSet.Ansi)] + [DllImport(@"stdfu\STDFU.dll", EntryPoint = "STDFU_GetDeviceDescriptor", CharSet = CharSet.Ansi)] internal static extern uint STDFU_GetDeviceDescriptor( - ref IntPtr handle, + ref IntPtr handle, ref UsbDeviceDescriptor descriptor); - [DllImport(@".\stdfu\STDFU.dll", EntryPoint = "STDFU_GetStringDescriptor", CharSet = CharSet.Ansi)] + [DllImport(@"stdfu\STDFU.dll", EntryPoint = "STDFU_GetStringDescriptor", CharSet = CharSet.Ansi)] internal static extern uint STDFU_GetStringDescriptor( - ref IntPtr handle, - uint index, - IntPtr stringBuffer, + ref IntPtr handle, + uint index, + IntPtr stringBuffer, uint stringLength); - [DllImport(@".\stdfu\STDFU.dll", EntryPoint = "STDFU_Dnload", CharSet = CharSet.Ansi)] + [DllImport(@"stdfu\STDFU.dll", EntryPoint = "STDFU_Dnload", CharSet = CharSet.Ansi)] internal static extern uint STDFU_Dnload( - ref IntPtr hDevice, + ref IntPtr hDevice, [MarshalAs(UnmanagedType.LPArray)]byte[] pBuffer, uint nBytes, ushort nBlocks); - [DllImport(@".\stdfu\STDFU.dll", EntryPoint = "STDFU_Getstatus", CharSet = CharSet.Ansi)] + [DllImport(@"stdfu\STDFU.dll", EntryPoint = "STDFU_Getstatus", CharSet = CharSet.Ansi)] internal static extern uint STDFU_GetStatus( - ref IntPtr hDevice, + ref IntPtr hDevice, ref DfuStatus dfuStatus); - [DllImport(@".\stdfu\STDFU.dll", EntryPoint = "STDFU_Clrstatus", CharSet = CharSet.Ansi)] + [DllImport(@"stdfu\STDFU.dll", EntryPoint = "STDFU_Clrstatus", CharSet = CharSet.Ansi)] internal static extern uint STDFU_ClrStatus(ref IntPtr hDevice); - [DllImport(@".\stdfu\STDFU.dll", EntryPoint = "STDFU_Open", CharSet = CharSet.Ansi)] + [DllImport(@"stdfu\STDFU.dll", EntryPoint = "STDFU_Open", CharSet = CharSet.Ansi)] internal static extern uint STDFU_Open( - [MarshalAs(UnmanagedType.LPStr)]string szDevicePath, + [MarshalAs(UnmanagedType.LPStr)]string szDevicePath, out IntPtr hDevice); #endregion internal static List CreateMappingFromDevice( - IntPtr hDevice, - uint alternates, + IntPtr hDevice, + uint alternates, DfuFunctionalDescriptor dfuDescriptor) { List sectorMap = new List((int)alternates); @@ -469,9 +467,9 @@ internal static List CreateMappingFromDevice( } public bool ParseDfuFile( - string filepath, - out ushort vid, - out ushort pid, + string filepath, + out ushort vid, + out ushort pid, out ushort version, bool outputMessages = false) { @@ -528,7 +526,7 @@ public bool ParseDfuFile( } internal static unsafe DfuFile LoadDfuFile( - string filePath, + string filePath, VerbosityLevel verbosity) { byte[] fileData; @@ -654,7 +652,7 @@ internal static unsafe DfuFile LoadDfuFile( DfuImageTarget dfuImageTarget = new DfuImageTarget(); StructFromBytes(ref dfuImageTarget, fileData, targetCursor); - + // check signature if (dfuImageTarget.Signature[0] == (byte)'T' && dfuImageTarget.Signature[1] == (byte)'a' && @@ -808,7 +806,7 @@ private static uint CalculateCRC(byte[] data) internal static void PartialErase( IntPtr hDevice, uint startAddress, - uint size, + uint size, List mapSector, bool outputMessages = false) { @@ -910,7 +908,7 @@ internal static void MassErase( internal static void WriteBlock( IntPtr hDevice, - uint address, + uint address, byte[] data, uint blockNumber) { @@ -1005,7 +1003,6 @@ internal static void Detach(IntPtr hDevice, uint address) } } - #region Exceptions [Serializable] diff --git a/source/nanoFirmwareFlasher/StmDfuDevice.cs b/source/nanoFirmwareFlasher/StmDfuDevice.cs index 8b6c3e76..1fc377a5 100644 --- a/source/nanoFirmwareFlasher/StmDfuDevice.cs +++ b/source/nanoFirmwareFlasher/StmDfuDevice.cs @@ -108,9 +108,6 @@ public StmDfuDevice(string deviceId = null) string devicePath = @"\\?\" + deviceId.Replace(@"\", "#") + @"#{" + s_dfuGuid.ToString() + "}"; // open device -#if NETCOREAPP2_1 - throw new Exception("DFU flashing is not currently possible with dotnet core 2.1, please consider installing the 3.1 runtime"); -#else returnValue = StDfu.STDFU_Open(devicePath, out _hDevice); //this causes an error using x64 on .netCore 2.1 due to trying to access the Registry if (returnValue != StDfu.STDFU_NOERROR) { @@ -176,7 +173,6 @@ public StmDfuDevice(string deviceId = null) // create sector mapping for device _sectorMap = StDfu.CreateMappingFromDevice(_hDevice, alternates, dfuDescriptor); -#endif } /// diff --git a/source/nanoFirmwareFlasher/nanoFirmwareFlasher.csproj b/source/nanoFirmwareFlasher/nanoFirmwareFlasher.csproj index a200a8f5..5c4a3392 100644 --- a/source/nanoFirmwareFlasher/nanoFirmwareFlasher.csproj +++ b/source/nanoFirmwareFlasher/nanoFirmwareFlasher.csproj @@ -1,9 +1,10 @@ - + + Exe nanoff - ./nupkg + ../../artifacts nanoFramework.Tools.FirmwareFlasher nanoff nanoFramework.Tools.FirmwareFlasher @@ -18,1143 +19,65 @@ nanoFirmwareFlasher latest + netcoreapp3.1;net472 + x64;x86 + win-x64;win-x86 + true - netcoreapp2.1;netcoreapp3.1;net462 + netcoreapp3.1;net472 true - netcoreapp2.1;netcoreapp3.1 + netcoreapp3.1 nanoFirmwareFlasher + x64 - - true - - - - true - - $(NoWarn);NU5100;NU5105 - - - - x86 - - - - - x86 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - - - - Always - + + + + + + + + - - Always - - - Always - - - Always - + + true + content\stdfu;contentFiles\stdfu + - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - + + true + content\esptool;contentFiles\esptool + - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - - - Always - + + true + content\stlink;contentFiles\stlink + - - - - - - - - - + + true + content\uniflash;contentFiles\uniflash + diff --git a/source/version.json b/source/version.json index a4345ef1..43323f9b 100644 --- a/source/version.json +++ b/source/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "1.5.0", + "version": "1.10.0", "assemblyVersion": { "precision": "revision" },