dimoniche/Moyka
1
0
Fork 0
mirror of https://github.com/dimoniche/Moyka.git synced 2026-01-29 17:33:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

errors

Browse Source
This commit is contained in:
dimoniche 2019-07-28 16:05:35 +03:00
parent 15c0fc19c2
commit 11f1bcc96f
9 changed files with 244 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PROJECT/app/app_serv.c
View File

@ -447,7 +447,8 @@ void UserAppTask(void *p_arg)
if (accmoney > 0)
{
wash_State[number_post] = washing;
wash_State[number_post] = washing;
SaveEventRecord(0, JOURNAL_EVENT_WASHING, number_post);
}
}
break;

31
PROJECT/app/journal.c
View File

@ -255,18 +255,12 @@ void GetEventStr(char* str, char event)
case JOURNAL_EVENT_CHANGE_MODE:
sprintf(str, "Ñìåíà ðåæèìà");
break;
case JOURNAL_EVENT_INCASSATION:
sprintf(str, "Èíêàññàöèÿ");
case JOURNAL_EVENT_WASHING:
sprintf(str, "Ìîéêà");
break;
case JOURNAL_EVENT_PASS_FAIL:
sprintf(str, "Íåâåðíûé ïàðîëü");
break;
case JOURNAL_EVENT_EMAIL_FAIL:
sprintf(str, "Îøèáêà îòïð.e-mail");
break;
case JOURNAL_EVENT_EMAIL_OK:
sprintf(str, "E-mail îòïð.óñïåøíî");
break;
default:
sprintf(str, "íåò");
break;
@ -367,18 +361,12 @@ void GetEventStrEng(char* str, char event)
case JOURNAL_EVENT_CHANGE_MODE:
sprintf(str, " | Smena rejima ");
break;
case JOURNAL_EVENT_INCASSATION:
sprintf(str, " | Incassaciya ");
case JOURNAL_EVENT_WASHING:
sprintf(str, " | Moyka ");
break;
case JOURNAL_EVENT_PASS_FAIL:
sprintf(str, " | Neverniy parol' ");
break;
case JOURNAL_EVENT_EMAIL_FAIL:
sprintf(str, " | Oshibka otpravki e-mail ");
break;
case JOURNAL_EVENT_EMAIL_OK:
sprintf(str, " | E-mail otpravleno uspeshno ");
break;
break;
default:
sprintf(str, " | Net sobytiya ");
break;
@ -446,18 +434,15 @@ void PrintEventJournalRecordEng(char* str, TEventRecord *record)
if (record->data == MODE_WORK) sprintf(&str[strlen(str)], "rabota");
else sprintf(&str[strlen(str)], "nastroika");
}
else if (record->event == JOURNAL_EVENT_INCASSATION)
else if (record->event == JOURNAL_EVENT_WASHING)
{
sprintf(&str[strlen(str)], "%u rub.", record->data);
sprintf(&str[strlen(str)], "%u post.", record->data + 1);
}
else if (record->event == JOURNAL_EVENT_PASS_FAIL)
{
sprintf(&str[strlen(str)], "%u", record->data);
}
else if ((record->event == JOURNAL_EVENT_EMAIL_OK) || (record->event == JOURNAL_EVENT_EMAIL_FAIL))
{
sprintf(&str[strlen(str)], "");
}
sprintf(&str[strlen(str)], "\r\n");
}
else

6
PROJECT/app/journal.h
View File

@ -62,10 +62,10 @@ typedef struct{
#define JOURNAL_EVENT_PRINT_X 40 // ïå÷àòü x-îò÷åòà
#define JOURNAL_EVENT_PRINT_BUF 41 // ïå÷àòü x-îò÷åòà
#define JOURNAL_EVENT_CHANGE_MODE 42 // ñìåíà ðåæèìà
#define JOURNAL_EVENT_INCASSATION 43 // èíêàññàöèÿ
#define JOURNAL_EVENT_WASHING 43 // çàïóñê ìîéêè
#define JOURNAL_EVENT_PASS_FAIL 44 // íåâåðíûé ââîä ïàðîëÿ
#define JOURNAL_EVENT_EMAIL_OK 45 // ïðàâèëüíî îòïðàâëåí email
#define JOURNAL_EVENT_EMAIL_FAIL 46 // îøèáêà ïðè îòïðàâêå email
#define JOURNAL_EVENT_EMPTY1 45 //
#define JOURNAL_EVENT_EMPTY2 46 //
// îøèáêà ñâÿçè ñ ôèñêàëüíèêîì
#define ERROR_FR_CONN 47

25
PROJECT/data/datadesc.c
View File

@ -884,6 +884,31 @@ void OnChangeLevel()
SetLevelParam(level1, level2, level3, level4, post);
}
#if OS_CRITICAL_METHOD == 3
OS_CPU_SR cpu_sr = 0;
#endif
OS_ENTER_CRITICAL();
InitInputPorts();
OS_EXIT_CRITICAL();
}
void OnChangeLevelWithoutInit()
{
CPU_INT32U level1, level2, level3, level4;
for(int post = 0; post < COUNT_POST + COUNT_VACUUM; post++)
{
if(post < COUNT_POST)
{
GetData(&CashLevelDesc, &level1, post, DATA_FLAG_DIRECT_INDEX);
GetData(&BankLevelDesc, &level2, post, DATA_FLAG_DIRECT_INDEX);
GetData(&SignalStopMoneyLevelDesc, &level3, post, DATA_FLAG_DIRECT_INDEX);
}
GetData(&CoinLevelDesc, &level4, post, DATA_FLAG_DIRECT_INDEX);
SetLevelParam(level1, level2, level3, level4, post);
}
}
/*************************************

3
PROJECT/data/datadesc.h
View File

@ -153,6 +153,7 @@ extern TDataDescStruct const CashPauseLenDesc;
extern void OnChangeCashPulseLen();
extern void OnChangeSinalPulseLen();
extern void OnChangeLevel();
extern void OnChangeLevelWithoutInit();
extern TDataDescStruct const CoinPulseLenDesc;
extern TDataDescStruct const CoinPauseLenDesc;
@ -187,4 +188,6 @@ extern TDataDescStruct const BankLevelDesc;
extern TDataDescStruct const CoinTimeOutDesc;
extern void OnChangeBankPulseLen();
#endif //#ifndef _DATADESC_H_

8
PROJECT/menu/menudesc.c
View File

@ -1425,18 +1425,14 @@ void PrintEventJournalRecord(TEventRecord *record)
if (record->data == MODE_WORK) sprintf(str_EventData, "ðàáîòà");
else sprintf(str_EventData, "íàñòðîéêà");
}
else if (record->event == JOURNAL_EVENT_INCASSATION)
else if (record->event == JOURNAL_EVENT_WASHING)
{
sprintf(str_EventData, "%u ðóá.", record->data);
sprintf(str_EventData, "Ïîñò %d", record->data + 1);
}
else if (record->event == JOURNAL_EVENT_PASS_FAIL)
{
sprintf(str_EventData, "%u", record->data);
}
else if ((record->event == JOURNAL_EVENT_EMAIL_OK) || (record->event == JOURNAL_EVENT_EMAIL_FAIL))
{
sprintf(str_EventData, "");
}
else
{
GetDataItem(&JournalErrorNumberDesc0, (CPU_INT08U*)str_EventNumber, record->event);

358
PROJECT/services/coin.c
View File

@ -390,13 +390,18 @@ void InitCoin(void)
CashImpCounter[i] = 0;
BankImpCounter[i] = 0;
coin_pulse[i] = 50;
coin_pause[i] = 20;
pend_coin_counter[i] = 0;
pend_coin_timestamp[i] = 0;
cash_pulse[i] = 50;
cash_pause[i] = 50;
cash_pause[i] = 20;
pend_cash_counter[i] = 0;
pend_cash_timestamp[i] = 0;
bank_pulse[i] = 50;
bank_pause[i] = 50;
bank_pause[i] = 20;
pend_bank_counter[i] = 0;
pend_bank_timestamp[i] = 0;
@ -1073,6 +1078,192 @@ void InputCapture_ISR(void)
extern CPU_INT32U BSP_CPU_PclkFreq (CPU_INT08U pclk);
void InitInputPorts()
{
// êóïşğîïğèåìíèê 1
PINSEL3_bit.P1_20 = 0;
if(cashLevel[0])PINMODE3_bit.P1_20 = 3;
else PINMODE3_bit.P1_20 = 0;
FIO1DIR_bit.P1_20 = 0;
FIO1MASK_bit.P1_20 = 0;
// ìîíåòîïğèåìíèê 1
PINSEL3_bit.P1_21 = 0;
if(coinLevel[0])PINMODE3_bit.P1_21 = 3;
else PINMODE3_bit.P1_21 = 0;
FIO1DIR_bit.P1_21 = 0;
FIO1MASK_bit.P1_21 = 0;
// ñèãíàë ïå÷àòè ÷åêà ïîñò 1
PINSEL9_bit.P4_28 = 0;
if(SignalLevel[0])PINMODE9_bit.P4_28 = 3;
else PINMODE9_bit.P4_28 = 0;
FIO4DIR_bit.P4_28 = 0;
FIO4MASK_bit.P4_28 = 0;
// êóïşğîïğèåìíèê 2
PINSEL3_bit.P1_19 = 0;
if(cashLevel[1])PINMODE3_bit.P1_19 = 3;
else PINMODE3_bit.P1_19 = 0;
FIO1DIR_bit.P1_19 = 0;
FIO1MASK_bit.P1_19 = 0;
// ìîíåòîïğèåìíèê 2
PINSEL3_bit.P1_18 = 0;
if(coinLevel[1])PINMODE3_bit.P1_18 = 3;
else PINMODE3_bit.P1_18 = 0;
FIO1DIR_bit.P1_18 = 0;
FIO1MASK_bit.P1_18 = 0;
// ñèãíàë ïå÷àòè ÷åêà ïîñò 2
PINSEL0_bit.P0_4 = 0;
if(SignalLevel[1])PINMODE0_bit.P0_4 = 3;
else PINMODE0_bit.P0_4 = 0;
FIO0DIR_bit.P0_4 = 0;
FIO0MASK_bit.P0_4 = 0;
// êóïşğîïğèåìíèê 3
PINSEL7_bit.P3_25 = 0;
if(cashLevel[2])PINMODE7_bit.P3_25 = 3;
else PINMODE7_bit.P3_25 = 0;
FIO3DIR_bit.P3_25 = 0;
FIO3MASK_bit.P3_25 = 0;
// ìîíåòîïğèåìíèê 3
PINSEL7_bit.P3_26 = 0;
if(coinLevel[2])PINMODE7_bit.P3_26 = 3;
else PINMODE7_bit.P3_26 = 0;
FIO3DIR_bit.P3_26 = 0;
FIO3MASK_bit.P3_26 = 0;
// ñèãíàë ïå÷àòè ÷åêà ïîñò 3
PINSEL3_bit.P1_28 = 0;
if(SignalLevel[2])PINMODE3_bit.P1_28 = 3;
else PINMODE3_bit.P1_28 = 0;
FIO1DIR_bit.P1_28 = 0;
FIO1MASK_bit.P1_28 = 0;
// êóïşğîïğèåìíèê 4
PINSEL1_bit.P0_26 = 0;
if(cashLevel[3])PINMODE1_bit.P0_26 = 3;
else PINMODE1_bit.P0_26 = 0;
FIO0DIR_bit.P0_26 = 0;
FIO0MASK_bit.P0_26 = 0;
// ìîíåòîïğèåìíèê 4
PINSEL1_bit.P0_25 = 0;
if(coinLevel[3])PINMODE1_bit.P0_25 = 3;
else PINMODE1_bit.P0_25 = 0;
FIO0DIR_bit.P0_25 = 0;
FIO0MASK_bit.P0_25 = 0;
// ñèãíàë ïå÷àòè ÷åêà ïîñò 4
PINSEL3_bit.P1_27 = 0;
PINMODE3_bit.P1_27 = 0;
if(SignalLevel[3])PINMODE3_bit.P1_27 = 3;
else PINMODE3_bit.P1_27 = 0;
FIO1DIR_bit.P1_27 = 0;
FIO1MASK_bit.P1_27 = 0;
// êóïşğîïğèåìíèê 5
PINSEL0_bit.P0_9 = 0;
if(cashLevel[4])PINMODE0_bit.P0_9 = 3;
else PINMODE0_bit.P0_9 = 0;
FIO0DIR_bit.P0_9 = 0;
FIO0MASK_bit.P0_9 = 0;
// ìîíåòîïğèåìíèê 5
PINSEL4_bit.P2_2 = 0;
if(coinLevel[4])PINMODE3_bit.P1_21 = 3;
else PINMODE4_bit.P2_2 = 0;
FIO2DIR_bit.P2_2 = 0;
FIO2MASK_bit.P2_2 = 0;
// ñèãíàë ïå÷àòè ÷åêà ïîñò 5
PINSEL3_bit.P1_26 = 0;
if(SignalLevel[4])PINMODE3_bit.P1_26 = 3;
else PINMODE3_bit.P1_26 = 0;
FIO1DIR_bit.P1_26 = 0;
FIO1MASK_bit.P1_26 = 0;
// êóïşğîïğèåìíèê 6
PINSEL0_bit.P0_7 = 0;
if(cashLevel[5])PINMODE0_bit.P0_7 = 3;
else PINMODE0_bit.P0_7 = 0;
FIO0DIR_bit.P0_7 = 0;
FIO0MASK_bit.P0_7 = 0;
// ìîíåòîïğèåìíèê 6
PINSEL0_bit.P0_8 = 0;
if(coinLevel[5])PINMODE0_bit.P0_8 = 3;
else PINMODE0_bit.P0_8 = 0;
FIO0DIR_bit.P0_8 = 0;
FIO0MASK_bit.P0_8 = 0;
// ñèãíàë ïå÷àòè ÷åêà ïîñò 6
PINSEL0_bit.P0_0 = 0;
if(SignalLevel[5])PINMODE0_bit.P0_0 = 3;
else PINMODE0_bit.P0_0 = 0;
FIO0DIR_bit.P0_0 = 0;
FIO0MASK_bit.P0_0 = 0;
// ìîíåòîïğèåìíèê ïûëåñîñ 1
PINSEL0_bit.P0_5 = 0;
if(coinLevel[6])PINMODE0_bit.P0_5 = 3;
else PINMODE0_bit.P0_5 = 0;
FIO0DIR_bit.P0_5 = 0;
FIO0MASK_bit.P0_5 = 0;
// ìîíåòîïğèåìíèê ïûëåñîñ 2
PINSEL3_bit.P1_25 = 0;
if(coinLevel[7])PINMODE3_bit.P1_25 = 3;
else PINMODE3_bit.P1_25 = 0;
FIO1DIR_bit.P1_25 = 0;
FIO1MASK_bit.P1_25 = 0;
// áàíê 1
PINSEL1_bit.P0_28 = 0;
if(bankLevel[0])PINMODE1_bit.P0_28 = 3;
else PINMODE1_bit.P0_28 = 0;
FIO0DIR_bit.P0_28 = 0;
FIO0MASK_bit.P0_28 = 0;
// áàíê 2
PINSEL1_bit.P0_27 = 0;
if(bankLevel[1])PINMODE1_bit.P0_27 = 3;
else PINMODE1_bit.P0_27 = 0;
FIO0DIR_bit.P0_27 = 0;
FIO0MASK_bit.P0_27 = 0;
// áàíê 3
PINSEL3_bit.P1_24 = 0;
if(bankLevel[2])PINMODE1_bit.P0_24 = 3;
else PINMODE1_bit.P0_24 = 0;
FIO1DIR_bit.P1_24 = 0;
FIO1MASK_bit.P1_24 = 0;
// áàíê 4
PINSEL3_bit.P1_23 = 0;
if(bankLevel[3])PINMODE1_bit.P0_23 = 3;
else PINMODE1_bit.P0_23 = 0;
FIO1DIR_bit.P1_23 = 0;
FIO1MASK_bit.P1_23 = 0;
// áàíê 5
PINSEL0_bit.P0_6 = 0;
if(bankLevel[4])PINMODE0_bit.P0_6 = 3;
else PINMODE0_bit.P0_6 = 0;
FIO0DIR_bit.P0_6 = 0;
FIO0MASK_bit.P0_6 = 0;
// áàíê 6
PINSEL0_bit.P0_10 = 0;
if(bankLevel[5])PINMODE0_bit.P0_10 = 3;
else PINMODE0_bit.P0_10 = 0;
FIO0DIR_bit.P0_10 = 0;
FIO0MASK_bit.P0_10 = 0;
}
// èíèöèàëèçàöèÿ èìïóëüñíûõ âõîäîâ
void InitImpInput (void)
{
@ -1085,170 +1276,17 @@ void InitImpInput (void)
OS_CPU_SR cpu_sr = 0;
#endif
OnChangeCoinPulseLen();
OnChangeCashPulseLen();
OnChangeSinalPulseLen();
OnChangeLevel();
OnChangeBankPulseLen();
OnChangeLevelWithoutInit();
OS_ENTER_CRITICAL();
// íàçíà÷èì âñå íîæêè
// êóïşğîïğèåìíèê 1
PINSEL3_bit.P1_20 = 0;
PINMODE3_bit.P1_20 = 0;
FIO1DIR_bit.P1_20 = 0;
FIO1MASK_bit.P1_20 = 0;
// ìîíåòîïğèåìíèê 1
PINSEL3_bit.P1_21 = 0;
PINMODE3_bit.P1_21 = 0;
FIO1DIR_bit.P1_21 = 0;
FIO1MASK_bit.P1_21 = 0;
// ñèãíàë ïå÷àòè ÷åêà ïîñò 1
PINSEL9_bit.P4_28 = 0;
PINMODE9_bit.P4_28 = 0;
FIO4DIR_bit.P4_28 = 0;
FIO4MASK_bit.P4_28 = 0;
// êóïşğîïğèåìíèê 2
PINSEL3_bit.P1_19 = 0;
PINMODE3_bit.P1_19 = 0;
FIO1DIR_bit.P1_19 = 0;
FIO1MASK_bit.P1_19 = 0;
// ìîíåòîïğèåìíèê 2
PINSEL3_bit.P1_18 = 0;
PINMODE3_bit.P1_18 = 0;
FIO1DIR_bit.P1_18 = 0;
FIO1MASK_bit.P1_18 = 0;
// ñèãíàë ïå÷àòè ÷åêà ïîñò 2
PINSEL0_bit.P0_4 = 0;
PINMODE0_bit.P0_4 = 0;
FIO0DIR_bit.P0_4 = 0;
FIO0MASK_bit.P0_4 = 0;
// êóïşğîïğèåìíèê 3
PINSEL7_bit.P3_25 = 0;
PINMODE7_bit.P3_25 = 0;
FIO3DIR_bit.P3_25 = 0;
FIO3MASK_bit.P3_25 = 0;
// ìîíåòîïğèåìíèê 3
PINSEL7_bit.P3_26 = 0;
PINMODE7_bit.P3_26 = 0;
FIO3DIR_bit.P3_26 = 0;
FIO3MASK_bit.P3_26 = 0;
// ñèãíàë ïå÷àòè ÷åêà ïîñò 3
PINSEL3_bit.P1_28 = 0;
PINMODE3_bit.P1_28 = 0;
FIO1DIR_bit.P1_28 = 0;
FIO1MASK_bit.P1_28 = 0;
// êóïşğîïğèåìíèê 4
PINSEL1_bit.P0_26 = 0;
PINMODE1_bit.P0_26 = 0;
FIO0DIR_bit.P0_26 = 0;
FIO0MASK_bit.P0_26 = 0;
// ìîíåòîïğèåìíèê 4
PINSEL1_bit.P0_25 = 0;
PINMODE1_bit.P0_25 = 0;
FIO0DIR_bit.P0_25 = 0;
FIO0MASK_bit.P0_25 = 0;
// ñèãíàë ïå÷àòè ÷åêà ïîñò 4
PINSEL3_bit.P1_27 = 0;
PINMODE3_bit.P1_27 = 0;
FIO1DIR_bit.P1_27 = 0;
FIO1MASK_bit.P1_27 = 0;
// êóïşğîïğèåìíèê 5
PINSEL0_bit.P0_9 = 0;
PINMODE0_bit.P0_9 = 0;
FIO0DIR_bit.P0_9 = 0;
FIO0MASK_bit.P0_9 = 0;
// ìîíåòîïğèåìíèê 5
PINSEL4_bit.P2_2 = 0;
PINMODE4_bit.P2_2 = 0;
FIO2DIR_bit.P2_2 = 0;
FIO2MASK_bit.P2_2 = 0;
// ñèãíàë ïå÷àòè ÷åêà ïîñò 5
PINSEL3_bit.P1_26 = 0;
PINMODE3_bit.P1_26 = 0;
FIO1DIR_bit.P1_26 = 0;
FIO1MASK_bit.P1_26 = 0;
// êóïşğîïğèåìíèê 6
PINSEL0_bit.P0_7 = 0;
PINMODE0_bit.P0_7 = 0;
FIO0DIR_bit.P0_7 = 0;
FIO0MASK_bit.P0_7 = 0;
// ìîíåòîïğèåìíèê 6
PINSEL0_bit.P0_8 = 0;
PINMODE0_bit.P0_8 = 0;
FIO0DIR_bit.P0_8 = 0;
FIO0MASK_bit.P0_8 = 0;
// ñèãíàë ïå÷àòè ÷åêà ïîñò 6
PINSEL0_bit.P0_0 = 0;
PINMODE0_bit.P0_0 = 0;
FIO0DIR_bit.P0_0 = 0;
FIO0MASK_bit.P0_0 = 0;
// ìîíåòîïğèåìíèê ïûëåñîñ 1
PINSEL0_bit.P0_5 = 0;
PINMODE0_bit.P0_5 = 0;
FIO0DIR_bit.P0_5 = 0;
FIO0MASK_bit.P0_5 = 0;
// ìîíåòîïğèåìíèê ïûëåñîñ 2
PINSEL3_bit.P1_25 = 0;
PINMODE3_bit.P1_25 = 0;
FIO1DIR_bit.P1_25 = 0;
FIO1MASK_bit.P1_25 = 0;
// áàíê 1
PINSEL1_bit.P0_28 = 0;
PINMODE1_bit.P0_28 = 0;
FIO0DIR_bit.P0_28 = 0;
FIO0MASK_bit.P0_28 = 0;
// áàíê 2
PINSEL1_bit.P0_27 = 0;
PINMODE1_bit.P0_27 = 0;
FIO0DIR_bit.P0_27 = 0;
FIO0MASK_bit.P0_27 = 0;
// áàíê 3
PINSEL3_bit.P1_24 = 0;
PINMODE3_bit.P1_24 = 0;
FIO1DIR_bit.P1_24 = 0;
FIO1MASK_bit.P1_24 = 0;
// áàíê 4
PINSEL3_bit.P1_23 = 0;
PINMODE3_bit.P1_23 = 0;
FIO1DIR_bit.P1_23 = 0;
FIO1MASK_bit.P1_23 = 0;
// áàíê 5
PINSEL0_bit.P0_6 = 0;
PINMODE0_bit.P0_6 = 0;
FIO0DIR_bit.P0_6 = 0;
FIO0MASK_bit.P0_6 = 0;
// áàíê 6
PINSEL0_bit.P0_10 = 0;
PINMODE0_bit.P0_10 = 0;
FIO0DIR_bit.P0_10 = 0;
FIO0MASK_bit.P0_10 = 0;
InitInputPorts();
PCONP_bit.PCTIM3 = 1;
PCLKSEL1_bit.PCLK_TIMER3 = 2;

1
PROJECT/services/coin.h
View File

@ -12,6 +12,7 @@ extern CPU_INT32U GetCoinCount(int index);
extern CPU_INT32U GetResetCoinCount(int index);
extern void CoinDisable(void);
extern void CoinEnable(void);
extern void InitInputPorts();
extern CPU_INT32U GetCashCount(int index);
extern CPU_INT32U GetResetCashCount(int index);

4
settings/sk-mlpc2368.wsdt
View File

File diff suppressed because one or more lines are too long