Сделал версию которая при выдаче жетонов отслеживает опустошение хоппера и останавливает выдачу с сообщением об ошибке.

This commit is contained in:
Dmitriy 2023-07-25 00:19:18 +03:00
parent 7d23b393d0
commit 071ac0d963
12 changed files with 23366 additions and 11816 deletions

3
.gitignore vendored
View File

@ -5,3 +5,6 @@ Flash Central/Obj/app.o
*.out
*.pbd
*.map
/Flash Central/List
/Flash Central/Obj
/Flash Central/BrowseInfo

File diff suppressed because it is too large Load Diff

View File

@ -701,6 +701,13 @@ void UserAppTask(void *p_arg)
// ðåæèì Elolution - óïðàâëÿåì âûäà÷åé æåòîíîâ èìïóëüñàìè
for(int j = 0; j < CountCoin; j++)
{
if(event_nomoney_hopper)
{
// no money event - exit
event_nomoney_hopper = 0;
break;
}
FIO0SET_bit.P0_24 = 1;
OSTimeDly(50);
FIO0CLR_bit.P0_24 = 1;

View File

@ -43,7 +43,7 @@ typedef int (*TextCallbackFunc)(char *str);
extern int InitModem(void);
extern void ModemWriteStr(char const *str);
//extern void ModemWriteStr(char const *str);
extern int ModemSendOKCommand(char *str, unsigned long timeout);
extern int ModemDeleteSMS(unsigned char index);
extern int ModemWriteSMS(char const* text, unsigned char *index);

View File

@ -47,6 +47,7 @@ static CPU_INT32U pend_signal_error_hopper_timestamp;
static CPU_INT32U signal_nomoney_hopper_pulse = 1000;
static char pend_upsignal_nomoney_hopper_counter = 0;
volatile char event_nomoney_hopper = 0;
static char pend_downsignal_nomoney_hopper_counter = 0;
static CPU_INT32U pend_signal_nomoney_hopper_timestamp;
@ -347,6 +348,7 @@ void CoinTask(void *p_arg)
{
// äåíüãè â õîïïåðå êîí÷èëèñü
PostUserEvent(EVENT_NOMONEY_HOPPER_ON);
event_nomoney_hopper = 1;
pend_upsignal_nomoney_hopper_counter = 0;
}
}
@ -357,6 +359,7 @@ void CoinTask(void *p_arg)
{
// äåíüãè â õîïïåðå åñòü
PostUserEvent(EVENT_NOMONEY_HOPPER_OFF);
event_nomoney_hopper = 0;
pend_downsignal_nomoney_hopper_counter = 0;
}
}

View File

@ -7,6 +7,8 @@
// çàïàñ èçìåðåíèÿ ïåðèîäà, ïëþñ-ìèíóñ
#define COIN_IMP_SPAN 10 // ìñ/100
extern volatile char event_nomoney_hopper;
extern void InitCoin(void);
extern CPU_INT32U GetCoinCount(void);
extern CPU_INT32U GetResetCoinCount(void);

View File

@ -1,7 +1,7 @@
#ifndef _VERSION_H_
#define _VERSION_H_
#define DEVICE_FW_VERSION "00.28"
#define DEVICE_FW_VERSION "00.29"
#endif // #ifndef _VERSION_H_

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff