dplimin
/
A1210
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: dplimin:d9a67974ae66d45ebe13a5b35c744f459e8f2201
Branches Tags
dplimin:main
..
compare: dplimin:138b0c26aad3beafbebde6b4d74a61981af0d768
Branches Tags
dplimin:main

2 Commits
d9a67974ae ... 138b0c26aa

Author SHA1 Message Date
dplimin 138b0c26aa Merge branch 'main' of https://git.gtlab.pro/dplimin/A1210 2023-12-07 16:53:12 +03:00
dplimin 4a41b4f599 modified: .settings/language.settings.xml 
modified:   Core/Src/flash.c
	modified:   Core/Src/main.c
	modified:   Core/Src/modbus.c
 2023-12-07 16:51:36 +03:00
4 changed files with 19 additions and 12 deletions
Show Stats Expand all files Collapse all files

4
.settings/language.settings.xml
View File

@ -4,7 +4,7 @@
<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="-1229430809610863902" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="987426691714162305" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
@ -14,7 +14,7 @@
<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="-1229430809610863902" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="987426691714162305" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>

7
Core/Src/flash.c
View File

@ -62,6 +62,9 @@ uint32_t SECTORError = 0;
}
lenpar >>= 2; //äåëèì íà 4
HAL_FLASH_Unlock(); //îòêðûâàåì ïàìÿòü íà çàïèñü
if(HAL_FLASHEx_Erase(&FlashEraseInitPar, &SECTORError) == HAL_OK) //
{
@ -74,11 +77,15 @@ uint32_t SECTORError = 0;
}
}
HAL_FLASH_Lock();
}
void wrCor(void) ///ïîïðîáóåì ïåðåïèñàòü ýòî ïîä ìîé ìàññèâ
{
__IO uint32_t Address, lenpar, i;
__IO uint32_t *pData;
uint32_t SECTORError = 0;

15
Core/Src/main.c
View File

@ -121,17 +121,22 @@ int main(void)
while (workMode==NORMAL){
HAL_UART_Receive_IT(&huart1, (uint8_t*)buff, 1); //íà÷àëî öåïî÷êè ïðåðûâàíèé
check_reload();
keysHandler();
if(needSave)
{
needSave = false;
//wrPar();
sh_applysetting(&currentData);
wrPar();
}
HAL_UART_Receive_IT(&huart1, (uint8_t*)buff, 1); //íà÷àëî öåïî÷êè ïðåðûâàíèé
check_reload();
keysHandler();
if(RefreshScreen){
screenDraw();
ssd1306_UpdateScreen();

5
Core/Src/modbus.c
View File

@ -510,14 +510,9 @@ void Receive_Complete(void){ //я сейчас попробую раскоме
else
if(iobuf[6] == 8)
{
/*for(j = 0; j < 4; j++)
f.ch[3 - j] = iobuf[3 + j];
pardata.SENS = f.fl;*/
//Если сюда попали то что то идет не так
for(j = 0; j < 4; j++)
f.ch[3 - j] = iobuf[7 + j];
currentData.ACCEL = f.fl;
needSave = true;
strtOut(6);
}