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

modified: Core/Inc/my.h 

modified:   Core/Src/flash.c
	modified:   Core/Src/keys.c
	modified:   Core/Src/modbus.c
	modified:   Core/Src/screen.c
main
dplimin 2023-12-27 09:48:42 +03:00
parent c58de0f903
commit 0ef6d0d1f1
5 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Core/Inc/my.h
View File

@ -83,10 +83,14 @@ typedef enum //
}callibrationMenuState;
typedef enum{ //перечисления для единиц измерения
MS2=0,
PA,
H
typedef enum{Accel = 0,
Velocity,
Pascal,
k_Pascal,
M_Pascal,
Nython,
k_Nuthon,
mV,
} unit;
int asciiToFloat4(uint16_t str[]); //todo: çàïðàâèòü ôóíêöèè íå èñïîëüçóþùèåñÿ âíå

2
Core/Src/flash.c
View File

@ -148,7 +148,7 @@ volatile bool rewrite = false;
currentData.KCOND = 1.0f;
currentData.SENS = 1.0f;
currentData.UNIT =MS2;
currentData.UNIT =Accel;
rewrite = true;
}

4
Core/Src/keys.c
View File

@ -146,8 +146,8 @@ void keysHandler(void){
break;
case UNITSELECT:
if((key==UP_BTN_Pin)&&(currentData.UNIT<H)) {currentData.UNIT++; sh_applysetting(&currentData);}
if((key==DN_BTN_Pin)&&(currentData.UNIT>MS2)) {currentData.UNIT--; sh_applysetting(&currentData);}
if((key==UP_BTN_Pin)&&(currentData.UNIT<mV)) {currentData.UNIT++; sh_applysetting(&currentData);}
if((key==DN_BTN_Pin)&&(currentData.UNIT>Accel)) {currentData.UNIT--; sh_applysetting(&currentData);}
break;
case OUT:

2
Core/Src/modbus.c
View File

@ -408,7 +408,7 @@ void Receive_Complete(void){ //я сейчас попробую раскоме
*(pch + (j ^ 1)) = iobuf[j + 7];
if((recivedData.IIN > 0) || (recivedData.IKU > Ku1000) || (recivedData.IFV > Hp10)
|| (recivedData.IFN > Lp100000) || (recivedData.UNIT > H) || (recivedData.IPZ > 1)|| (recivedData.OVERLOAD > 1))
|| (recivedData.IFN > Lp100000) || (recivedData.UNIT > mV) || (recivedData.IPZ > 1)|| (recivedData.OVERLOAD > 1))
{
tx[0] = iobuf[0];
tx[1] = (iobuf[1] | 0x80);

43
Core/Src/screen.c
View File

@ -14,7 +14,7 @@ extern uint8_t iobuf[256];
const char STRING_DATCHIK[] = "Lfnxbr";
const char STRING_DATCHIK[] = "D[jl";
const char STRING_PKL[] = "gRk/";
const char STRING_VIHOD[] = "Ds[jl";
@ -44,14 +44,7 @@ const char STRING_Ku200[] = "200";
const char STRING_Ku500[] = "500";
const char STRING_Ku1000[] = "1000";
const char *STRINGS_UNITS[]={"vc2","Gf","Y&"};
const char *STRINGS_UNITS[]={"v/c2","vv/c","Gf","rGf","VGf","Y","rY","vD"};
const char *STRINGS_OUTUNITS[] = {"0~0001vD/",
@ -237,30 +230,30 @@ void screenDraw(void)
FontSet(Segoe_UI_Rus_10);
OLED_DrawStr(STRING_DATCHIK, 1, 10, TEXT);
if(menuPointer==KPR0) DrawSome(currentData.IK0, 40, 10, CURSOR);
else DrawSome(currentData.IK0, 40, 10, TEXT);
if(menuPointer==KPR0) DrawSome(currentData.IK0, 30, 10, CURSOR);
else DrawSome(currentData.IK0, 30, 10, TEXT);
if(menuPointer==KPR1) DrawSome(currentData.IK1, 47, 10, CURSOR);
else DrawSome(currentData.IK1, 47, 10, TEXT);
if(menuPointer==KPR1) DrawSome(currentData.IK1, 37, 10, CURSOR);
else DrawSome(currentData.IK1, 37, 10, TEXT);
if(menuPointer==KPR2) DrawSome(currentData.IK2, 54, 10, CURSOR);
else DrawSome(currentData.IK2, 54, 10, TEXT);
if(menuPointer==KPR2) DrawSome(currentData.IK2, 44, 10, CURSOR);
else DrawSome(currentData.IK2, 44, 10, TEXT);
if(menuPointer==KPR3) DrawSome(currentData.IK3, 61, 10, CURSOR);
else DrawSome(currentData.IK3, 61, 10, TEXT);
if(menuPointer==KPR3) DrawSome(currentData.IK3, 51, 10, CURSOR);
else DrawSome(currentData.IK3, 51, 10, TEXT);
if(menuPointer==KPR4) DrawSome(currentData.IK4, 68, 10, CURSOR);
else DrawSome(currentData.IK4, 68, 10, TEXT);
if(menuPointer==KPR4) DrawSome(currentData.IK4, 58, 10, CURSOR);
else DrawSome(currentData.IK4, 58, 10, TEXT);
if(menuPointer==KPR5) DrawSome(currentData.IK5, 75, 10, CURSOR);
else DrawSome(currentData.IK5, 75, 10, TEXT);
if(menuPointer==KPR5) DrawSome(currentData.IK5, 65, 10, CURSOR);
else DrawSome(currentData.IK5, 65, 10, TEXT);
if(menuPointer==UNITSELECT){
OLED_DrawStr(STRING_PKL, 85, 10, CURSOR);
OLED_DrawStr(STRINGS_UNITS[currentData.UNIT], 109, 10, CURSOR);
OLED_DrawStr(STRING_PKL, 75, 10, CURSOR);
OLED_DrawStr(STRINGS_UNITS[currentData.UNIT], 99, 10, CURSOR);
} else {
OLED_DrawStr(STRING_PKL, 85, 10, TEXT);
OLED_DrawStr(STRINGS_UNITS[currentData.UNIT], 109, 10, TEXT);
OLED_DrawStr(STRING_PKL, 75, 10, TEXT);
OLED_DrawStr(STRINGS_UNITS[currentData.UNIT], 99, 10, TEXT);
}
////////////////////////////