From 340ce45b55ff28948c2d71a10b52491f42ed1c72 Mon Sep 17 00:00:00 2001
From: sfaguet <sebastienfaguet@gmail.com>
Date: Mon, 18 Jan 2021 13:09:00 -0500
Subject: [PATCH] Adaptation pour STM32MXCUBE 6.1.1 et uVision5.33
---
.gitignore | 3 ++-
MDK-ARM/RobotMaster_allRobots.uvoptx | 4 ++--
MDK-ARM/RobotMaster_allRobots.uvprojx | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/.gitignore b/.gitignore
index 39bf237..4b9e406 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,6 +39,7 @@ ehthumbs.db
Thumbs.db
Drivers/
+MDK-ARM/bin/*
# Keil #
########
@@ -65,4 +66,4 @@ Drivers/
.#*
*.uvgui.*
*.uvguix.*
-*.uvopt
\ No newline at end of file
+*.uvopt
diff --git a/MDK-ARM/RobotMaster_allRobots.uvoptx b/MDK-ARM/RobotMaster_allRobots.uvoptx
index 57ff2d7..c19c8c9 100644
--- a/MDK-ARM/RobotMaster_allRobots.uvoptx
+++ b/MDK-ARM/RobotMaster_allRobots.uvoptx
@@ -79,8 +79,8 @@
</OPTFL>
<CpuCode>18</CpuCode>
<DebugOpt>
- <uSim>0</uSim>
- <uTrg>1</uTrg>
+ <uSim>1</uSim>
+ <uTrg>0</uTrg>
<sLdApp>1</sLdApp>
<sGomain>1</sGomain>
<sRbreak>1</sRbreak>
diff --git a/MDK-ARM/RobotMaster_allRobots.uvprojx b/MDK-ARM/RobotMaster_allRobots.uvprojx
index 2b605ea..6b27d69 100644
--- a/MDK-ARM/RobotMaster_allRobots.uvprojx
+++ b/MDK-ARM/RobotMaster_allRobots.uvprojx
@@ -50,8 +50,8 @@
</TargetStatus>
<OutputDirectory>.\bin\</OutputDirectory>
<OutputName>RobotMaster_allRobots</OutputName>
- <CreateExecutable>0</CreateExecutable>
- <CreateLib>1</CreateLib>
+ <CreateExecutable>1</CreateExecutable>
+ <CreateLib>0</CreateLib>
<CreateHexFile>1</CreateHexFile>
<DebugInformation>1</DebugInformation>
<BrowseInformation>1</BrowseInformation>
--
GitLab