mirror of
https://github.com/dimoniche/changer.git
synced 2026-01-30 01:03:30 +03:00
сделал подсчет импульсов одинаковым с остальными
This commit is contained in:
parent
fb2be67cde
commit
b8f91b640c
11960
Flash Central/Exe/changer0_19.hex
Normal file
11960
Flash Central/Exe/changer0_19.hex
Normal file
File diff suppressed because it is too large
Load Diff
@ -806,8 +806,8 @@ void UserAppTask(void *p_arg)
|
||||
if (!hopperOn || !CountCoin)
|
||||
{
|
||||
// что-то пошло не так - останавливаем выдачу
|
||||
FIO0CLR_bit.P0_24 = 1;
|
||||
break;
|
||||
//FIO0CLR_bit.P0_24 = 1;
|
||||
//break;
|
||||
}
|
||||
|
||||
// импульсы от хоппера в режиме Cube
|
||||
@ -822,7 +822,7 @@ void UserAppTask(void *p_arg)
|
||||
coin += GetAcceptedCoin();
|
||||
|
||||
// нету жетонов - выход
|
||||
if (!coin) break;
|
||||
//if (!coin) break;
|
||||
|
||||
if (coin >= CountCoin)
|
||||
{
|
||||
|
||||
@ -289,14 +289,23 @@ void CoinTask(void *p_arg)
|
||||
|
||||
if (GetHopperCount())
|
||||
{
|
||||
if (last_hopper_count != GetHopperCount())
|
||||
if (last_hopper_count == GetHopperCount())
|
||||
{
|
||||
// событие от хоппера шлем сразу - чтобы успеть все вовремя остановить
|
||||
PostUserEvent(EVENT_HOPPER_EXTRACTED);
|
||||
|
||||
// может быть придется и здесь останавливать хоппер
|
||||
last_hopper_count = GetHopperCount();
|
||||
if (labs(OSTimeGet() - last_hopper_time) > 50)
|
||||
{
|
||||
// ñîáûòèå îò õîïïåðà øëåì ïî÷òè ñðàçó - ÷òîáû óñïåòü âñå âîâðåìÿ îñòàíîâèòü
|
||||
PostUserEvent(EVENT_HOPPER_EXTRACTED);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
last_hopper_count = GetHopperCount();
|
||||
last_hopper_time = OSTimeGet();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
last_hopper_time = OSTimeGet();
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#ifndef _VERSION_H_
|
||||
#define _VERSION_H_
|
||||
|
||||
#define DEVICE_FW_VERSION "00.18"
|
||||
#define DEVICE_FW_VERSION "00.19"
|
||||
|
||||
|
||||
#endif // #ifndef _VERSION_H_
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
|
||||
|
||||
<Column0>202</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
|
||||
<Column0>219</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
|
||||
</Workspace>
|
||||
<Build>
|
||||
|
||||
@ -38,7 +38,7 @@
|
||||
<Factory>Workspace</Factory>
|
||||
<Session>
|
||||
|
||||
<NodeDict><ExpandedNode>sk-mlpc2368</ExpandedNode><ExpandedNode>sk-mlpc2368/PROJECT</ExpandedNode><ExpandedNode>sk-mlpc2368/PROJECT/app</ExpandedNode><ExpandedNode>sk-mlpc2368/PROJECT/data</ExpandedNode><ExpandedNode>sk-mlpc2368/PROJECT/menu</ExpandedNode><ExpandedNode>sk-mlpc2368/PROJECT/services</ExpandedNode></NodeDict></Session>
|
||||
<NodeDict><ExpandedNode>sk-mlpc2368</ExpandedNode><ExpandedNode>sk-mlpc2368/OS</ExpandedNode></NodeDict></Session>
|
||||
</Tab>
|
||||
</Tabs>
|
||||
|
||||
@ -64,14 +64,14 @@
|
||||
|
||||
|
||||
|
||||
<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>
|
||||
<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>467</YPos><SelStart>11713</SelStart><SelEnd>11713</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>3626</YPos><SelStart>168277</SelStart><SelEnd>168277</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>3</YPos><SelStart>1487</SelStart><SelEnd>1487</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>814</YPos><SelStart>29331</SelStart><SelEnd>29331</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-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>
|
||||
<Top><Row0><Sizes><Toolbar-05231718><key>iaridepm.enu1</key></Toolbar-05231718></Sizes></Row0></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>738</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>754332</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>198</Bottom><Right>1282</Right><x>-2</x><y>-2</y><xscreen>1284</xscreen><yscreen>200</yscreen><sizeHorzCX>1003125</sizeHorzCX><sizeHorzCY>203874</sizeHorzCY><sizeVertCX>136719</sizeVertCX><sizeVertCY>374108</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
|
||||
</Desktop>
|
||||
</Workspace>
|
||||
|
||||
|
||||
8967
sk-mlpc2368.dep
8967
sk-mlpc2368.dep
File diff suppressed because it is too large
Load Diff
@ -1513,7 +1513,7 @@
|
||||
</option>
|
||||
<option>
|
||||
<name>OOCOutputFile</name>
|
||||
<state>changer0_18_high.hex</state>
|
||||
<state>changer0_19.hex</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>OOCCommandLineProducer</name>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user