Browse Source

Version 1.4 du soft robot. Rajout de la commande PowerOff

Sébastien DI MERCURIO 3 years ago
parent
commit
5beb9ad12d

+ 92
- 64
software/robot/.cproject View File

@@ -12,7 +12,7 @@
12 12
 				</extensions>
13 13
 			</storageModule>
14 14
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
15
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="com.atollic.truestudio.exe.debug.584431509" name="Debug" parent="com.atollic.truestudio.exe.debug">
15
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="Programme de debug avec symbol et compteur d'inactivité desactivé" id="com.atollic.truestudio.exe.debug.584431509" name="Debug" parent="com.atollic.truestudio.exe.debug">
16 16
 					<folderInfo id="com.atollic.truestudio.exe.debug.584431509." name="/" resourcePath="">
17 17
 						<toolChain id="com.atollic.truestudio.exe.debug.toolchain.1572207901" name="Atollic ARM Tools" superClass="com.atollic.truestudio.exe.debug.toolchain">
18 18
 							<option id="com.atollic.truestudio.general.runtimelib.2022035895" name="Runtime Library" superClass="com.atollic.truestudio.general.runtimelib" useByScannerDiscovery="false" value="com.atollic.truestudio.ld.general.cclib.CCSmallCSmall" valueType="enumerated"/>
@@ -139,8 +139,8 @@
139 139
 			</storageModule>
140 140
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
141 141
 		</cconfiguration>
142
-		<cconfiguration id="com.atollic.truestudio.configuration.release.1711240076">
143
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.atollic.truestudio.configuration.release.1711240076" moduleId="org.eclipse.cdt.core.settings" name="Release">
142
+		<cconfiguration id="com.atollic.truestudio.exe.debug.584431509.2045581985">
143
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.atollic.truestudio.exe.debug.584431509.2045581985" moduleId="org.eclipse.cdt.core.settings" name="Release">
144 144
 				<externalSettings/>
145 145
 				<extensions>
146 146
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
@@ -150,103 +150,131 @@
150 150
 				</extensions>
151 151
 			</storageModule>
152 152
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
153
-				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="com.atollic.truestudio.configuration.release.1711240076" name="Release" parent="com.atollic.truestudio.configuration.release">
154
-					<folderInfo id="com.atollic.truestudio.configuration.release.1711240076." name="/" resourcePath="">
155
-						<toolChain id="com.atollic.truestudio.exe.release.toolchain.1405567933" name="Atollic ARM Tools" superClass="com.atollic.truestudio.exe.release.toolchain">
156
-							<option id="com.atollic.truestudio.general.runtimelib.745872935" name="Runtime Library" superClass="com.atollic.truestudio.general.runtimelib" value="com.atollic.truestudio.ld.general.clib.small" valueType="enumerated"/>
157
-							<option id="com.atollic.truestudio.toolchain_options.mcu.1702656728" name="Microcontroller" superClass="com.atollic.truestudio.toolchain_options.mcu" value="STM32F103C6" valueType="string"/>
158
-							<option id="com.atollic.truestudio.toolchain_options.vendor.557653686" name="Vendor name" superClass="com.atollic.truestudio.toolchain_options.vendor" value="STMicroelectronics" valueType="string"/>
159
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.atollic.truestudio.exe.release.toolchain.platform.209638276" isAbstract="false" name="release platform" superClass="com.atollic.truestudio.exe.release.toolchain.platform"/>
160
-							<builder buildPath="${workspace_loc:/Dumber-Robot-Firmware}/Release" id="com.atollic.truestudio.mbs.builder1.1059870046" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" superClass="com.atollic.truestudio.mbs.builder1"/>
161
-							<tool id="com.atollic.truestudio.exe.release.toolchain.as.1594028390" name="Assembler" superClass="com.atollic.truestudio.exe.release.toolchain.as">
162
-								<option id="com.atollic.truestudio.common_options.target.endianess.1550970254" name="Endianess" superClass="com.atollic.truestudio.common_options.target.endianess"/>
163
-								<option id="com.atollic.truestudio.common_options.target.mcpu.539967276" name="Microcontroller" superClass="com.atollic.truestudio.common_options.target.mcpu" value="STM32F103C6" valueType="enumerated"/>
164
-								<option id="com.atollic.truestudio.common_options.target.instr_set.379638892" name="Instruction set" superClass="com.atollic.truestudio.common_options.target.instr_set" value="com.atollic.truestudio.common_options.target.instr_set.thumb2" valueType="enumerated"/>
165
-								<option id="com.atollic.truestudio.common_options.target.fpucore.1963414035" name="FPU" superClass="com.atollic.truestudio.common_options.target.fpucore" value="com.atollic.truestudio.common_options.target.fpucore.None" valueType="enumerated"/>
166
-								<option id="com.atollic.truestudio.common_options.target.fpu.507994149" name="Floating point" superClass="com.atollic.truestudio.common_options.target.fpu"/>
167
-								<option id="com.atollic.truestudio.as.symbols.defined.16226109" name="Defined symbols" superClass="com.atollic.truestudio.as.symbols.defined" valueType="definedSymbols">
153
+				<configuration artifactExtension="elf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="Programme optimisé, sans symboles de debug et avec le compteur d'inactivité" id="com.atollic.truestudio.exe.debug.584431509.2045581985" name="Release" parent="com.atollic.truestudio.exe.debug">
154
+					<folderInfo id="com.atollic.truestudio.exe.debug.584431509.2045581985." name="/" resourcePath="">
155
+						<toolChain id="com.atollic.truestudio.exe.debug.toolchain.1365910328" name="Atollic ARM Tools" superClass="com.atollic.truestudio.exe.debug.toolchain">
156
+							<option id="com.atollic.truestudio.general.runtimelib.1609891271" name="Runtime Library" superClass="com.atollic.truestudio.general.runtimelib" useByScannerDiscovery="false" value="com.atollic.truestudio.ld.general.cclib.CCSmallCSmall" valueType="enumerated"/>
157
+							<option id="com.atollic.truestudio.toolchain_options.mcu.234071029" name="Microcontroller" superClass="com.atollic.truestudio.toolchain_options.mcu" useByScannerDiscovery="false" value="STM32F103C6" valueType="string"/>
158
+							<option id="com.atollic.truestudio.toolchain_options.vendor.1677670172" name="Vendor name" superClass="com.atollic.truestudio.toolchain_options.vendor" useByScannerDiscovery="false" value="STMicroelectronics" valueType="string"/>
159
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.atollic.truestudio.exe.debug.toolchain.platform.228741120" isAbstract="false" name="Debug platform" osList="all" superClass="com.atollic.truestudio.exe.debug.toolchain.platform"/>
160
+							<builder buildPath="${workspace_loc:/Dumber-Robot-Firmware}/Debug" customBuilderProperties="toolChainpathType=1|toolChainpathString=/opt/Atollic_TrueSTUDIO_for_STM32_x86_64_9.0.0/ARMTools/bin|" id="com.atollic.truestudio.mbs.builder1.946431501" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" superClass="com.atollic.truestudio.mbs.builder1"/>
161
+							<tool id="com.atollic.truestudio.exe.debug.toolchain.as.1282106265" name="Assembler" superClass="com.atollic.truestudio.exe.debug.toolchain.as">
162
+								<option id="com.atollic.truestudio.common_options.target.endianess.337390915" name="Endianess" superClass="com.atollic.truestudio.common_options.target.endianess" useByScannerDiscovery="false"/>
163
+								<option id="com.atollic.truestudio.common_options.target.mcpu.1626495693" name="Microcontroller" superClass="com.atollic.truestudio.common_options.target.mcpu" useByScannerDiscovery="false" value="STM32F103C6" valueType="enumerated"/>
164
+								<option id="com.atollic.truestudio.common_options.target.instr_set.155423512" name="Instruction set" superClass="com.atollic.truestudio.common_options.target.instr_set" useByScannerDiscovery="false" value="com.atollic.truestudio.common_options.target.instr_set.thumb2" valueType="enumerated"/>
165
+								<option id="com.atollic.truestudio.common_options.target.fpucore.1963239944" name="FPU" superClass="com.atollic.truestudio.common_options.target.fpucore" useByScannerDiscovery="false" value="com.atollic.truestudio.common_options.target.fpucore.None" valueType="enumerated"/>
166
+								<option id="com.atollic.truestudio.common_options.target.fpu.457240445" name="Floating point" superClass="com.atollic.truestudio.common_options.target.fpu" useByScannerDiscovery="false"/>
167
+								<option id="com.atollic.truestudio.as.symbols.defined.1918321435" name="Defined symbols" superClass="com.atollic.truestudio.as.symbols.defined" useByScannerDiscovery="false" valueType="definedSymbols">
168 168
 									<listOptionValue builtIn="false" value="STM32F10X_LD"/>
169 169
 									<listOptionValue builtIn="false" value="USE_STDPERIPH_DRIVER"/>
170 170
 								</option>
171
-								<option id="com.atollic.truestudio.as.general.incpath.2055969997" name="Include path" superClass="com.atollic.truestudio.as.general.incpath" valueType="includePath">
171
+								<option id="com.atollic.truestudio.as.general.incpath.2122465989" name="Include path" superClass="com.atollic.truestudio.as.general.incpath" useByScannerDiscovery="false" valueType="includePath">
172 172
 									<listOptionValue builtIn="false" value="../src"/>
173 173
 									<listOptionValue builtIn="false" value="../Libraries/STM32F10x_StdPeriph_Driver/inc"/>
174 174
 									<listOptionValue builtIn="false" value="../Libraries/CMSIS/Device/ST/STM32F10x/Include"/>
175 175
 									<listOptionValue builtIn="false" value="../Libraries/CMSIS/Include"/>
176 176
 								</option>
177
-								<inputType id="com.atollic.truestudio.as.input.128409797" name="Input" superClass="com.atollic.truestudio.as.input"/>
177
+								<inputType id="com.atollic.truestudio.as.input.1815967562" name="Input" superClass="com.atollic.truestudio.as.input"/>
178 178
 							</tool>
179
-							<tool id="com.atollic.truestudio.exe.release.toolchain.gcc.34521579" name="C Compiler" superClass="com.atollic.truestudio.exe.release.toolchain.gcc">
180
-								<option id="com.atollic.truestudio.gcc.symbols.defined.896134054" name="Defined symbols" superClass="com.atollic.truestudio.gcc.symbols.defined" valueType="definedSymbols">
179
+							<tool id="com.atollic.truestudio.exe.debug.toolchain.gcc.176685112" name="C Compiler" superClass="com.atollic.truestudio.exe.debug.toolchain.gcc">
180
+								<option id="com.atollic.truestudio.gcc.symbols.defined.1170000142" name="Defined symbols" superClass="com.atollic.truestudio.gcc.symbols.defined" useByScannerDiscovery="false" valueType="definedSymbols">
181 181
 									<listOptionValue builtIn="false" value="STM32F10X_LD"/>
182 182
 									<listOptionValue builtIn="false" value="USE_STDPERIPH_DRIVER"/>
183 183
 								</option>
184
-								<option id="com.atollic.truestudio.gcc.directories.select.220679468" name="Include path" superClass="com.atollic.truestudio.gcc.directories.select" valueType="includePath">
184
+								<option id="com.atollic.truestudio.gcc.directories.select.1517262429" name="Include path" superClass="com.atollic.truestudio.gcc.directories.select" useByScannerDiscovery="false" valueType="includePath">
185 185
 									<listOptionValue builtIn="false" value="../src"/>
186 186
 									<listOptionValue builtIn="false" value="../Libraries/STM32F10x_StdPeriph_Driver/inc"/>
187 187
 									<listOptionValue builtIn="false" value="../Libraries/CMSIS/Device/ST/STM32F10x/Include"/>
188 188
 									<listOptionValue builtIn="false" value="../Libraries/CMSIS/Include"/>
189 189
 								</option>
190
-								<option id="com.atollic.truestudio.common_options.target.endianess.706271228" name="Endianess" superClass="com.atollic.truestudio.common_options.target.endianess"/>
191
-								<option id="com.atollic.truestudio.common_options.target.mcpu.1964199330" name="Microcontroller" superClass="com.atollic.truestudio.common_options.target.mcpu" value="STM32F103C6" valueType="enumerated"/>
192
-								<option id="com.atollic.truestudio.common_options.target.instr_set.1616704135" name="Instruction set" superClass="com.atollic.truestudio.common_options.target.instr_set" value="com.atollic.truestudio.common_options.target.instr_set.thumb2" valueType="enumerated"/>
193
-								<option id="com.atollic.truestudio.common_options.target.fpucore.801415246" name="FPU" superClass="com.atollic.truestudio.common_options.target.fpucore" value="com.atollic.truestudio.common_options.target.fpucore.None" valueType="enumerated"/>
194
-								<option id="com.atollic.truestudio.common_options.target.fpu.258702060" name="Floating point" superClass="com.atollic.truestudio.common_options.target.fpu"/>
195
-								<option id="com.atollic.truestudio.gcc.optimization.prep_garbage.1280377076" name="Prepare dead code removal " superClass="com.atollic.truestudio.gcc.optimization.prep_garbage" value="true" valueType="boolean"/>
196
-								<option id="com.atollic.truestudio.gcc.optimization.prep_data.624201007" name="Prepare dead data removal" superClass="com.atollic.truestudio.gcc.optimization.prep_data" value="true" valueType="boolean"/>
197
-								<inputType id="com.atollic.truestudio.gcc.input.723277448" superClass="com.atollic.truestudio.gcc.input"/>
190
+								<option id="com.atollic.truestudio.common_options.target.endianess.1137125295" name="Endianess" superClass="com.atollic.truestudio.common_options.target.endianess" useByScannerDiscovery="false"/>
191
+								<option id="com.atollic.truestudio.common_options.target.mcpu.1544713666" name="Microcontroller" superClass="com.atollic.truestudio.common_options.target.mcpu" useByScannerDiscovery="false" value="STM32F103C6" valueType="enumerated"/>
192
+								<option id="com.atollic.truestudio.common_options.target.instr_set.1258702383" name="Instruction set" superClass="com.atollic.truestudio.common_options.target.instr_set" useByScannerDiscovery="false" value="com.atollic.truestudio.common_options.target.instr_set.thumb2" valueType="enumerated"/>
193
+								<option id="com.atollic.truestudio.common_options.target.fpucore.1316464568" name="FPU" superClass="com.atollic.truestudio.common_options.target.fpucore" useByScannerDiscovery="false" value="com.atollic.truestudio.common_options.target.fpucore.None" valueType="enumerated"/>
194
+								<option id="com.atollic.truestudio.common_options.target.fpu.1866738467" name="Floating point" superClass="com.atollic.truestudio.common_options.target.fpu" useByScannerDiscovery="false"/>
195
+								<option id="com.atollic.truestudio.gcc.optimization.prep_garbage.2044849590" name="Prepare dead code removal " superClass="com.atollic.truestudio.gcc.optimization.prep_garbage" useByScannerDiscovery="false" value="true" valueType="boolean"/>
196
+								<option id="com.atollic.truestudio.gcc.optimization.prep_data.1653398661" name="Prepare dead data removal" superClass="com.atollic.truestudio.gcc.optimization.prep_data" useByScannerDiscovery="false" value="true" valueType="boolean"/>
197
+								<option id="com.atollic.truestudio.exe.debug.toolchain.gcc.optimization.level.1568105244" name="Optimization Level" superClass="com.atollic.truestudio.exe.debug.toolchain.gcc.optimization.level" useByScannerDiscovery="false" value="com.atollic.truestudio.gcc.optimization.level.0s" valueType="enumerated"/>
198
+								<option id="com.atollic.truestudio.exe.debug.toolchain.gcc.debug.info.150606538" superClass="com.atollic.truestudio.exe.debug.toolchain.gcc.debug.info" useByScannerDiscovery="false" value="com.atollic.truestudio.gcc.debug.info.0" valueType="enumerated"/>
199
+								<option id="com.atollic.truestudio.gcc.misc.stackusage.111740427" superClass="com.atollic.truestudio.gcc.misc.stackusage" useByScannerDiscovery="false" value="false" valueType="boolean"/>
200
+								<inputType id="com.atollic.truestudio.gcc.input.315452709" superClass="com.atollic.truestudio.gcc.input"/>
198 201
 							</tool>
199
-							<tool id="com.atollic.truestudio.exe.release.toolchain.ld.506505654" name="C Linker" superClass="com.atollic.truestudio.exe.release.toolchain.ld">
200
-								<option id="com.atollic.truestudio.common_options.target.endianess.1015608354" name="Endianess" superClass="com.atollic.truestudio.common_options.target.endianess"/>
201
-								<option id="com.atollic.truestudio.common_options.target.mcpu.1474414038" name="Microcontroller" superClass="com.atollic.truestudio.common_options.target.mcpu" value="STM32F103C6" valueType="enumerated"/>
202
-								<option id="com.atollic.truestudio.common_options.target.instr_set.176493136" name="Instruction set" superClass="com.atollic.truestudio.common_options.target.instr_set" value="com.atollic.truestudio.common_options.target.instr_set.thumb2" valueType="enumerated"/>
203
-								<option id="com.atollic.truestudio.common_options.target.fpucore.1323768380" name="FPU" superClass="com.atollic.truestudio.common_options.target.fpucore" value="com.atollic.truestudio.common_options.target.fpucore.None" valueType="enumerated"/>
204
-								<option id="com.atollic.truestudio.common_options.target.fpu.1342724396" name="Floating point" superClass="com.atollic.truestudio.common_options.target.fpu"/>
205
-								<option id="com.atollic.truestudio.ld.general.scriptfile.1449950940" name="Linker script" superClass="com.atollic.truestudio.ld.general.scriptfile" value="../stm32_flash.ld" valueType="string"/>
206
-								<option id="com.atollic.truestudio.ld.optimization.do_garbage.1461671650" name="Dead code removal " superClass="com.atollic.truestudio.ld.optimization.do_garbage" value="true" valueType="boolean"/>
202
+							<tool id="com.atollic.truestudio.exe.debug.toolchain.ld.539950594" name="C Linker" superClass="com.atollic.truestudio.exe.debug.toolchain.ld">
203
+								<option id="com.atollic.truestudio.common_options.target.endianess.1683175786" name="Endianess" superClass="com.atollic.truestudio.common_options.target.endianess"/>
204
+								<option id="com.atollic.truestudio.common_options.target.mcpu.810336117" name="Microcontroller" superClass="com.atollic.truestudio.common_options.target.mcpu" value="STM32F103C6" valueType="enumerated"/>
205
+								<option id="com.atollic.truestudio.common_options.target.instr_set.227078225" name="Instruction set" superClass="com.atollic.truestudio.common_options.target.instr_set" value="com.atollic.truestudio.common_options.target.instr_set.thumb2" valueType="enumerated"/>
206
+								<option id="com.atollic.truestudio.common_options.target.fpucore.437910239" name="FPU" superClass="com.atollic.truestudio.common_options.target.fpucore" value="com.atollic.truestudio.common_options.target.fpucore.None" valueType="enumerated"/>
207
+								<option id="com.atollic.truestudio.common_options.target.fpu.1122015995" name="Floating point" superClass="com.atollic.truestudio.common_options.target.fpu"/>
208
+								<option id="com.atollic.truestudio.ld.general.scriptfile.1007340251" name="Linker script" superClass="com.atollic.truestudio.ld.general.scriptfile" value="../stm32_flash.ld" valueType="string"/>
209
+								<option id="com.atollic.truestudio.ld.optimization.do_garbage.1103877399" name="Dead code removal " superClass="com.atollic.truestudio.ld.optimization.do_garbage" value="true" valueType="boolean"/>
207 210
 							</tool>
208
-							<tool id="com.atollic.truestudio.exe.release.toolchain.gpp.2117884124" name="C++ Compiler" superClass="com.atollic.truestudio.exe.release.toolchain.gpp">
209
-								<option id="com.atollic.truestudio.gpp.symbols.defined.1227169168" name="Defined symbols" superClass="com.atollic.truestudio.gpp.symbols.defined" valueType="definedSymbols">
211
+							<tool id="com.atollic.truestudio.exe.debug.toolchain.gpp.1799243953" name="C++ Compiler" superClass="com.atollic.truestudio.exe.debug.toolchain.gpp">
212
+								<option id="com.atollic.truestudio.gpp.symbols.defined.765136390" name="Defined symbols" superClass="com.atollic.truestudio.gpp.symbols.defined" useByScannerDiscovery="false" valueType="definedSymbols">
210 213
 									<listOptionValue builtIn="false" value="STM32F10X_LD"/>
211 214
 									<listOptionValue builtIn="false" value="USE_STDPERIPH_DRIVER"/>
212 215
 								</option>
213
-								<option id="com.atollic.truestudio.gpp.directories.select.835605758" name="Include path" superClass="com.atollic.truestudio.gpp.directories.select" valueType="includePath">
216
+								<option id="com.atollic.truestudio.gpp.directories.select.1422676259" name="Include path" superClass="com.atollic.truestudio.gpp.directories.select" useByScannerDiscovery="false" valueType="includePath">
214 217
 									<listOptionValue builtIn="false" value="../src"/>
215 218
 									<listOptionValue builtIn="false" value="../Libraries/STM32F10x_StdPeriph_Driver/inc"/>
216 219
 									<listOptionValue builtIn="false" value="../Libraries/CMSIS/Device/ST/STM32F10x/Include"/>
217 220
 									<listOptionValue builtIn="false" value="../Libraries/CMSIS/Include"/>
218 221
 								</option>
219
-								<option id="com.atollic.truestudio.common_options.target.endianess.1967238277" name="Endianess" superClass="com.atollic.truestudio.common_options.target.endianess"/>
220
-								<option id="com.atollic.truestudio.common_options.target.mcpu.1875365386" name="Microcontroller" superClass="com.atollic.truestudio.common_options.target.mcpu" value="STM32F103C6" valueType="enumerated"/>
221
-								<option id="com.atollic.truestudio.common_options.target.instr_set.585318403" name="Instruction set" superClass="com.atollic.truestudio.common_options.target.instr_set" value="com.atollic.truestudio.common_options.target.instr_set.thumb2" valueType="enumerated"/>
222
-								<option id="com.atollic.truestudio.common_options.target.fpucore.302951526" name="FPU" superClass="com.atollic.truestudio.common_options.target.fpucore" value="com.atollic.truestudio.common_options.target.fpucore.None" valueType="enumerated"/>
223
-								<option id="com.atollic.truestudio.common_options.target.fpu.225902667" name="Floating point" superClass="com.atollic.truestudio.common_options.target.fpu"/>
224
-								<option id="com.atollic.truestudio.gpp.optimization.prep_garbage.1354058843" name="Prepare dead code removal" superClass="com.atollic.truestudio.gpp.optimization.prep_garbage" value="true" valueType="boolean"/>
225
-								<option id="com.atollic.truestudio.gpp.optimization.prep_data.588745643" name="Prepare dead data removal" superClass="com.atollic.truestudio.gpp.optimization.prep_data" value="true" valueType="boolean"/>
226
-								<option id="com.atollic.truestudio.gpp.optimization.fno_rtti.252107689" name="Disable RTTI" superClass="com.atollic.truestudio.gpp.optimization.fno_rtti"/>
227
-								<option id="com.atollic.truestudio.gpp.optimization.fno_exceptions.2129524145" name="Disable exception handling" superClass="com.atollic.truestudio.gpp.optimization.fno_exceptions"/>
228
-								<inputType id="com.atollic.truestudio.gpp.input.1229320757" superClass="com.atollic.truestudio.gpp.input"/>
222
+								<option id="com.atollic.truestudio.common_options.target.endianess.779852714" name="Endianess" superClass="com.atollic.truestudio.common_options.target.endianess" useByScannerDiscovery="false"/>
223
+								<option id="com.atollic.truestudio.common_options.target.mcpu.2009546706" name="Microcontroller" superClass="com.atollic.truestudio.common_options.target.mcpu" useByScannerDiscovery="false" value="STM32F103C6" valueType="enumerated"/>
224
+								<option id="com.atollic.truestudio.common_options.target.instr_set.971161078" name="Instruction set" superClass="com.atollic.truestudio.common_options.target.instr_set" useByScannerDiscovery="false" value="com.atollic.truestudio.common_options.target.instr_set.thumb2" valueType="enumerated"/>
225
+								<option id="com.atollic.truestudio.common_options.target.fpucore.76521404" name="FPU" superClass="com.atollic.truestudio.common_options.target.fpucore" useByScannerDiscovery="false" value="com.atollic.truestudio.common_options.target.fpucore.None" valueType="enumerated"/>
226
+								<option id="com.atollic.truestudio.common_options.target.fpu.292768194" name="Floating point" superClass="com.atollic.truestudio.common_options.target.fpu" useByScannerDiscovery="false"/>
227
+								<option id="com.atollic.truestudio.gpp.optimization.prep_garbage.1295550110" name="Prepare dead code removal" superClass="com.atollic.truestudio.gpp.optimization.prep_garbage" useByScannerDiscovery="false" value="true" valueType="boolean"/>
228
+								<option id="com.atollic.truestudio.gpp.optimization.prep_data.1848113239" name="Prepare dead data removal" superClass="com.atollic.truestudio.gpp.optimization.prep_data" useByScannerDiscovery="false" value="true" valueType="boolean"/>
229
+								<option id="com.atollic.truestudio.gpp.optimization.fno_rtti.1984887368" name="Disable RTTI" superClass="com.atollic.truestudio.gpp.optimization.fno_rtti" useByScannerDiscovery="false"/>
230
+								<option id="com.atollic.truestudio.gpp.optimization.fno_exceptions.2131091817" name="Disable exception handling" superClass="com.atollic.truestudio.gpp.optimization.fno_exceptions" useByScannerDiscovery="false"/>
231
+								<option id="com.atollic.truestudio.exe.debug.toolchain.gpp.optimization.level.880563678" name="Optimization Level" superClass="com.atollic.truestudio.exe.debug.toolchain.gpp.optimization.level" useByScannerDiscovery="false" value="com.atollic.truestudio.gpp.optimization.level.00" valueType="enumerated"/>
232
+								<option id="com.atollic.truestudio.exe.debug.toolchain.gpp.debug.info.1676148341" superClass="com.atollic.truestudio.exe.debug.toolchain.gpp.debug.info" useByScannerDiscovery="false" value="com.atollic.truestudio.gpp.debug.info.0" valueType="enumerated"/>
233
+								<option id="com.atollic.truestudio.gpp.misc.stackusage.1577073534" superClass="com.atollic.truestudio.gpp.misc.stackusage" useByScannerDiscovery="false" value="false" valueType="boolean"/>
234
+								<inputType id="com.atollic.truestudio.gpp.input.1483596384" superClass="com.atollic.truestudio.gpp.input"/>
229 235
 							</tool>
230
-							<tool id="com.atollic.truestudio.exe.release.toolchain.ldcc.814843865" name="C++ Linker" superClass="com.atollic.truestudio.exe.release.toolchain.ldcc">
231
-								<option id="com.atollic.truestudio.common_options.target.endianess.463874311" name="Endianess" superClass="com.atollic.truestudio.common_options.target.endianess"/>
232
-								<option id="com.atollic.truestudio.common_options.target.mcpu.310965165" name="Microcontroller" superClass="com.atollic.truestudio.common_options.target.mcpu" value="STM32F103C6" valueType="enumerated"/>
233
-								<option id="com.atollic.truestudio.common_options.target.instr_set.1819338136" name="Instruction set" superClass="com.atollic.truestudio.common_options.target.instr_set" value="com.atollic.truestudio.common_options.target.instr_set.thumb2" valueType="enumerated"/>
234
-								<option id="com.atollic.truestudio.common_options.target.fpucore.1383712909" name="FPU" superClass="com.atollic.truestudio.common_options.target.fpucore" value="com.atollic.truestudio.common_options.target.fpucore.None" valueType="enumerated"/>
235
-								<option id="com.atollic.truestudio.common_options.target.fpu.740897850" name="Floating point" superClass="com.atollic.truestudio.common_options.target.fpu"/>
236
-								<option id="com.atollic.truestudio.ldcc.optimization.do_garbage.1252563406" name="Dead code removal" superClass="com.atollic.truestudio.ldcc.optimization.do_garbage" value="true" valueType="boolean"/>
237
-								<option id="com.atollic.truestudio.ldcc.general.scriptfile.1933119698" name="Linker script" superClass="com.atollic.truestudio.ldcc.general.scriptfile" value="../stm32_flash.ld" valueType="string"/>
238
-								<inputType id="com.atollic.truestudio.ldcc.input.889935215" name="Input" superClass="com.atollic.truestudio.ldcc.input">
236
+							<tool id="com.atollic.truestudio.exe.debug.toolchain.ldcc.78429074" name="C++ Linker" superClass="com.atollic.truestudio.exe.debug.toolchain.ldcc">
237
+								<option id="com.atollic.truestudio.common_options.target.endianess.1508155988" name="Endianess" superClass="com.atollic.truestudio.common_options.target.endianess" useByScannerDiscovery="false"/>
238
+								<option id="com.atollic.truestudio.common_options.target.mcpu.1309806098" name="Microcontroller" superClass="com.atollic.truestudio.common_options.target.mcpu" useByScannerDiscovery="false" value="STM32F103C6" valueType="enumerated"/>
239
+								<option id="com.atollic.truestudio.common_options.target.instr_set.1326581983" name="Instruction set" superClass="com.atollic.truestudio.common_options.target.instr_set" useByScannerDiscovery="false" value="com.atollic.truestudio.common_options.target.instr_set.thumb2" valueType="enumerated"/>
240
+								<option id="com.atollic.truestudio.common_options.target.fpucore.1327953134" name="FPU" superClass="com.atollic.truestudio.common_options.target.fpucore" useByScannerDiscovery="false" value="com.atollic.truestudio.common_options.target.fpucore.None" valueType="enumerated"/>
241
+								<option id="com.atollic.truestudio.common_options.target.fpu.316456134" name="Floating point" superClass="com.atollic.truestudio.common_options.target.fpu" useByScannerDiscovery="false"/>
242
+								<option id="com.atollic.truestudio.ldcc.optimization.do_garbage.1063872512" name="Dead code removal" superClass="com.atollic.truestudio.ldcc.optimization.do_garbage" useByScannerDiscovery="false" value="true" valueType="boolean"/>
243
+								<option id="com.atollic.truestudio.ldcc.general.scriptfile.1677631160" name="Linker script" superClass="com.atollic.truestudio.ldcc.general.scriptfile" useByScannerDiscovery="false" value="../stm32_flash.ld" valueType="string"/>
244
+								<inputType id="com.atollic.truestudio.ldcc.input.1448912373" name="Input" superClass="com.atollic.truestudio.ldcc.input">
239 245
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
240 246
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
241 247
 								</inputType>
242 248
 							</tool>
243
-							<tool id="com.atollic.truestudio.ar.base.1273293321" name="Archiver" superClass="com.atollic.truestudio.ar.base"/>
244
-							<tool id="com.atollic.truestudio.exe.release.toolchain.secoutput.1769879070" name="Other" superClass="com.atollic.truestudio.exe.release.toolchain.secoutput"/>
249
+							<tool id="com.atollic.truestudio.ar.base.488911491" name="Archiver" superClass="com.atollic.truestudio.ar.base"/>
250
+							<tool id="com.atollic.truestudio.exe.debug.toolchain.secoutput.1237334475" name="Other" superClass="com.atollic.truestudio.exe.debug.toolchain.secoutput"/>
251
+						</toolChain>
252
+					</folderInfo>
253
+					<folderInfo id="com.atollic.truestudio.exe.debug.584431509.2045581985.system" name="/" resourcePath="system">
254
+						<toolChain id="com.atollic.truestudio.exe.debug.toolchain.1622713741" name="Atollic ARM Tools" superClass="com.atollic.truestudio.exe.debug.toolchain" unusedChildren="">
255
+							<option id="com.atollic.truestudio.general.runtimelib.2022035895.1664729184.1404950193" name="Runtime Library" superClass="com.atollic.truestudio.general.runtimelib.2022035895"/>
256
+							<option id="com.atollic.truestudio.toolchain_options.mcu.536866847.908777965.359661470" name="Microcontroller" superClass="com.atollic.truestudio.toolchain_options.mcu.536866847"/>
257
+							<option id="com.atollic.truestudio.toolchain_options.vendor.636197389.788614232.1573191851" name="Vendor name" superClass="com.atollic.truestudio.toolchain_options.vendor.636197389"/>
258
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.atollic.truestudio.exe.debug.toolchain.platform.1940668383" isAbstract="false" name="Debug platform" osList="all" superClass="com.atollic.truestudio.exe.debug.toolchain.platform"/>
259
+							<tool id="com.atollic.truestudio.exe.debug.toolchain.as.609504728" name="Assembler" superClass="com.atollic.truestudio.exe.debug.toolchain.as.1282106265">
260
+								<inputType id="com.atollic.truestudio.as.input.1107133505" name="Input" superClass="com.atollic.truestudio.as.input"/>
261
+							</tool>
262
+							<tool id="com.atollic.truestudio.exe.debug.toolchain.gcc.1122108280" name="C Compiler" superClass="com.atollic.truestudio.exe.debug.toolchain.gcc.176685112">
263
+								<inputType id="com.atollic.truestudio.gcc.input.931352173" superClass="com.atollic.truestudio.gcc.input"/>
264
+							</tool>
265
+							<tool id="com.atollic.truestudio.exe.debug.toolchain.ld.1614483643" name="C Linker" superClass="com.atollic.truestudio.exe.debug.toolchain.ld.539950594"/>
266
+							<tool id="com.atollic.truestudio.exe.debug.toolchain.gpp.1062710865" name="C++ Compiler" superClass="com.atollic.truestudio.exe.debug.toolchain.gpp.1799243953">
267
+								<inputType id="com.atollic.truestudio.gpp.input.65736761" superClass="com.atollic.truestudio.gpp.input"/>
268
+							</tool>
269
+							<tool id="com.atollic.truestudio.exe.debug.toolchain.ldcc.1006350212" name="C++ Linker" superClass="com.atollic.truestudio.exe.debug.toolchain.ldcc.78429074"/>
270
+							<tool id="com.atollic.truestudio.ar.base.1384193587" name="Archiver" superClass="com.atollic.truestudio.ar.base.488911491"/>
271
+							<tool id="com.atollic.truestudio.exe.debug.toolchain.secoutput.1245030582" name="Other" superClass="com.atollic.truestudio.exe.debug.toolchain.secoutput.1237334475"/>
245 272
 						</toolChain>
246 273
 					</folderInfo>
247 274
 					<sourceEntries>
248 275
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Libraries"/>
249
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
276
+						<entry excluding="MAE.h|SPI.h|cmde_spi.h|MAE.c|SPI.c|cmde_spi.c|main.cpp|it_dubmy.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
277
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="system"/>
250 278
 					</sourceEntries>
251 279
 				</configuration>
252 280
 			</storageModule>

+ 1
- 0
software/robot/.gitignore View File

@@ -1,3 +1,4 @@
1 1
 /Debug/
2 2
 /html/
3 3
 
4
+/Release/

+ 1
- 1
software/robot/.settings/language.settings.xml View File

@@ -10,7 +10,7 @@
10 10
 			</provider>
11 11
 		</extension>
12 12
 	</configuration>
13
-	<configuration id="com.atollic.truestudio.configuration.release.1711240076" name="Release">
13
+	<configuration id="com.atollic.truestudio.exe.debug.584431509.2045581985" name="Release">
14 14
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
15 15
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
16 16
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>

+ 10
- 0
software/robot/.settings/org.eclipse.cdt.managedbuilder.core.prefs View File

@@ -1,10 +1,20 @@
1 1
 eclipse.preferences.version=1
2
+environment/buildEnvironmentInclude/com.atollic.truestudio.exe.debug.584431509.2045581985/CPATH/delimiter=\:
3
+environment/buildEnvironmentInclude/com.atollic.truestudio.exe.debug.584431509.2045581985/CPATH/operation=remove
4
+environment/buildEnvironmentInclude/com.atollic.truestudio.exe.debug.584431509.2045581985/C_INCLUDE_PATH/delimiter=\:
5
+environment/buildEnvironmentInclude/com.atollic.truestudio.exe.debug.584431509.2045581985/C_INCLUDE_PATH/operation=remove
6
+environment/buildEnvironmentInclude/com.atollic.truestudio.exe.debug.584431509.2045581985/append=true
7
+environment/buildEnvironmentInclude/com.atollic.truestudio.exe.debug.584431509.2045581985/appendContributed=true
2 8
 environment/buildEnvironmentInclude/com.atollic.truestudio.exe.debug.584431509/CPATH/delimiter=\:
3 9
 environment/buildEnvironmentInclude/com.atollic.truestudio.exe.debug.584431509/CPATH/operation=remove
4 10
 environment/buildEnvironmentInclude/com.atollic.truestudio.exe.debug.584431509/C_INCLUDE_PATH/delimiter=\:
5 11
 environment/buildEnvironmentInclude/com.atollic.truestudio.exe.debug.584431509/C_INCLUDE_PATH/operation=remove
6 12
 environment/buildEnvironmentInclude/com.atollic.truestudio.exe.debug.584431509/append=true
7 13
 environment/buildEnvironmentInclude/com.atollic.truestudio.exe.debug.584431509/appendContributed=true
14
+environment/buildEnvironmentLibrary/com.atollic.truestudio.exe.debug.584431509.2045581985/LIBRARY_PATH/delimiter=\:
15
+environment/buildEnvironmentLibrary/com.atollic.truestudio.exe.debug.584431509.2045581985/LIBRARY_PATH/operation=remove
16
+environment/buildEnvironmentLibrary/com.atollic.truestudio.exe.debug.584431509.2045581985/append=true
17
+environment/buildEnvironmentLibrary/com.atollic.truestudio.exe.debug.584431509.2045581985/appendContributed=true
8 18
 environment/buildEnvironmentLibrary/com.atollic.truestudio.exe.debug.584431509/LIBRARY_PATH/delimiter=\:
9 19
 environment/buildEnvironmentLibrary/com.atollic.truestudio.exe.debug.584431509/LIBRARY_PATH/operation=remove
10 20
 environment/buildEnvironmentLibrary/com.atollic.truestudio.exe.debug.584431509/append=true

+ 3
- 0
software/robot/X-CTU_command_List.xml View File

@@ -38,5 +38,8 @@
38 38
     <packet name="GetBattery">
39 39
       <payload>76760D</payload>
40 40
     </packet>
41
+    <packet name="PowerOff">
42
+      <payload>7A7A0D</payload>
43
+    </packet>
41 44
   </packets_list>
42 45
 </data>

+ 46
- 3
software/robot/src/cmdManager.c View File

@@ -49,6 +49,7 @@
49 49
 #define BusyStateCMD            'b'
50 50
 #define TestCMD                 't'
51 51
 #define DebugCMD                'a'
52
+#define PowerOffCMD             'z'
52 53
 
53 54
 #define OK_ANS              "O\r"
54 55
 #define ERR_ANS             "E\r"
@@ -57,6 +58,23 @@
57 58
 #define BAT_LOW             "1\r"
58 59
 #define BAT_EMPTY           "0\r"
59 60
 
61
+/* Prototype des fonctions */
62
+
63
+char cmdVerifyChecksum(void);
64
+void cmdAddChecksum(void);
65
+void cmdResetAction(void);
66
+void cmdBusyStateAction(void);
67
+void cmdPingAction(void);
68
+void cmdVersionAction(void);
69
+void cmdStartWithoutWatchdogAction(void);
70
+void cmdMoveAction(void);
71
+void cmdTurnAction(void);
72
+void cmdBatteryVoltageAction(void);
73
+void cmdStartWithWatchdogAction(void);
74
+void cmdResetWatchdogAction(void);
75
+void cmdDebugAction(void);
76
+void cmdPowerOffAction(void);
77
+
60 78
 /** @addtogroup Checksum
61 79
  * @{
62 80
  */
@@ -138,8 +156,11 @@ void cmdManage(void) {
138 156
     if (cmdVerifyChecksum() != 0) {
139 157
         strcpy(sendString, UNKNOW_ANS);
140 158
     } else { // Checksum valide
141
-        if (Dumber.StateSystem==STATE_DISABLE) { // SI la batterie est trop faible, impossible d'accepter une commande: on reste dans ce mode
142
-            strcpy(sendString, ERR_ANS);
159
+        if (Dumber.StateSystem==STATE_DISABLE) { // SI la batterie est trop faible, impossible d'accepter une commande sauf poweroff: on reste dans ce mode
160
+            if (receiptString[0]==PowerOffCMD)
161
+                cmdPowerOffAction();
162
+            else
163
+                strcpy(sendString, ERR_ANS);
143 164
         } else {
144 165
             switch (receiptString[0]) {
145 166
                 case PingCMD:
@@ -182,10 +203,13 @@ void cmdManage(void) {
182 203
                     cmdBusyStateAction();
183 204
                     break;
184 205
 
185
-                case 'a':
206
+                case DebugCMD:
186 207
                     cmdDebugAction();
187 208
                     break;
188 209
 
210
+                case PowerOffCMD:
211
+                    cmdPowerOffAction();
212
+                    break;
189 213
                 default:
190 214
                     strcpy(sendString, UNKNOW_ANS);
191 215
             }
@@ -419,6 +443,25 @@ void cmdDebugAction(void) {
419 443
 }
420 444
 
421 445
 /**
446
+ * @brief       Eteint le robot
447
+ *
448
+ * @param       None
449
+ * @retval      None
450
+ */
451
+void cmdPowerOffAction(void) {
452
+    volatile int i;
453
+
454
+    systemChangeState(STATE_DISABLE);
455
+    strcpy(sendString, OK_ANS);
456
+
457
+    cmdAddChecksum();
458
+    usartSendData();
459
+    /* Attente d'un certain temps (100 ms), pour que la reponse parte */
460
+    for (i=0; i<100000; i++);
461
+
462
+    systemShutDown(); // Ne ressort jamais de cette fonction
463
+}
464
+/**
422 465
  * @}
423 466
  */
424 467
 

+ 0
- 12
software/robot/src/cmdManager.h View File

@@ -22,19 +22,7 @@
22 22
 #include <stm32f10x.h>
23 23
 
24 24
 void cmdManage(void);
25
-char cmdVerifyChecksum(void);
26 25
 void cmdAddChecksum(void);
27
-void cmdResetAction(void);
28
-void cmdBusyStateAction(void);
29
-void cmdPingAction(void);
30
-void cmdVersionAction(void);
31
-void cmdStartWithoutWatchdogAction(void);
32
-void cmdMoveAction(void);
33
-void cmdTurnAction(void);
34
-void cmdBatteryVoltageAction(void);
35
-void cmdStartWithWatchdogAction(void);
36
-void cmdResetWatchdogAction(void);
37
-void cmdDebugAction(void);
38 26
 
39 27
 #endif /* _CMD_MANAGER_H_ */
40 28
 

+ 4
- 4
software/robot/src/system_dumby.h View File

@@ -33,7 +33,7 @@
33 33
 #include "stm32f10x.h"
34 34
 
35 35
 /* Déclaration des Constantes */
36
-#define VERSION				"version 1.3\r"
36
+#define VERSION				"version 1.4\r"
37 37
 
38 38
 #define SPI 				10 
39 39
 #define USART 				20 
@@ -47,9 +47,9 @@
47 47
 
48 48
 #define	UNDEFINED			101 
49 49
 
50
-#define TIMER_1s 			1000 // 1 sec
51
-#define TIMER_Watchdog		3050	 //
52
-#define TTMER_Inactivity 	120000 // 2 min
50
+#define TIMER_1s 			1000    // 1 sec
51
+//#define TIMER_Watchdog		3050
52
+//#define TTMER_Inactivity 	120000  // 2 min
53 53
 
54 54
 #define WATCHDOG_MIN        970
55 55
 #define WATCHDOG_MAX        1030

Loading…
Cancel
Save