mirror of
https://github.com/dimoniche/changer.git
synced 2026-01-30 01:03:30 +03:00
поправил режим ФР с выдачей количества жетонов
1 час
This commit is contained in:
parent
92b58b881d
commit
79cbcb7564
12161
Flash Central/Exe/changer0_08.hex
Normal file
12161
Flash Central/Exe/changer0_08.hex
Normal file
File diff suppressed because it is too large
Load Diff
@ -1666,8 +1666,8 @@ void OnEnterReportsPanel(void)
|
||||
FlagForPrintReport = 0;
|
||||
}
|
||||
|
||||
const TMenuLineArray arr_ReportMenuArray[] = {&line_ReportMenu_0, &line_ReportMenu_1, &line_ReportMenu_2, &line_ReportMenu_3, &line_ReportMenu_4, NULL};
|
||||
const TMenuPanel ReportMenuPanel[] = {arr_ReportMenuArray, OnEnterReportsPanel, 5, MENU_PANEL_STANDARD};
|
||||
const TMenuLineArray arr_ReportMenuArray[] = {&line_ReportMenu_0, &line_ReportMenu_1, &line_ReportMenu_2, /*&line_ReportMenu_3,*/ &line_ReportMenu_4, NULL};
|
||||
const TMenuPanel ReportMenuPanel[] = {arr_ReportMenuArray, OnEnterReportsPanel, 4, MENU_PANEL_STANDARD};
|
||||
|
||||
/***********************************
|
||||
膛娃 吓桌臆 X-我着依
|
||||
|
||||
@ -741,13 +741,19 @@ repeat_sell1:
|
||||
}
|
||||
|
||||
GetData(&HopperCostDesc, &price, 0, DATA_FLAG_SYSTEM_INDEX);
|
||||
price *= 100;
|
||||
count = (cash / price) * 1000;
|
||||
|
||||
if (ext)
|
||||
{
|
||||
count *= 1000; // äëÿ ðàñøèðåííîé îïåðàöèè 6 çíàêîâ ïîñëå çàïÿòîé
|
||||
// äëÿ ðàñøèðåííîé îïåðàöèè 6 çíàêîâ ïîñëå çàïÿòîé
|
||||
count = ((CPU_INT64U)((CPU_INT64U)((CPU_INT64U)money * 1000000) / price));
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
count = ((CPU_INT64U)((CPU_INT64U)((CPU_INT64U)money * 1000) / price));
|
||||
}
|
||||
|
||||
price *= 100;
|
||||
|
||||
if (((ext == 0) && (FiscMakeSell(DEFAULT_PASS, &count, &price, 0, &tax[0], service_name, &err) != FISC_OK))
|
||||
|| ((ext) && (FiscMakeSellV2(DEFAULT_PASS, &count, &price, 0, &tax[0], subj, service_name, &err) != FISC_OK))
|
||||
)
|
||||
@ -884,7 +890,7 @@ repeat_close:
|
||||
|
||||
if(online)
|
||||
{
|
||||
if(((ext) && (FiscCloseBillV2Online(DEFAULT_PASS, &cash, tax[0], "Ñïàñèáî çà ïîêóïêó!!!", &err) != FISC_OK)))
|
||||
if(((ext) && (FiscCloseBillV2Online(DEFAULT_PASS, &cash, tax[0], "Ñïàñèáî çà ïîêóïêó!!!", &err) != FISC_OK)))
|
||||
{
|
||||
if (err)
|
||||
{
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#ifndef _VERSION_H_
|
||||
#define _VERSION_H_
|
||||
|
||||
#define DEVICE_FW_VERSION "00.07"
|
||||
#define DEVICE_FW_VERSION "00.08"
|
||||
|
||||
|
||||
#endif // #ifndef _VERSION_H_
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
|
||||
|
||||
<Column0>201</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
|
||||
<Column0>221</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
|
||||
</Workspace>
|
||||
<Build>
|
||||
|
||||
@ -64,14 +64,14 @@
|
||||
|
||||
|
||||
|
||||
<Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.h</Filename><XPos>0</XPos><YPos>18</YPos><SelStart>882</SelStart><SelEnd>882</SelEnd></Tab><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\app\app_serv.h</Filename><XPos>0</XPos><YPos>53</YPos><SelStart>1679</SelStart><SelEnd>1679</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>268</YPos><SelStart>9794</SelStart><SelEnd>9794</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.h</Filename><XPos>0</XPos><YPos>48</YPos><SelStart>2489</SelStart><SelEnd>2489</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>729</YPos><SelStart>19424</SelStart><SelEnd>19424</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>22</YPos><SelStart>1144</SelStart><SelEnd>1144</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.c</Filename><XPos>0</XPos><YPos>167</YPos><SelStart>4920</SelStart><SelEnd>4920</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>688</YPos><SelStart>16605</SelStart><SelEnd>16605</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\ftp_client.c</Filename><XPos>0</XPos><YPos>628</YPos><SelStart>18495</SelStart><SelEnd>18495</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\app\ftp_app.c</Filename><XPos>0</XPos><YPos>344</YPos><SelStart>11108</SelStart><SelEnd>11108</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.c</Filename><XPos>0</XPos><YPos>708</YPos><SelStart>32128</SelStart><SelEnd>32128</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app.c</Filename><XPos>0</XPos><YPos>43</YPos><SelStart>1386</SelStart><SelEnd>1386</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>2247</YPos><SelStart>76118</SelStart><SelEnd>76118</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$\OS\bsp\bsp.c</Filename><XPos>0</XPos><YPos>67</YPos><SelStart>3484</SelStart><SelEnd>3484</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\services\validator.c</Filename><XPos>0</XPos><YPos>281</YPos><SelStart>10049</SelStart><SelEnd>10049</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menu.c</Filename><XPos>0</XPos><YPos>1071</YPos><SelStart>35201</SelStart><SelEnd>35201</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\keyboard\keyboard.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>420</SelStart><SelEnd>420</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\fram_map.h</Filename><XPos>0</XPos><YPos>76</YPos><SelStart>1731</SelStart><SelEnd>1745</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\modem\modem.c</Filename><XPos>0</XPos><YPos>119</YPos><SelStart>2768</SelStart><SelEnd>2768</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\modem_task.c</Filename><XPos>0</XPos><YPos>455</YPos><SelStart>13519</SelStart><SelEnd>13528</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>561</YPos><SelStart>20028</SelStart><SelEnd>20028</SelEnd></Tab><ActiveTab>24</ActiveTab></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\fr.h</Filename><XPos>0</XPos><YPos>18</YPos><SelStart>882</SelStart><SelEnd>882</SelEnd></Tab><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\app\app_serv.h</Filename><XPos>0</XPos><YPos>53</YPos><SelStart>1679</SelStart><SelEnd>1679</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.h</Filename><XPos>0</XPos><YPos>48</YPos><SelStart>2489</SelStart><SelEnd>2489</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>734</YPos><SelStart>20072</SelStart><SelEnd>20072</SelEnd></Tab><ActiveTab>4</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.h</Filename><XPos>0</XPos><YPos>22</YPos><SelStart>1144</SelStart><SelEnd>1144</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\journal.c</Filename><XPos>0</XPos><YPos>55</YPos><SelStart>978</SelStart><SelEnd>978</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\coin.c</Filename><XPos>0</XPos><YPos>688</YPos><SelStart>16605</SelStart><SelEnd>16605</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\ftp_client.c</Filename><XPos>0</XPos><YPos>628</YPos><SelStart>18495</SelStart><SelEnd>18495</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\app\ftp_app.c</Filename><XPos>0</XPos><YPos>344</YPos><SelStart>11108</SelStart><SelEnd>11108</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.c</Filename><XPos>0</XPos><YPos>3633</YPos><SelStart>168279</SelStart><SelEnd>168279</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\app\app.c</Filename><XPos>0</XPos><YPos>43</YPos><SelStart>1386</SelStart><SelEnd>1386</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\menu\menudesc.c</Filename><XPos>0</XPos><YPos>969</YPos><SelStart>39990</SelStart><SelEnd>39990</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\mode.c</Filename><XPos>0</XPos><YPos>36</YPos><SelStart>790</SelStart><SelEnd>790</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\validator.c</Filename><XPos>0</XPos><YPos>281</YPos><SelStart>10049</SelStart><SelEnd>10049</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\fram_map.h</Filename><XPos>0</XPos><YPos>44</YPos><SelStart>1059</SelStart><SelEnd>1059</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\app_serv.c</Filename><XPos>0</XPos><YPos>207</YPos><SelStart>5895</SelStart><SelEnd>5895</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\app\console_cmd.c</Filename><XPos>0</XPos><YPos>213</YPos><SelStart>5405</SelStart><SelEnd>5405</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\drivers\fiscal\fiscal.c</Filename><XPos>0</XPos><YPos>884</YPos><SelStart>22988</SelStart><SelEnd>22988</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\OS\uc\cpu\cpu.h</Filename><XPos>0</XPos><YPos>98</YPos><SelStart>5685</SelStart><SelEnd>5685</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\datadesc.h</Filename><XPos>0</XPos><YPos>88</YPos><SelStart>3030</SelStart><SelEnd>3030</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-05541b78><key>iaridepm.enu1</key></Toolbar-05541b78></Sizes></Row0></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>678</Bottom><Right>292</Right><x>-2</x><y>-2</y><xscreen>187</xscreen><yscreen>271</yscreen><sizeHorzCX>146094</sizeHorzCX><sizeHorzCY>276249</sizeHorzCY><sizeVertCX>229688</sizeVertCX><sizeVertCY>693170</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>258</Bottom><Right>1282</Right><x>-2</x><y>-2</y><xscreen>1284</xscreen><yscreen>260</yscreen><sizeHorzCX>1003125</sizeHorzCX><sizeHorzCY>265036</sizeHorzCY><sizeVertCX>146094</sizeVertCX><sizeVertCY>276249</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
|
||||
<Top><Row0><Sizes><Toolbar-051329c8><key>iaridepm.enu1</key></Toolbar-051329c8></Sizes></Row0></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>510</Bottom><Right>312</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>146413</sizeHorzCX><sizeHorzCY>275862</sizeHorzCY><sizeVertCX>229868</sizeVertCX><sizeVertCY>706207</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>170</Bottom><Right>1368</Right><x>-2</x><y>-2</y><xscreen>1370</xscreen><yscreen>172</yscreen><sizeHorzCX>1002928</sizeHorzCX><sizeHorzCY>237241</sizeHorzCY><sizeVertCX>146413</sizeVertCX><sizeVertCY>275862</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
|
||||
</Desktop>
|
||||
</Workspace>
|
||||
|
||||
|
||||
10108
sk-mlpc2368.dep
10108
sk-mlpc2368.dep
File diff suppressed because it is too large
Load Diff
@ -1513,7 +1513,7 @@
|
||||
</option>
|
||||
<option>
|
||||
<name>OOCOutputFile</name>
|
||||
<state>changer0_07.hex</state>
|
||||
<state>changer0_08.hex</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>OOCCommandLineProducer</name>
|
||||
@ -1567,7 +1567,7 @@
|
||||
</option>
|
||||
<option>
|
||||
<name>IlinkOutputFile</name>
|
||||
<state>version0_07.out</state>
|
||||
<state>version0_08.out</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>IlinkDebugInfoEnable</name>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user