fix: update line endings and adjust stlink configuration

This commit is contained in:
2025-03-21 04:37:49 +08:00
parent 815d853680
commit ed81361876
4 changed files with 60 additions and 349 deletions

51
.idea/workspace.xml generated
View File

@ -29,7 +29,10 @@
</component>
<component name="ChangeListManager">
<list default="true" id="56631632-52f0-4e39-b905-89e46eb6e768" name="Changes" comment="feat: rcc522 card reader">
<change beforePath="$PROJECT_DIR$/.idea/editor.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/editor.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Core/Src/main.c" beforeDir="false" afterPath="$PROJECT_DIR$/Core/Src/main.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/stlinkv2.cfg" beforeDir="false" afterPath="$PROJECT_DIR$/stlinkv2.cfg" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -39,10 +42,51 @@
<component name="ClangdSettings">
<option name="formatViaClangd" value="false" />
</component>
<component name="EmbeddedSvdWindowState">
<option name="columnWidths">
<list>
<option value="237" />
<option value="102" />
<option value="2087" />
</list>
</option>
<option name="columnOrder">
<list>
<option value="Name" />
<option value="Value" />
<option value="Description" />
</list>
</option>
<option name="loadedFiles">
<list>
<option value="$PROJECT_DIR$/../../../environment/embedded/svd/STM32F103.svd" />
</list>
</option>
<option name="nodes">
<map>
<entry key="STM32F103.svd" value="-E" />
<entry key="STM32F103.svd|g:I2C" value="-E" />
<entry key="STM32F103.svd|p:I2C1" value="-E" />
<entry key="STM32F103.svd|p:I2C1|CCR" value="HC" />
<entry key="STM32F103.svd|p:I2C1|CR1" value="HC" />
<entry key="STM32F103.svd|p:I2C1|CR2" value="HC" />
<entry key="STM32F103.svd|p:I2C1|DR" value="HC" />
<entry key="STM32F103.svd|p:I2C1|OAR1" value="HC" />
<entry key="STM32F103.svd|p:I2C1|OAR2" value="HC" />
<entry key="STM32F103.svd|p:I2C1|SR1" value="HC" />
<entry key="STM32F103.svd|p:I2C1|SR2" value="HC" />
<entry key="STM32F103.svd|p:I2C1|TRISE" value="HC" />
</map>
</option>
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="CMakeBuildProfile:Debug" />
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="HighlightingSettingsPerFile">
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
</component>
<component name="ProjectApplicationVersion">
<option name="ide" value="CLion" />
<option name="majorVersion" value="2024" />
@ -82,7 +126,7 @@
&quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
&quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
&quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
&quot;settings.editor.selected.configurable&quot;: &quot;CMakeSettings&quot;,
&quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
}
}</component>
@ -98,7 +142,7 @@
</method>
</configuration>
<configuration name="OCD IntelliChargingPile" type="com.jetbrains.cidr.embedded.openocd.conf.type" factoryName="com.jetbrains.cidr.embedded.openocd.conf.factory" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="IntelliChargingPile" TARGET_NAME="IntelliChargingPile.elf" CONFIG_NAME="Debug" version="1" RUN_TARGET_PROJECT_NAME="IntelliChargingPile" RUN_TARGET_NAME="IntelliChargingPile.elf">
<openocd version="1" gdb-port="3333" telnet-port="4444" board-config="V:\projects\School\IntelliChargingPile\stlinkv2.cfg" reset-type="INIT" download-type="UPDATED_ONLY">
<openocd version="1" gdb-port="3333" telnet-port="4444" board-config="$PROJECT_DIR$/stlinkv2.cfg" reset-type="INIT" download-type="UPDATED_ONLY">
<debugger kind="GDB" isBundled="true" />
</openocd>
<method v="2">
@ -123,6 +167,9 @@
<workItem from="1742385111843" duration="9995000" />
<workItem from="1742408425253" duration="9681000" />
<workItem from="1742495966352" duration="2000" />
<workItem from="1742497853368" duration="50000" />
<workItem from="1742497908822" duration="4076000" />
<workItem from="1742502978318" duration="1000" />
</task>
<task id="LOCAL-00001" summary="initial commit: oled, rc522, exti">
<option name="closed" value="true" />