Выдаем жетоны сразу после запрета приема денег, если кнопка выключена.

This commit is contained in:
Dmitriy 2022-05-23 22:34:07 +03:00
parent a7d3474bee
commit 7d23b393d0
6 changed files with 3996 additions and 3984 deletions

View File

@ -397,6 +397,9 @@ void UserAppTask(void *p_arg)
accmoney += GetAcceptedBankMoney();
accmoney += GetAcceptedRestMoney();
coin_out_timestamp = OSTimeGet();
MoneyIn = 1;
// âûäàåì ìîíåòû ïî êíîïêå?
CPU_INT32U hopperStartButton = 0;
GetData(&HopperButtonStartDesc, &hopperStartButton, 0, DATA_FLAG_SYSTEM_INDEX);
@ -407,12 +410,13 @@ void UserAppTask(void *p_arg)
if(accmoney >= HopperCost)
{
CoinDisable();
// øëåì ñðàçó ñîáûòèå âûäà÷è æåòîíîâ
PostUserEvent(EVENT_GIVE_COIN);
MoneyIn = 0;
}
}
}
coin_out_timestamp = OSTimeGet();
MoneyIn = 1;
}
break;
case EVENT_CASH_INSERTED:
@ -472,6 +476,9 @@ void UserAppTask(void *p_arg)
accmoney += GetAcceptedBankMoney();
accmoney += GetAcceptedRestMoney();
coin_out_timestamp = OSTimeGet();
MoneyIn = 1;
// âûäàåì ìîíåòû ïî êíîïêå?
CPU_INT32U hopperStartButton = 0;
GetData(&HopperButtonStartDesc, &hopperStartButton, 0, DATA_FLAG_SYSTEM_INDEX);
@ -482,12 +489,13 @@ void UserAppTask(void *p_arg)
if(accmoney >= HopperCost)
{
BankDisable();
// øëåì ñðàçó ñîáûòèå âûäà÷è æåòîíîâ
PostUserEvent(EVENT_GIVE_COIN);
MoneyIn = 0;
}
}
}
coin_out_timestamp = OSTimeGet();
MoneyIn = 1;
}
break;
case EVENT_BILL_ESCROW:
@ -524,7 +532,10 @@ void UserAppTask(void *p_arg)
CPU_INT32U accmoney = GetAcceptedMoney();
accmoney += GetAcceptedBankMoney();
accmoney += GetAcceptedRestMoney();
coin_out_timestamp = OSTimeGet();
MoneyIn = 1;
// âûäàåì ìîíåòû ïî êíîïêå?
CPU_INT32U hopperStartButton = 0;
GetData(&HopperButtonStartDesc, &hopperStartButton, 0, DATA_FLAG_SYSTEM_INDEX);
@ -542,6 +553,12 @@ void UserAppTask(void *p_arg)
// åùå íå íàáðàëè íóæíóþ ñóììó - âêëþ÷àåì êóïþðíèê íà ïðèåì
if (IsValidatorConnected()) CC_CmdBillType(0xffffff, 0xffffffff, ADDR_FL);
}
else
{
// øëåì ñðàçó ñîáûòèå âûäà÷è æåòîíîâ, åñëè íàêîïèëè íóæíóþ ñóììó
PostUserEvent(EVENT_GIVE_COIN);
MoneyIn = 0;
}
}
}
@ -550,9 +567,6 @@ void UserAppTask(void *p_arg)
SaveEventRecord(RecentChannel, JOURNAL_EVENT_MONEY_NOTE, note);
IncBillnomCounter(billnom_index);
}
coin_out_timestamp = OSTimeGet();
MoneyIn = 1;
}
break;

View File

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

View File

@ -30,7 +30,7 @@
<Windows>
<Wnd0>
<Wnd2>
<Tabs>
<Tab>
<Identity>TabID-22094-17165</Identity>
@ -42,20 +42,20 @@
</Tab>
</Tabs>
<SelectedTab>0</SelectedTab></Wnd0><Wnd1><Tabs><Tab><Identity>TabID-27735-18517</Identity><TabName>Build</TabName><Factory>Build</Factory><Session/></Tab><Tab><Identity>TabID-8595-24806</Identity><TabName>Find in Files</TabName><Factory>Find-in-Files</Factory><Session/></Tab></Tabs><SelectedTab>1</SelectedTab></Wnd1></Windows>
<SelectedTab>0</SelectedTab></Wnd2><Wnd3><Tabs><Tab><Identity>TabID-27735-18517</Identity><TabName>Build</TabName><Factory>Build</Factory><Session/></Tab><Tab><Identity>TabID-8595-24806</Identity><TabName>Find in Files</TabName><Factory>Find-in-Files</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd3></Windows>
<Editor>
<Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\time.c</Filename><XPos>0</XPos><YPos>27</YPos><SelStart>256</SelStart><SelEnd>256</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\mode.c</Filename><XPos>0</XPos><YPos>36</YPos><SelStart>790</SelStart><SelEnd>790</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\keyboard\keyboard.c</Filename><XPos>0</XPos><YPos>93</YPos><SelStart>3391</SelStart><SelEnd>3391</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\bsp\bsp.c</Filename><XPos>0</XPos><YPos>80</YPos><SelStart>3757</SelStart><SelEnd>3757</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\keyboard\keyboard.h</Filename><XPos>0</XPos><YPos>6</YPos><SelStart>466</SelStart><SelEnd>466</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menu.c</Filename><XPos>0</XPos><YPos>344</YPos><SelStart>10091</SelStart><SelEnd>10091</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>999</YPos><SelStart>40481</SelStart><SelEnd>40481</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.h</Filename><XPos>0</XPos><YPos>48</YPos><SelStart>2292</SelStart><SelEnd>2339</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\includes.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>114</SelStart><SelEnd>136</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>113</YPos><SelStart>3970</SelStart><SelEnd>3970</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\fram_map.h</Filename><XPos>0</XPos><YPos>36</YPos><SelStart>1059</SelStart><SelEnd>1059</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\data.h</Filename><XPos>0</XPos><YPos>79</YPos><SelStart>2643</SelStart><SelEnd>2643</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\modem\modem.c</Filename><XPos>0</XPos><YPos>115</YPos><SelStart>2768</SelStart><SelEnd>2768</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\control.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>49</SelStart><SelEnd>49</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\uart0.c</Filename><XPos>0</XPos><YPos>232</YPos><SelStart>5375</SelStart><SelEnd>5375</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\os_ii\source\os_time.c</Filename><XPos>0</XPos><YPos>44</YPos><SelStart>2075</SelStart><SelEnd>2075</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\validator.c</Filename><XPos>0</XPos><YPos>187</YPos><SelStart>7944</SelStart><SelEnd>7958</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\validator.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>88</SelStart><SelEnd>88</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.c</Filename><XPos>0</XPos><YPos>2939</YPos><SelStart>137864</SelStart><SelEnd>137864</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.h</Filename><XPos>0</XPos><YPos>19</YPos><SelStart>1268</SelStart><SelEnd>1268</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>20</YPos><SelStart>1890</SelStart><SelEnd>1911</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.h</Filename><XPos>0</XPos><YPos>53</YPos><SelStart>1994</SelStart><SelEnd>2034</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>22455</SelStart><SelEnd>22455</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>174</YPos><SelStart>4241</SelStart><SelEnd>4250</SelEnd></Tab><ActiveTab>23</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>814</YPos><SelStart>22517</SelStart><SelEnd>22517</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>159</SelStart><SelEnd>159</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>44</YPos><SelStart>1750</SelStart><SelEnd>1750</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\version.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>77</SelStart><SelEnd>77</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
<Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\time.c</Filename><XPos>0</XPos><YPos>27</YPos><SelStart>256</SelStart><SelEnd>256</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\mode.c</Filename><XPos>0</XPos><YPos>36</YPos><SelStart>790</SelStart><SelEnd>790</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\keyboard\keyboard.c</Filename><XPos>0</XPos><YPos>93</YPos><SelStart>3391</SelStart><SelEnd>3391</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\bsp\bsp.c</Filename><XPos>0</XPos><YPos>80</YPos><SelStart>3757</SelStart><SelEnd>3757</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\keyboard\keyboard.h</Filename><XPos>0</XPos><YPos>6</YPos><SelStart>466</SelStart><SelEnd>466</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menu.c</Filename><XPos>0</XPos><YPos>344</YPos><SelStart>10091</SelStart><SelEnd>10091</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>999</YPos><SelStart>40481</SelStart><SelEnd>40481</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.h</Filename><XPos>0</XPos><YPos>48</YPos><SelStart>2292</SelStart><SelEnd>2339</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\includes.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>114</SelStart><SelEnd>136</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>113</YPos><SelStart>3970</SelStart><SelEnd>3970</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\fram_map.h</Filename><XPos>0</XPos><YPos>36</YPos><SelStart>1059</SelStart><SelEnd>1059</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\data.h</Filename><XPos>0</XPos><YPos>79</YPos><SelStart>2643</SelStart><SelEnd>2643</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\modem\modem.c</Filename><XPos>0</XPos><YPos>115</YPos><SelStart>2768</SelStart><SelEnd>2768</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\control.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>49</SelStart><SelEnd>49</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\uart0.c</Filename><XPos>0</XPos><YPos>232</YPos><SelStart>5375</SelStart><SelEnd>5375</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\os_ii\source\os_time.c</Filename><XPos>0</XPos><YPos>44</YPos><SelStart>2075</SelStart><SelEnd>2075</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\validator.c</Filename><XPos>0</XPos><YPos>187</YPos><SelStart>7944</SelStart><SelEnd>7958</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\validator.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>88</SelStart><SelEnd>88</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.c</Filename><XPos>0</XPos><YPos>2939</YPos><SelStart>137864</SelStart><SelEnd>137864</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.h</Filename><XPos>0</XPos><YPos>19</YPos><SelStart>1268</SelStart><SelEnd>1268</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>20</YPos><SelStart>1890</SelStart><SelEnd>1911</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.h</Filename><XPos>0</XPos><YPos>53</YPos><SelStart>1994</SelStart><SelEnd>2034</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>22455</SelStart><SelEnd>22455</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>467</YPos><SelStart>17218</SelStart><SelEnd>17218</SelEnd></Tab><ActiveTab>23</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>814</YPos><SelStart>22517</SelStart><SelEnd>22517</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>159</SelStart><SelEnd>159</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>44</YPos><SelStart>1750</SelStart><SelEnd>1750</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\version.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>77</SelStart><SelEnd>77</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
<Positions>
<Top><Row0><Sizes><Toolbar-05672070><key>iaridepm.enu1</key></Toolbar-05672070></Sizes></Row0></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>757</Bottom><Right>311</Right><x>-2</x><y>-2</y><xscreen>916</xscreen><yscreen>454</yscreen><sizeHorzCX>477083</sizeHorzCX><sizeHorzCY>455366</sizeHorzCY><sizeVertCX>163021</sizeVertCX><sizeVertCY>761284</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>195</Bottom><Right>1922</Right><x>-2</x><y>-2</y><xscreen>1924</xscreen><yscreen>197</yscreen><sizeHorzCX>1002083</sizeHorzCX><sizeHorzCY>197593</sizeHorzCY><sizeVertCX>140625</sizeVertCX><sizeVertCY>231695</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
<Top><Row0><Sizes><Toolbar-05672070><key>iaridepm.enu1</key></Toolbar-05672070></Sizes></Row0></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>757</Bottom><Right>311</Right><x>-2</x><y>-2</y><xscreen>916</xscreen><yscreen>454</yscreen><sizeHorzCX>477083</sizeHorzCX><sizeHorzCY>455366</sizeHorzCY><sizeVertCX>163021</sizeVertCX><sizeVertCY>761284</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>195</Bottom><Right>1922</Right><x>-2</x><y>-2</y><xscreen>1924</xscreen><yscreen>197</yscreen><sizeHorzCX>1002083</sizeHorzCX><sizeHorzCY>197593</sizeHorzCY><sizeVertCX>140625</sizeVertCX><sizeVertCY>231695</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
</Desktop>
</Workspace>

View File

@ -2,7 +2,7 @@
<project>
<fileVersion>2</fileVersion>
<fileChecksum>3074326424</fileChecksum>
<fileChecksum>698829836</fileChecksum>
<configuration>
<name>Flash Central</name>
<outputs>
@ -366,6 +366,7 @@
<file>$PROJ_DIR$\Flash Central\Exe\changer0_26.hex</file>
<file>$PROJ_DIR$\Flash Central\Obj\os_sem.o</file>
<file>$PROJ_DIR$\Flash Central\Exe\changer0_27.hex</file>
<file>$PROJ_DIR$\Flash Central\Exe\changer0_28.hex</file>
</outputs>
<file>
<name>[ROOT_NODE]</name>
@ -1506,10 +1507,6 @@
</tool>
</outputs>
<inputs>
<tool>
<name>BICOMP</name>
<file> 15 356 170 230 300 331 280 162 239 237 319 161 301 234 288 321 333 215 159 343 311 336 14 268 25 12 4 41 5 8 10 37 29 173 193 18 51 86 1 13 63 81 79 73 89 95 54 76 69 7 60 28 22 59 32 74 90 93 91 53 61 77 56 243 117 119</file>
</tool>
<tool>
<name>ICCARM</name>
<file> 15 356 170 230 300 307 331 280 162 239 237 319 161 301 234 288 321 333 215 159 343 311 336 14 268 25 12 4 41 5 8 10 37 29 173 193 18 51 86 1 13 63 81 79 73 89 95 54 76 69 7 60 28 22 59 32 74 90 93 91 53 61 77 56 243 117 119</file>
@ -2173,7 +2170,7 @@
</tool>
<tool>
<name>OBJCOPY</name>
<file> 359</file>
<file> 360</file>
</tool>
</outputs>
<inputs>

View File

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