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-06-21 23:11:09 +03:00
parent 4f993ac10a
commit fb2be67cde
8 changed files with 27919 additions and 3982 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11961
Flash Central/Exe/changer0_18.hex Normal file
View File

File diff suppressed because it is too large Load Diff

11961
Flash Central/Exe/changer0_18_high.hex Normal file
View File

File diff suppressed because it is too large Load Diff

3
PROJECT/app/app_serv.c
View File

@ -623,6 +623,9 @@ void UserAppTask(void *p_arg)
// режим Cube - разрешаем выдавать жетоны - поднимаем линию оптопара инвертирует в LOW, далее на P-канальный полевик
FIO0SET_bit.P0_24 = 1;
// âðåìÿ çàïóñêà âûäà÷è æåòîíîâ
coin_timestamp = OSTimeGet();
// печать чека, расчет остатка после остановки выдачи на хоппере
}
}

48
PROJECT/services/coin.c
View File

@ -41,13 +41,13 @@ static char pend_hopper_counter = 0;
static CPU_INT32U pend_hopper_timestamp;
static CPU_INT32U signal_error_hopper_pulse = 1000;
static char pend_upsignal_error_hopper_counter;
static char pend_downsignal_error_hopper_counter;
static char pend_upsignal_error_hopper_counter = 0;
static char pend_downsignal_error_hopper_counter = 0;
static CPU_INT32U pend_signal_error_hopper_timestamp;
static CPU_INT32U signal_nomoney_hopper_pulse = 1000;
static char pend_upsignal_nomoney_hopper_counter;
static char pend_downsignal_nomoney_hopper_counter;
static char pend_upsignal_nomoney_hopper_counter = 0;
static char pend_downsignal_nomoney_hopper_counter = 0;
static CPU_INT32U pend_signal_nomoney_hopper_timestamp;
static CPU_INT32U cashLevel;
@ -140,7 +140,10 @@ void CoinTask(void *p_arg)
GetData(&EnableCoinDesc, &enable_coin, 0, DATA_FLAG_SYSTEM_INDEX);
GetData(&EnableBankDesc, &bank_enable, 0, DATA_FLAG_SYSTEM_INDEX);
// óñòàíîâèì ãëîáàëüíûé ðåæèì ðàáîòû õîïïåðà
GetData(&RegimeHopperDesc, &regime_hopper, 0, DATA_FLAG_SYSTEM_INDEX);
while(1)
{
if (OSTimeGet() - last_settings_time > 1000)
@ -309,24 +312,27 @@ void CoinTask(void *p_arg)
OS_ENTER_CRITICAL();
if (pend_upsignal_error_hopper_counter)
if (regime_hopper)
{
if (OSTimeGet() - pend_signal_error_hopper_timestamp > signal_error_hopper_pulse)
{
// ñèãíàë îøèáêè ñíÿò
PostUserEvent(EVENT_ERROR_HOPPER_ON);
pend_upsignal_error_hopper_counter = 0;
}
}
if (pend_upsignal_error_hopper_counter)
{
if (OSTimeGet() - pend_signal_error_hopper_timestamp > signal_error_hopper_pulse)
{
// ñèãíàë îøèáêè ñíÿò
PostUserEvent(EVENT_ERROR_HOPPER_ON);
pend_upsignal_error_hopper_counter = 0;
}
}
if (pend_downsignal_error_hopper_counter)
{
if (OSTimeGet() - pend_signal_error_hopper_timestamp > signal_error_hopper_pulse)
{
// ñèãíàë îøèáêè ïîÿâèëñÿ
PostUserEvent(EVENT_ERROR_HOPPER_OFF);
pend_downsignal_error_hopper_counter = 0;
}
if (pend_downsignal_error_hopper_counter)
{
if (OSTimeGet() - pend_signal_error_hopper_timestamp > signal_error_hopper_pulse)
{
// ñèãíàë îøèáêè ïîÿâèëñÿ
PostUserEvent(EVENT_ERROR_HOPPER_OFF);
pend_downsignal_error_hopper_counter = 0;
}
}
}
if (pend_upsignal_nomoney_hopper_counter)

2
PROJECT/version.h
View File

@ -1,7 +1,7 @@
#ifndef _VERSION_H_
#define _VERSION_H_
#define DEVICE_FW_VERSION "00.17"
#define DEVICE_FW_VERSION "00.18"
#endif // #ifndef _VERSION_H_

12
settings/sk-mlpc2368.wsdt
View File

@ -12,7 +12,7 @@
<Column0>165</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
<Column0>202</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
</Workspace>
<Build>
@ -30,7 +30,7 @@
<Windows>
<Wnd2>
<Wnd0>
<Tabs>
<Tab>
<Identity>TabID-22094-17165</Identity>
@ -42,7 +42,7 @@
</Tab>
</Tabs>
<SelectedTab>0</SelectedTab></Wnd2><Wnd3>
<SelectedTab>0</SelectedTab></Wnd0><Wnd1>
<Tabs>
<Tab>
<Identity>TabID-15821-17283</Identity>
@ -58,20 +58,20 @@
</Tab>
<Tab><Identity>TabID-29988-6734</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab></Tabs>
<SelectedTab>0</SelectedTab></Wnd3></Windows>
<SelectedTab>0</SelectedTab></Wnd1></Windows>
<Editor>
<Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.h</Filename><XPos>0</XPos><YPos>15</YPos><SelStart>1197</SelStart><SelEnd>1197</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\ftp_client.c</Filename><XPos>0</XPos><YPos>643</YPos><SelStart>18595</SelStart><SelEnd>18595</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\time.c</Filename><XPos>0</XPos><YPos>313</YPos><SelStart>8375</SelStart><SelEnd>8375</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\data\fram_map.h</Filename><XPos>0</XPos><YPos>64</YPos><SelStart>1559</SelStart><SelEnd>1559</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c</Filename><XPos>0</XPos><YPos>945</YPos><SelStart>24859</SelStart><SelEnd>24859</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>171</YPos><SelStart>4589</SelStart><SelEnd>4589</SelEnd></Tab><ActiveTab>6</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.h</Filename><XPos>0</XPos><YPos>47</YPos><SelStart>1955</SelStart><SelEnd>1992</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>1112</YPos><SelStart>28730</SelStart><SelEnd>28744</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$\PROJECT\app\app_serv.h</Filename><XPos>0</XPos><YPos>6</YPos><SelStart>452</SelStart><SelEnd>452</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.c</Filename><XPos>0</XPos><YPos>40</YPos><SelStart>1323</SelStart><SelEnd>1323</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app.c</Filename><XPos>0</XPos><YPos>31</YPos><SelStart>1149</SelStart><SelEnd>1149</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\data\datadesc.c</Filename><XPos>0</XPos><YPos>3794</YPos><SelStart>175574</SelStart><SelEnd>175574</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>1804</YPos><SelStart>72527</SelStart><SelEnd>72527</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>14</YPos><SelStart>1672</SelStart><SelEnd>1672</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><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\validator.c</Filename><XPos>0</XPos><YPos>278</YPos><SelStart>10096</SelStart><SelEnd>10096</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$\PROJECT\services\fr.h</Filename><XPos>0</XPos><YPos>18</YPos><SelStart>875</SelStart><SelEnd>909</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>785</YPos><SelStart>28417</SelStart><SelEnd>28439</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\coin.h</Filename><XPos>0</XPos><YPos>15</YPos><SelStart>1197</SelStart><SelEnd>1197</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\ftp_client.c</Filename><XPos>0</XPos><YPos>643</YPos><SelStart>18595</SelStart><SelEnd>18595</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\time.c</Filename><XPos>0</XPos><YPos>313</YPos><SelStart>8375</SelStart><SelEnd>8375</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\data\fram_map.h</Filename><XPos>0</XPos><YPos>64</YPos><SelStart>1559</SelStart><SelEnd>1559</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.h</Filename><XPos>0</XPos><YPos>61</YPos><SelStart>1994</SelStart><SelEnd>2034</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$\PROJECT\app\app_serv.h</Filename><XPos>0</XPos><YPos>6</YPos><SelStart>452</SelStart><SelEnd>452</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.c</Filename><XPos>0</XPos><YPos>40</YPos><SelStart>1323</SelStart><SelEnd>1323</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>657</YPos><SelStart>17031</SelStart><SelEnd>17031</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app.c</Filename><XPos>0</XPos><YPos>31</YPos><SelStart>1383</SelStart><SelEnd>1383</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\data\datadesc.c</Filename><XPos>0</XPos><YPos>701</YPos><SelStart>32128</SelStart><SelEnd>32128</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>1804</YPos><SelStart>72527</SelStart><SelEnd>72527</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>14</YPos><SelStart>1672</SelStart><SelEnd>1672</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><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\validator.c</Filename><XPos>0</XPos><YPos>278</YPos><SelStart>10096</SelStart><SelEnd>10096</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$\PROJECT\services\fr.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>139</SelStart><SelEnd>139</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>587</YPos><SelStart>21966</SelStart><SelEnd>21966</SelEnd></Tab><ActiveTab>21</ActiveTab><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\drivers\fiscal\fiscal.c</Filename><XPos>0</XPos><YPos>772</YPos><SelStart>19517</SelStart><SelEnd>19517</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>830</YPos><SelStart>22670</SelStart><SelEnd>22670</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>81</YPos><SelStart>3002</SelStart><SelEnd>3002</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\modem\modem.c</Filename><XPos>0</XPos><YPos>135</YPos><SelStart>2768</SelStart><SelEnd>2791</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-056001f8><key>iaridepm.enu1</key></Toolbar-056001f8></Sizes></Row0></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>707</Bottom><Right>256</Right><x>-2</x><y>-2</y><xscreen>187</xscreen><yscreen>271</yscreen><sizeHorzCX>146094</sizeHorzCX><sizeHorzCY>276249</sizeHorzCY><sizeVertCX>201563</sizeVertCX><sizeVertCY>722732</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>229</Bottom><Right>1282</Right><x>-2</x><y>-2</y><xscreen>1284</xscreen><yscreen>231</yscreen><sizeHorzCX>1003125</sizeHorzCX><sizeHorzCY>235474</sizeHorzCY><sizeVertCX>146094</sizeVertCX><sizeVertCY>276249</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
<Top><Row0><Sizes><Toolbar-00e31310><key>iaridepm.enu1</key></Toolbar-00e31310></Sizes></Row0></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>696</Bottom><Right>293</Right><x>-2</x><y>-2</y><xscreen>175</xscreen><yscreen>367</yscreen><sizeHorzCX>136719</sizeHorzCX><sizeHorzCY>374108</sizeHorzCY><sizeVertCX>230469</sizeVertCX><sizeVertCY>711519</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>240</Bottom><Right>1282</Right><x>-2</x><y>-2</y><xscreen>1284</xscreen><yscreen>242</yscreen><sizeHorzCX>1003125</sizeHorzCX><sizeHorzCY>246687</sizeHorzCY><sizeVertCX>136719</sizeVertCX><sizeVertCY>374108</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
</Desktop>
</Workspace>

7912
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_17.hex</state>
<state>changer0_18_high.hex</state>
</option>
<option>
<name>OOCCommandLineProducer</name>