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

Исправлена ошибка связанная с большой ценой жетона

Browse Source
This commit is contained in:
Dmitriy 2021-09-21 20:47:30 +03:00
parent 12faf624f2
commit ab250d6432
6 changed files with 8734 additions and 8738 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7872
Flash Central/Exe/changer0_21.hex → Flash Central/Exe/changer0_22.hex
View File

File diff suppressed because it is too large Load Diff

17
PROJECT/app/app_serv.c
View File

@ -306,8 +306,11 @@ void UserAppTask(void *p_arg)
// ïðàâäà ÷åðåç íåêîòîðûé òàéìàóò
if(MoneyIn && !hopperStartButton && (labs(OSTimeGet() - coin_out_timestamp) > 1000UL))
{
PostUserEvent(EVENT_GIVE_COIN);
MoneyIn = 0;
if(accmoney >= HopperCost) // если конечно набрали денег на жетон
{
PostUserEvent(EVENT_GIVE_COIN);
MoneyIn = 0;
}
}
}
@ -566,11 +569,6 @@ void UserAppTask(void *p_arg)
// break;
// }
// çàïðåòèì ïðèåì äåíåã - ïå÷àòàåì ÷åê è âûäàåì ìîíåòû
if (IsValidatorConnected()) CC_CmdBillType(0x000000, 0x000000, ADDR_FL);
CoinDisable();
BankDisable();
// çäåñü óïðàâëÿåì õîïïåðîì--
{
GetData(&RegimeHopperDesc, &regime_hopper, 0, DATA_FLAG_SYSTEM_INDEX);
@ -585,6 +583,11 @@ void UserAppTask(void *p_arg)
if(accmoney >= HopperCost)
{
// запретим прием денег - печатаем чек и выдаем монеты - только если достаточно денег на выдачу монеты
if (IsValidatorConnected()) CC_CmdBillType(0x000000, 0x000000, ADDR_FL);
CoinDisable();
BankDisable();
CountCoin = accmoney / HopperCost;
// íàïèøåì ñêîëüêî âûäàäèì æåòîíîâ

2
PROJECT/version.h
View File

@ -1,7 +1,7 @@
#ifndef _VERSION_H_
#define _VERSION_H_
#define DEVICE_FW_VERSION "00.21"
#define DEVICE_FW_VERSION "00.22"
#endif // #ifndef _VERSION_H_

8
settings/sk-mlpc2368.wsdt
View File

File diff suppressed because one or more lines are too long

9571
sk-mlpc2368.dep
View File

File diff suppressed because it is too large Load Diff

2
sk-mlpc2368.ewp
View File

@ -1513,7 +1513,7 @@
</option>
<option>
<name>OOCOutputFile</name>
<state>changer0_21.hex</state>
<state>changer0_22.hex</state>
</option>
<option>
<name>OOCCommandLineProducer</name>