dimoniche/solarium.vlad
1
0
Fork 0
mirror of https://github.com/dimoniche/solarium.vlad.git synced 2026-01-30 21:13:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Исправление ошибок

Browse Source
This commit is contained in:
Dmitriy 2025-06-04 22:36:30 +03:00
parent 0da9014b61
commit ca5f28a589
9 changed files with 1283 additions and 1269 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
PROJECT/menu/menudesc.c
View File

@ -1590,7 +1590,7 @@ const TMenuLine line_AbonementMenuSet_3 = {
NULL // ïàíåëü äëÿ ïåðåõîäà NULL // ïàíåëü äëÿ ïåðåõîäà
}; };
const TMenuLineArray arr_AbonementMenuArray[] = {&line_AbonementMenuSet_0, &line_AbonementMenuSet_1, &line_AbonementMenuSet_2, &line_AbonementMenuSet_2, NULL}; const TMenuLineArray arr_AbonementMenuArray[] = {&line_AbonementMenuSet_0, &line_AbonementMenuSet_1, &line_AbonementMenuSet_2, &line_AbonementMenuSet_3, NULL};
const TMenuPanel AbonementSetupPanel[] = {arr_AbonementMenuArray, NULL, 4, MENU_PANEL_STANDARD}; const TMenuPanel AbonementSetupPanel[] = {arr_AbonementMenuArray, NULL, 4, MENU_PANEL_STANDARD};
/*********************************** /***********************************
@ -2279,8 +2279,8 @@ const TMenuPanel FrIsOffMenuPanel[] = {arr_FrIsOffMenuArray, NULL, 3, MENU_PANEL
/*********************************** /***********************************
ÌÅÍÞ ÏÐÎÑÌÎÒÐ ÆÓÐÍÀËÀ ÑÎÁÛÒÈÉ ÌÅÍÞ ÏÐÎÑÌÎÒÐ ÆÓÐÍÀËÀ ÑÎÁÛÒÈÉ
***********************************/ ***********************************/
char str_EventNumber[24]; char str_EventNumber[40];
char str_EventData[24]; char str_EventData[40];
const TMenuLine line_EventJournalMenu_0 = { const TMenuLine line_EventJournalMenu_0 = {
MENU_LINE_SHOW_DESC, // òèï ïóíêòà ìåíþ MENU_LINE_SHOW_DESC, // òèï ïóíêòà ìåíþ
@ -2370,14 +2370,28 @@ void PrintEventJournalRecord(TEventRecord *record, char *str_event, char *str_da
} }
else if (record->event == JOURNAL_EVENT_ABONEMENT_ACCEPTED) else if (record->event == JOURNAL_EVENT_ABONEMENT_ACCEPTED)
{ {
sprintf(str_data, "%dðóá %dÁ", record->data, record->channel);
sprintf(&str_event[strlen(str_event)], " %dð %d", record->money, record->bonus); sprintf(&str_event[strlen(str_event)], " %dð %d", record->money, record->bonus);
char str[32]; char str[32];
PrintDateString(str, record->time_before); PrintDateString(str, record->time_before);
sprintf(str_data, "%x %dð %dÁ %s", record->number_abonement, record->money_sum, record->bonus_sum, str); sprintf(str_data, "%x %dð %dÁ %s", record->number_abonement, record->money_sum, record->bonus_sum, str);
// äîáàâèì â str_event ïðîáåëîâ äî äëèíû str_data ÷òîáû îíè îäíîâðåìåííî ïðîêðó÷èâàëèñü
CPU_INT08U len_event = strlen(str_event);
CPU_INT08U len_data = strlen(str_data);
if(len_data > len_event)
{
CPU_INT08U i = 0;
for(i = 0; i < len_data - len_event; i++)
{
str_event[len_event + i] = 0x20;
}
str_event[len_event + i] = 0x00;
}
} }
else if (record->event == JOURNAL_EVENT_ABONEMENT_PAY_ACCEPTED) else if (record->event == JOURNAL_EVENT_ABONEMENT_PAY_ACCEPTED)
{ {

4
PROJECT/menu/menudesc.h
View File

@ -85,8 +85,8 @@ extern int PrintUserMenuStr(char* str, CPU_INT08U n);
extern int PrintUserMenuStrUnalign(char* str, CPU_INT08U n); extern int PrintUserMenuStrUnalign(char* str, CPU_INT08U n);
extern void PrintEventJournalRecord(TEventRecord *record, char *str_event, char *str_data); extern void PrintEventJournalRecord(TEventRecord *record, char *str_event, char *str_data);
extern char str_EventNumber[24]; extern char str_EventNumber[40];
extern char str_EventData[24]; extern char str_EventData[40];
extern char str_UserMenu_0[22]; extern char str_UserMenu_0[22];
extern char str_UserMenu_1[22]; extern char str_UserMenu_1[22];

2
PROJECT/version.h
View File

@ -4,7 +4,7 @@
#if defined(BOARD_SOLARIUM_WEB) #if defined(BOARD_SOLARIUM_WEB)
#define DEVICE_FW_VERSION "7.09" #define DEVICE_FW_VERSION "7.09"
#elif defined(BOARD_SOLARIUM_VLAD) #elif defined(BOARD_SOLARIUM_VLAD)
#define DEVICE_FW_VERSION "8.52" #define DEVICE_FW_VERSION "8.53"
#elif defined(BOARD_CENTRAL_CARWASH) || defined(BOARD_POST_CARWASH) #elif defined(BOARD_CENTRAL_CARWASH) || defined(BOARD_POST_CARWASH)
#define DEVICE_FW_VERSION "5.55" #define DEVICE_FW_VERSION "5.55"
#endif #endif

4
settings/sk-mlpc2368.Solarium_Vlad.cspy.bat
View File

@ -25,7 +25,7 @@ if not "%~1" == "" goto debugFile
@echo on @echo on
"C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.general.xcl" --backend -f "C:\work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.driver.xcl" "C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\git_work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.general.xcl" --backend -f "C:\git_work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.driver.xcl"
@echo off @echo off
goto end goto end
@ -34,7 +34,7 @@ goto end
@echo on @echo on
"C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.general.xcl" "--debug_file=%~1" --backend -f "C:\work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.driver.xcl" "C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\git_work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.general.xcl" "--debug_file=%~1" --backend -f "C:\git_work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.driver.xcl"
@echo off @echo off
:end :end

4
settings/sk-mlpc2368.Solarium_Vlad.cspy.ps1
View File

@ -23,9 +23,9 @@
if ($debugfile -eq "") if ($debugfile -eq "")
{ {
& "C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.general.xcl" --backend -f "C:\work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.driver.xcl" & "C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\git_work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.general.xcl" --backend -f "C:\git_work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.driver.xcl"
} }
else else
{ {
& "C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.general.xcl" --debug_file=$debugfile --backend -f "C:\work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.driver.xcl" & "C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\git_work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.general.xcl" --debug_file=$debugfile --backend -f "C:\git_work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.driver.xcl"
} }

2
settings/sk-mlpc2368.Solarium_Vlad.general.xcl
View File

@ -2,7 +2,7 @@
"C:\Program Files\IAR Systems\Embedded Workbench 9.0\arm\bin\armJLINK.dll" "C:\Program Files\IAR Systems\Embedded Workbench 9.0\arm\bin\armJLINK.dll"
"C:\work\solarium.vlad\Solarium Vlad\Exe\sk_mlpc2368.out" "C:\git_work\solarium.vlad\Solarium Vlad\Exe\sk_mlpc2368.out"
--plugin="C:\Program Files\IAR Systems\Embedded Workbench 9.0\arm\bin\armbat.dll" --plugin="C:\Program Files\IAR Systems\Embedded Workbench 9.0\arm\bin\armbat.dll"

36
settings/sk-mlpc2368.wsdt
View File

File diff suppressed because one or more lines are too long

2474
sk-mlpc2368.dep
View File

File diff suppressed because it is too large Load Diff

2
sk-mlpc2368.ewp
View File

@ -5003,7 +5003,7 @@
</option> </option>
<option> <option>
<name>OOCOutputFile</name> <name>OOCOutputFile</name>
<state>solarium_vlad_8_52.hex</state> <state>solarium_vlad_8_53.hex</state>
</option> </option>
<option> <option>
<name>OOCCommandLineProducer</name> <name>OOCCommandLineProducer</name>