修该减速比

This commit is contained in:
起床就犯困 2025-05-29 17:20:11 +08:00
parent 9cb048ddaa
commit 9b021d1a0d
8 changed files with 12819 additions and 2140 deletions

View File

@ -338,11 +338,11 @@
#ifdef PTZ_SUPER_LIGHT_WORM_L6235D_AS5047D_24V #ifdef PTZ_SUPER_LIGHT_WORM_L6235D_AS5047D_24V
///水平电机减速比 ///水平电机减速比
#define PTZ_HORI_MOTOR_RATIO 27.0 #define PTZ_HORI_MOTOR_RATIO 3.0
///水平大齿轮减速比 ///水平大齿轮减速比
#define PTZ_HORI_BIG_GEAR_RATIO 50.0 #define PTZ_HORI_BIG_GEAR_RATIO 50.0
///水平总减速比 ///水平总减速比
#define PTZ_HORI_RATIO 1350.0 #define PTZ_HORI_RATIO 150.0
///水平电机调速模拟电压最大值 ///水平电机调速模拟电压最大值
#define PTZ_HORI_VR_MAX 1999 #define PTZ_HORI_VR_MAX 1999
///水平电机调速模拟电压最小值 ///水平电机调速模拟电压最小值
@ -354,20 +354,20 @@
///水平电机最小转速 ///水平电机最小转速
#define PTZ_HORI_MOTOR_MIN_SPEED 405.0 #define PTZ_HORI_MOTOR_MIN_SPEED 405.0
///水平云台最大转速 ///水平云台最大转速
#define PTZ_HORI_MAX_SPEED 2.2 #define PTZ_HORI_MAX_SPEED 20.0
///水平云台最小转速 ///水平云台最小转速
#define PTZ_HORI_MIN_SPEED 0.3 #define PTZ_HORI_MIN_SPEED 2.7
///水平云台默认最佳速度 ///水平云台默认最佳速度
#define PTZ_HORI_BEST_SPEED 1.6 #define PTZ_HORI_BEST_SPEED 14.4
/**********************************************************/ /**********************************************************/
///磁编码器和电机之间的减速比 ///磁编码器和电机之间的减速比
#define PTZ_VERT_MOTOR_RATIO 27.0 #define PTZ_VERT_MOTOR_RATIO 10.0
///磁编码器与云台轴之间的减速比 ///磁编码器与云台轴之间的减速比
#define PTZ_VERT_BIG_GEAR_RATIO 50.0 #define PTZ_VERT_BIG_GEAR_RATIO 50.0
///垂直总减速比 ///垂直总减速比
#define PTZ_VERT_RATIO 1350.0 #define PTZ_VERT_RATIO 500.0
///垂直电机调速模拟电压最大值 ///垂直电机调速模拟电压最大值
#define PTZ_VERT_VR_MAX 1999 #define PTZ_VERT_VR_MAX 1999
///垂直电机调速模拟电压最小值 ///垂直电机调速模拟电压最小值
@ -379,11 +379,11 @@
///垂直电机最小转速 ///垂直电机最小转速
#define PTZ_VERT_MOTOR_MIN_SPEED 405.0 #define PTZ_VERT_MOTOR_MIN_SPEED 405.0
///垂直云台最大转速 ///垂直云台最大转速
#define PTZ_VERT_MAX_SPEED 2.2 #define PTZ_VERT_MAX_SPEED 6.0
///垂直云台最小转速 ///垂直云台最小转速
#define PTZ_VERT_MIN_SPEED 0.3 #define PTZ_VERT_MIN_SPEED 0.81
///垂直云台默认最佳速度 ///垂直云台默认最佳速度
#define PTZ_VERT_BEST_SPEED 1.6 #define PTZ_VERT_BEST_SPEED 4.3
//电机磁极对数 //电机磁极对数

View File

@ -2,9 +2,9 @@
/*-Editor annotation file-*/ /*-Editor annotation file-*/
/* IcfEditorFile="$TOOLKIT_DIR$\config\ide\IcfEditor\cortex_v1_0.xml" */ /* IcfEditorFile="$TOOLKIT_DIR$\config\ide\IcfEditor\cortex_v1_0.xml" */
/*-Specials-*/ /*-Specials-*/
define symbol __ICFEDIT_intvec_start__ = 0x08010000; define symbol __ICFEDIT_intvec_start__ = 0x08000000;
/*-Memory Regions-*/ /*-Memory Regions-*/
define symbol __ICFEDIT_region_ROM_start__ = 0x08010000; define symbol __ICFEDIT_region_ROM_start__ = 0x08000000;
define symbol __ICFEDIT_region_ROM_end__ = 0x0807FFFF; define symbol __ICFEDIT_region_ROM_end__ = 0x0807FFFF;
define symbol __ICFEDIT_region_RAM_start__ = 0x20000000; define symbol __ICFEDIT_region_RAM_start__ = 0x20000000;
define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF; define symbol __ICFEDIT_region_RAM_end__ = 0x2002FFFF;

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project> <project>
<fileVersion>3</fileVersion> <fileVersion>4</fileVersion>
<configuration> <configuration>
<name>Debug</name> <name>Debug</name>
<toolchain> <toolchain>
@ -11,7 +11,7 @@
<name>C-SPY</name> <name>C-SPY</name>
<archiveVersion>2</archiveVersion> <archiveVersion>2</archiveVersion>
<data> <data>
<version>32</version> <version>33</version>
<wantNonLocal>1</wantNonLocal> <wantNonLocal>1</wantNonLocal>
<debug>1</debug> <debug>1</debug>
<option> <option>
@ -44,7 +44,7 @@
</option> </option>
<option> <option>
<name>MemFile</name> <name>MemFile</name>
<state>$TOOLKIT_DIR$\CONFIG\debugger\GigaDevice\GD32F450xE.ddf</state> <state>$TOOLKIT_DIR$\config\debugger\GigaDevice\GD32F450xE.ddf</state>
</option> </option>
<option> <option>
<name>RunToEnable</name> <name>RunToEnable</name>
@ -88,7 +88,7 @@
</option> </option>
<option> <option>
<name>OCLastSavedByProductVersion</name> <name>OCLastSavedByProductVersion</name>
<state>9.20.1.43525</state> <state>9.40.2.67586</state>
</option> </option>
<option> <option>
<name>UseFlashLoader</name> <name>UseFlashLoader</name>
@ -112,7 +112,7 @@
</option> </option>
<option> <option>
<name>FlashLoadersV3</name> <name>FlashLoadersV3</name>
<state>$TOOLKIT_DIR$\config\flashloader\GigaDevice\FlashGD32F4xxxE.board</state> <state>$TOOLKIT_DIR$/config/flashloader/GigaDevice/FlashGD32F4xxxE.board</state>
</option> </option>
<option> <option>
<name>OCImagesSuppressCheck1</name> <name>OCImagesSuppressCheck1</name>
@ -222,6 +222,38 @@
<name>OCTpiuBaseOption</name> <name>OCTpiuBaseOption</name>
<state>1</state> <state>1</state>
</option> </option>
<option>
<name>OCOverrideSlave</name>
<state>0</state>
</option>
<option>
<name>OCOverrideSlavePath</name>
<state></state>
</option>
<option>
<name>C_32_64Device</name>
<state>1</state>
</option>
<option>
<name>AuthEnable</name>
<state>0</state>
</option>
<option>
<name>AuthSdmSelection</name>
<state>1</state>
</option>
<option>
<name>AuthSdmManifest</name>
<state></state>
</option>
<option>
<name>AuthSdmExplicitLib</name>
<state></state>
</option>
<option>
<name>AuthEnforce</name>
<state>0</state>
</option>
</data> </data>
</settings> </settings>
<settings> <settings>
@ -457,6 +489,39 @@
</option> </option>
</data> </data>
</settings> </settings>
<settings>
<name>E2_ID</name>
<archiveVersion>2</archiveVersion>
<data>
<version>0</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
<name>E2PowerFromProbe</name>
<state>1</state>
</option>
<option>
<name>CE2UsbSerialNo</name>
<state></state>
</option>
<option>
<name>CE2IdCodeEditB</name>
<state>0xFFFF'FFFF'FFFF'FFFF'FFFF'FFFF'FFFF'FFFF</state>
</option>
<option>
<name>CE2LogFileCheck</name>
<state>0</state>
</option>
<option>
<name>CE2LogFileEditB</name>
<state>$PROJ_DIR$\cspycomm.log</state>
</option>
<option>
<name>OCDriverInfo</name>
<state>1</state>
</option>
</data>
</settings>
<settings> <settings>
<name>GDBSERVER_ID</name> <name>GDBSERVER_ID</name>
<archiveVersion>2</archiveVersion> <archiveVersion>2</archiveVersion>
@ -1072,7 +1137,7 @@
<name>STLINK_ID</name> <name>STLINK_ID</name>
<archiveVersion>2</archiveVersion> <archiveVersion>2</archiveVersion>
<data> <data>
<version>7</version> <version>8</version>
<wantNonLocal>1</wantNonLocal> <wantNonLocal>1</wantNonLocal>
<debug>1</debug> <debug>1</debug>
<option> <option>
@ -1187,9 +1252,17 @@
</option> </option>
<option> <option>
<name>CCSTLinkProbeList</name> <name>CCSTLinkProbeList</name>
<version>1</version> <version>2</version>
<state>0</state> <state>0</state>
</option> </option>
<option>
<name>CCSTLinkTargetVccEnable</name>
<state>1</state>
</option>
<option>
<name>CCSTLinkTargetVoltage</name>
<state>###Uninitialized###</state>
</option>
</data> </data>
</settings> </settings>
<settings> <settings>
@ -1417,7 +1490,7 @@
</option> </option>
<option> <option>
<name>CCXds100ResetList</name> <name>CCXds100ResetList</name>
<version>0</version> <version>1</version>
<state>0</state> <state>0</state>
</option> </option>
<option> <option>
@ -1506,17 +1579,25 @@
<loadFlag>0</loadFlag> <loadFlag>0</loadFlag>
</plugin> </plugin>
<plugin> <plugin>
<file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9.ewplugin</file> <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9a.ewplugin</file>
<loadFlag>0</loadFlag>
</plugin>
<plugin>
<file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9BE.ewplugin</file>
<loadFlag>0</loadFlag> <loadFlag>0</loadFlag>
</plugin> </plugin>
<plugin> <plugin>
<file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file> <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
<loadFlag>0</loadFlag> <loadFlag>0</loadFlag>
</plugin> </plugin>
<plugin>
<file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
<loadFlag>0</loadFlag>
</plugin>
<plugin>
<file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
<loadFlag>0</loadFlag>
</plugin>
<plugin>
<file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
<loadFlag>0</loadFlag>
</plugin>
<plugin> <plugin>
<file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file> <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
<loadFlag>0</loadFlag> <loadFlag>0</loadFlag>
@ -1541,7 +1622,7 @@
<name>C-SPY</name> <name>C-SPY</name>
<archiveVersion>2</archiveVersion> <archiveVersion>2</archiveVersion>
<data> <data>
<version>32</version> <version>33</version>
<wantNonLocal>1</wantNonLocal> <wantNonLocal>1</wantNonLocal>
<debug>0</debug> <debug>0</debug>
<option> <option>
@ -1752,6 +1833,38 @@
<name>OCTpiuBaseOption</name> <name>OCTpiuBaseOption</name>
<state>1</state> <state>1</state>
</option> </option>
<option>
<name>OCOverrideSlave</name>
<state>0</state>
</option>
<option>
<name>OCOverrideSlavePath</name>
<state></state>
</option>
<option>
<name>C_32_64Device</name>
<state>1</state>
</option>
<option>
<name>AuthEnable</name>
<state>0</state>
</option>
<option>
<name>AuthSdmSelection</name>
<state>1</state>
</option>
<option>
<name>AuthSdmManifest</name>
<state></state>
</option>
<option>
<name>AuthSdmExplicitLib</name>
<state></state>
</option>
<option>
<name>AuthEnforce</name>
<state>0</state>
</option>
</data> </data>
</settings> </settings>
<settings> <settings>
@ -1987,6 +2100,39 @@
</option> </option>
</data> </data>
</settings> </settings>
<settings>
<name>E2_ID</name>
<archiveVersion>2</archiveVersion>
<data>
<version>0</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
<name>E2PowerFromProbe</name>
<state>1</state>
</option>
<option>
<name>CE2UsbSerialNo</name>
<state></state>
</option>
<option>
<name>CE2IdCodeEditB</name>
<state>0xFFFF'FFFF'FFFF'FFFF'FFFF'FFFF'FFFF'FFFF</state>
</option>
<option>
<name>CE2LogFileCheck</name>
<state>0</state>
</option>
<option>
<name>CE2LogFileEditB</name>
<state>$PROJ_DIR$\cspycomm.log</state>
</option>
<option>
<name>OCDriverInfo</name>
<state>1</state>
</option>
</data>
</settings>
<settings> <settings>
<name>GDBSERVER_ID</name> <name>GDBSERVER_ID</name>
<archiveVersion>2</archiveVersion> <archiveVersion>2</archiveVersion>
@ -2602,7 +2748,7 @@
<name>STLINK_ID</name> <name>STLINK_ID</name>
<archiveVersion>2</archiveVersion> <archiveVersion>2</archiveVersion>
<data> <data>
<version>7</version> <version>8</version>
<wantNonLocal>1</wantNonLocal> <wantNonLocal>1</wantNonLocal>
<debug>0</debug> <debug>0</debug>
<option> <option>
@ -2717,9 +2863,17 @@
</option> </option>
<option> <option>
<name>CCSTLinkProbeList</name> <name>CCSTLinkProbeList</name>
<version>1</version> <version>2</version>
<state>0</state> <state>0</state>
</option> </option>
<option>
<name>CCSTLinkTargetVccEnable</name>
<state>1</state>
</option>
<option>
<name>CCSTLinkTargetVoltage</name>
<state>###Uninitialized###</state>
</option>
</data> </data>
</settings> </settings>
<settings> <settings>
@ -2947,7 +3101,7 @@
</option> </option>
<option> <option>
<name>CCXds100ResetList</name> <name>CCXds100ResetList</name>
<version>0</version> <version>1</version>
<state>0</state> <state>0</state>
</option> </option>
<option> <option>
@ -3036,17 +3190,25 @@
<loadFlag>0</loadFlag> <loadFlag>0</loadFlag>
</plugin> </plugin>
<plugin> <plugin>
<file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9.ewplugin</file> <file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9a.ewplugin</file>
<loadFlag>0</loadFlag>
</plugin>
<plugin>
<file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9BE.ewplugin</file>
<loadFlag>0</loadFlag> <loadFlag>0</loadFlag>
</plugin> </plugin>
<plugin> <plugin>
<file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file> <file>$TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin</file>
<loadFlag>0</loadFlag> <loadFlag>0</loadFlag>
</plugin> </plugin>
<plugin>
<file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>
<loadFlag>0</loadFlag>
</plugin>
<plugin>
<file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>
<loadFlag>0</loadFlag>
</plugin>
<plugin>
<file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>
<loadFlag>0</loadFlag>
</plugin>
<plugin> <plugin>
<file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file> <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
<loadFlag>0</loadFlag> <loadFlag>0</loadFlag>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project> <project>
<fileVersion>3</fileVersion> <fileVersion>4</fileVersion>
<configuration> <configuration>
<name>Debug</name> <name>Debug</name>
<toolchain> <toolchain>
@ -11,7 +11,7 @@
<name>General</name> <name>General</name>
<archiveVersion>3</archiveVersion> <archiveVersion>3</archiveVersion>
<data> <data>
<version>34</version> <version>36</version>
<wantNonLocal>1</wantNonLocal> <wantNonLocal>1</wantNonLocal>
<debug>1</debug> <debug>1</debug>
<option> <option>
@ -62,7 +62,7 @@
</option> </option>
<option> <option>
<name>RTDescription</name> <name>RTDescription</name>
<state>Use the normal configuration of the C/C++ runtime library. No locale interface, C locale, no file descriptor support, no multibytes in printf and scanf, and no hex floats in strtod.</state> <state>A compact configuration of the C/C++14 runtime library. No locale interface, C locale, no file descriptor support, no multibytes in printf and scanf, and no hex floats in strtod.</state>
</option> </option>
<option> <option>
<name>OGProductVersion</name> <name>OGProductVersion</name>
@ -70,7 +70,7 @@
</option> </option>
<option> <option>
<name>OGLastSavedByProductVersion</name> <name>OGLastSavedByProductVersion</name>
<state>9.20.1.43525</state> <state>9.40.2.67586</state>
</option> </option>
<option> <option>
<name>OGChipSelectEditMenu</name> <name>OGChipSelectEditMenu</name>
@ -98,7 +98,7 @@
</option> </option>
<option> <option>
<name>GBECoreSlave</name> <name>GBECoreSlave</name>
<version>31</version> <version>33</version>
<state>39</state> <state>39</state>
</option> </option>
<option> <option>
@ -115,7 +115,7 @@
</option> </option>
<option> <option>
<name>CoreVariant</name> <name>CoreVariant</name>
<version>31</version> <version>33</version>
<state>39</state> <state>39</state>
</option> </option>
<option> <option>
@ -138,7 +138,7 @@
</option> </option>
<option> <option>
<name>GFPUCoreSlave2</name> <name>GFPUCoreSlave2</name>
<version>31</version> <version>33</version>
<state>39</state> <state>39</state>
</option> </option>
<option> <option>
@ -203,13 +203,26 @@
<name>BuildFilesPath</name> <name>BuildFilesPath</name>
<state>Debug</state> <state>Debug</state>
</option> </option>
<option>
<name>PointerAuthentication</name>
<state>0</state>
</option>
<option>
<name>FPU64</name>
<state>1</state>
</option>
<option>
<name>OG_32_64DeviceCoreSlave</name>
<version>33</version>
<state>39</state>
</option>
</data> </data>
</settings> </settings>
<settings> <settings>
<name>ICCARM</name> <name>ICCARM</name>
<archiveVersion>2</archiveVersion> <archiveVersion>2</archiveVersion>
<data> <data>
<version>37</version> <version>38</version>
<wantNonLocal>1</wantNonLocal> <wantNonLocal>1</wantNonLocal>
<debug>1</debug> <debug>1</debug>
<option> <option>
@ -511,13 +524,21 @@
<name>CCStackProtection</name> <name>CCStackProtection</name>
<state>0</state> <state>0</state>
</option> </option>
<option>
<name>CCPointerAutentiction</name>
<state>0</state>
</option>
<option>
<name>CCBranchTargetIdentification</name>
<state>0</state>
</option>
</data> </data>
</settings> </settings>
<settings> <settings>
<name>AARM</name> <name>AARM</name>
<archiveVersion>2</archiveVersion> <archiveVersion>2</archiveVersion>
<data> <data>
<version>11</version> <version>12</version>
<wantNonLocal>1</wantNonLocal> <wantNonLocal>1</wantNonLocal>
<debug>1</debug> <debug>1</debug>
<option> <option>
@ -677,6 +698,10 @@
<name>PreInclude</name> <name>PreInclude</name>
<state></state> <state></state>
</option> </option>
<option>
<name>A_32_64Device</name>
<state>1</state>
</option>
</data> </data>
</settings> </settings>
<settings> <settings>
@ -719,19 +744,11 @@
<buildSequence>inputOutputBased</buildSequence> <buildSequence>inputOutputBased</buildSequence>
</data> </data>
</settings> </settings>
<settings>
<name>BUILDACTION</name>
<archiveVersion>1</archiveVersion>
<data>
<prebuild></prebuild>
<postbuild></postbuild>
</data>
</settings>
<settings> <settings>
<name>ILINK</name> <name>ILINK</name>
<archiveVersion>0</archiveVersion> <archiveVersion>0</archiveVersion>
<data> <data>
<version>26</version> <version>27</version>
<wantNonLocal>1</wantNonLocal> <wantNonLocal>1</wantNonLocal>
<debug>1</debug> <debug>1</debug>
<option> <option>
@ -808,7 +825,7 @@
</option> </option>
<option> <option>
<name>IlinkIcfFile</name> <name>IlinkIcfFile</name>
<state>I:\HY-2.0\HY2.0\trunk\iar9_2\4.0 LW21-01B\Hyt2\BSP\IAR\GD32F450xE.icf</state> <state>D:\psx\Pan-Tilt\1.software\HY\4.0 LW21-01B\BSP\IAR\GD32F450xE_APP.icf</state>
</option> </option>
<option> <option>
<name>IlinkIcfFileSlave</name> <name>IlinkIcfFileSlave</name>
@ -1091,6 +1108,14 @@
<name>IlinkWrapperFile</name> <name>IlinkWrapperFile</name>
<state></state> <state></state>
</option> </option>
<option>
<name>IlinkProcessor</name>
<state>1</state>
</option>
<option>
<name>IlinkFpuProcessor</name>
<state>1</state>
</option>
</data> </data>
</settings> </settings>
<settings> <settings>
@ -1114,6 +1139,11 @@
</option> </option>
</data> </data>
</settings> </settings>
<settings>
<name>BUILDACTION</name>
<archiveVersion>2</archiveVersion>
<data />
</settings>
</configuration> </configuration>
<configuration> <configuration>
<name>Release</name> <name>Release</name>
@ -1125,7 +1155,7 @@
<name>General</name> <name>General</name>
<archiveVersion>3</archiveVersion> <archiveVersion>3</archiveVersion>
<data> <data>
<version>34</version> <version>36</version>
<wantNonLocal>1</wantNonLocal> <wantNonLocal>1</wantNonLocal>
<debug>0</debug> <debug>0</debug>
<option> <option>
@ -1184,7 +1214,7 @@
</option> </option>
<option> <option>
<name>OGLastSavedByProductVersion</name> <name>OGLastSavedByProductVersion</name>
<state>9.20.1.43525</state> <state>9.40.2.67586</state>
</option> </option>
<option> <option>
<name>OGChipSelectEditMenu</name> <name>OGChipSelectEditMenu</name>
@ -1212,7 +1242,7 @@
</option> </option>
<option> <option>
<name>GBECoreSlave</name> <name>GBECoreSlave</name>
<version>31</version> <version>33</version>
<state>39</state> <state>39</state>
</option> </option>
<option> <option>
@ -1229,7 +1259,7 @@
</option> </option>
<option> <option>
<name>CoreVariant</name> <name>CoreVariant</name>
<version>31</version> <version>33</version>
<state>39</state> <state>39</state>
</option> </option>
<option> <option>
@ -1252,7 +1282,7 @@
</option> </option>
<option> <option>
<name>GFPUCoreSlave2</name> <name>GFPUCoreSlave2</name>
<version>31</version> <version>33</version>
<state>39</state> <state>39</state>
</option> </option>
<option> <option>
@ -1317,13 +1347,26 @@
<name>BuildFilesPath</name> <name>BuildFilesPath</name>
<state>Release</state> <state>Release</state>
</option> </option>
<option>
<name>PointerAuthentication</name>
<state>0</state>
</option>
<option>
<name>FPU64</name>
<state>1</state>
</option>
<option>
<name>OG_32_64DeviceCoreSlave</name>
<version>33</version>
<state>39</state>
</option>
</data> </data>
</settings> </settings>
<settings> <settings>
<name>ICCARM</name> <name>ICCARM</name>
<archiveVersion>2</archiveVersion> <archiveVersion>2</archiveVersion>
<data> <data>
<version>37</version> <version>38</version>
<wantNonLocal>1</wantNonLocal> <wantNonLocal>1</wantNonLocal>
<debug>0</debug> <debug>0</debug>
<option> <option>
@ -1610,13 +1653,21 @@
<name>CCStackProtection</name> <name>CCStackProtection</name>
<state>0</state> <state>0</state>
</option> </option>
<option>
<name>CCPointerAutentiction</name>
<state>0</state>
</option>
<option>
<name>CCBranchTargetIdentification</name>
<state>0</state>
</option>
</data> </data>
</settings> </settings>
<settings> <settings>
<name>AARM</name> <name>AARM</name>
<archiveVersion>2</archiveVersion> <archiveVersion>2</archiveVersion>
<data> <data>
<version>11</version> <version>12</version>
<wantNonLocal>1</wantNonLocal> <wantNonLocal>1</wantNonLocal>
<debug>0</debug> <debug>0</debug>
<option> <option>
@ -1776,6 +1827,10 @@
<name>PreInclude</name> <name>PreInclude</name>
<state></state> <state></state>
</option> </option>
<option>
<name>A_32_64Device</name>
<state>1</state>
</option>
</data> </data>
</settings> </settings>
<settings> <settings>
@ -1818,19 +1873,11 @@
<buildSequence>inputOutputBased</buildSequence> <buildSequence>inputOutputBased</buildSequence>
</data> </data>
</settings> </settings>
<settings>
<name>BUILDACTION</name>
<archiveVersion>1</archiveVersion>
<data>
<prebuild></prebuild>
<postbuild></postbuild>
</data>
</settings>
<settings> <settings>
<name>ILINK</name> <name>ILINK</name>
<archiveVersion>0</archiveVersion> <archiveVersion>0</archiveVersion>
<data> <data>
<version>26</version> <version>27</version>
<wantNonLocal>1</wantNonLocal> <wantNonLocal>1</wantNonLocal>
<debug>0</debug> <debug>0</debug>
<option> <option>
@ -2190,6 +2237,14 @@
<name>IlinkWrapperFile</name> <name>IlinkWrapperFile</name>
<state></state> <state></state>
</option> </option>
<option>
<name>IlinkProcessor</name>
<state>1</state>
</option>
<option>
<name>IlinkFpuProcessor</name>
<state>1</state>
</option>
</data> </data>
</settings> </settings>
<settings> <settings>
@ -2213,6 +2268,11 @@
</option> </option>
</data> </data>
</settings> </settings>
<settings>
<name>BUILDACTION</name>
<archiveVersion>2</archiveVersion>
<data />
</settings>
</configuration> </configuration>
<group> <group>
<name>APP</name> <name>APP</name>
@ -2375,7 +2435,7 @@
<settings> <settings>
<name>ICCARM</name> <name>ICCARM</name>
<data> <data>
<version>37</version> <version>38</version>
<wantNonLocal>0</wantNonLocal> <wantNonLocal>0</wantNonLocal>
<debug>1</debug> <debug>1</debug>
<option> <option>
@ -2669,6 +2729,14 @@
<name>CCStackProtection</name> <name>CCStackProtection</name>
<state>0</state> <state>0</state>
</option> </option>
<option>
<name>CCPointerAutentiction</name>
<state>0</state>
</option>
<option>
<name>CCBranchTargetIdentification</name>
<state>0</state>
</option>
</data> </data>
</settings> </settings>
</configuration> </configuration>
@ -2900,7 +2968,7 @@
<settings> <settings>
<name>ICCARM</name> <name>ICCARM</name>
<data> <data>
<version>37</version> <version>38</version>
<wantNonLocal>0</wantNonLocal> <wantNonLocal>0</wantNonLocal>
<debug>1</debug> <debug>1</debug>
<option> <option>
@ -3192,6 +3260,14 @@
<name>CCStackProtection</name> <name>CCStackProtection</name>
<state>0</state> <state>0</state>
</option> </option>
<option>
<name>CCPointerAutentiction</name>
<state>0</state>
</option>
<option>
<name>CCBranchTargetIdentification</name>
<state>0</state>
</option>
</data> </data>
</settings> </settings>
</configuration> </configuration>

File diff suppressed because it is too large Load Diff