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 2022-04-29 00:59:32 +03:00
parent 77478604d3
commit 1a594a882d
8 changed files with 8187 additions and 8173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7603
Flash Central/Exe/changer0_25.hex → Flash Central/Exe/changer0_26.hex
View File

File diff suppressed because it is too large Load Diff

2
PROJECT/app/app_serv.c
View File

@ -1058,6 +1058,8 @@ void UserStartupFunc(void)
UserQuery = OSQCreate(&UserTbl[0], USER_QUERY_LEN);
OSTaskCreate(UserAppTask, (void *)0, (OS_STK *)&UserTaskStk[USER_TASK_STK_SIZE-1], USER_TASK_PRIO);
}
//InitConsole();
#ifdef CONFIG_FTP_CLIENT_ENABLE
InitFTPApp();

9
PROJECT/data/datadesc.c
View File

@ -1622,11 +1622,9 @@ void OnChangeInitByDefault(void)
InitByDefault = 0;
CPU_INT08U flag[4] = {0xAA, 0x55, 0x81, 0xC3};
char name[32] = "Óñëóãè àâòîìîéêè\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
char name[32] = "Óñëóãè ìîéêè ñàìîîáñëóæèâàíèÿ\0\0\0";
WriteArrayFram(offsetof(TFramMap, manual_service_flag), 4, (unsigned char*)&flag);
WriteArrayFram(offsetof(TFramMap, manual_service_name), 32, (unsigned char*)&name);
}
@ -2943,11 +2941,12 @@ TDataDescStruct const CommandV2Desc = {
/*************************************
Íàçâàíèå óñëóãè
*************************************/
TRangeValueULONG const ServiceNameRange = {0, 1};
TRangeValueULONG const ServiceNameRange = {0, 2};
CPU_INT08U const ServiceNameName[] = "Òîâàð";
CPU_INT08U const ServiceNameList_str0[] = "Æåòîí";
CPU_INT08U const ServiceNameList_str1[] = "Óñëóãè ìîéêè";
CPU_INT08U const *ServiceNameList[] = {ServiceNameList_str0, ServiceNameList_str1};
CPU_INT08U const ServiceNameList_str3[] = "Óñëóãà òóàëåò";
CPU_INT08U const *ServiceNameList[] = {ServiceNameList_str0, ServiceNameList_str1, ServiceNameList_str3};
void OnChangeServiceName(void)
{

10
PROJECT/services/fr.c
View File

@ -734,6 +734,11 @@ repeat_sell1:
static const char sss[] = "Óñëóãè ìîéêè ñàìîîáñëóæèâàíèÿ";
strcpy(service_name, sss);
}
else if (serv_index == 2)
{
static const char sss[] = "Óñëóãà ïëàòíûé òóàëåò";
strcpy(service_name, sss);
}
else
{
GetDataStr(&ServiceNameDesc, (CPU_INT08U*)service_name, 0, DATA_FLAG_SYSTEM_INDEX);
@ -834,6 +839,11 @@ repeat_sell2:
static const char sss[] = "Óñëóãè ìîéêè ñàìîîáñëóæèâàíèÿ";
strcpy(service_name, sss);
}
else if (serv_index == 2)
{
static const char sss[] = "Óñëóãà ïëàòíûé òóàëåò";
strcpy(service_name, sss);
}
else
{
GetDataStr(&ServiceNameDesc, (CPU_INT08U*)service_name, 0, DATA_FLAG_SYSTEM_INDEX);

2
PROJECT/version.h
View File

@ -1,7 +1,7 @@
#ifndef _VERSION_H_
#define _VERSION_H_
#define DEVICE_FW_VERSION "00.25"
#define DEVICE_FW_VERSION "00.26"
#endif // #ifndef _VERSION_H_

6
settings/sk-mlpc2368.wsdt
View File

@ -12,7 +12,7 @@
<Column0>249</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
<Column0>237</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
</Workspace>
<Build>
@ -48,14 +48,14 @@
<Pane><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\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>1175</YPos><SelStart>47959</SelStart><SelEnd>47959</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>264</YPos><SelStart>9688</SelStart><SelEnd>9688</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\data\fram_map.h</Filename><XPos>0</XPos><YPos>72</YPos><SelStart>2039</SelStart><SelEnd>2062</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>3701</YPos><SelStart>171867</SelStart><SelEnd>171867</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>364</YPos><SelStart>13738</SelStart><SelEnd>13738</SelEnd></Tab><ActiveTab>23</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\PROJECT\services\fr.c</Filename><XPos>0</XPos><YPos>1072</YPos><SelStart>27982</SelStart><SelEnd>27982</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>348</YPos><SelStart>8381</SelStart><SelEnd>8381</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>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\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><ActiveTab>18</ActiveTab><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>1042</YPos><SelStart>37768</SelStart><SelEnd>37768</SelEnd></Tab><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-03ec2c28><key>iaridepm.enu1</key></Toolbar-03ec2c28></Sizes></Row0></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>745</Bottom><Right>323</Right><x>-2</x><y>-2</y><xscreen>952</xscreen><yscreen>509</yscreen><sizeHorzCX>495833</sizeHorzCX><sizeHorzCY>510532</sizeHorzCY><sizeVertCX>169271</sizeVertCX><sizeVertCY>749248</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>207</Bottom><Right>1922</Right><x>-2</x><y>-2</y><xscreen>1924</xscreen><yscreen>209</yscreen><sizeHorzCX>1002083</sizeHorzCX><sizeHorzCY>209629</sizeHorzCY><sizeVertCX>146354</sizeVertCX><sizeVertCY>259779</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
<Top><Row0><Sizes><Toolbar-05682070><key>iaridepm.enu1</key></Toolbar-05682070></Sizes></Row0></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>652</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>655968</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>300</Bottom><Right>1922</Right><x>-2</x><y>-2</y><xscreen>1924</xscreen><yscreen>302</yscreen><sizeHorzCX>1002083</sizeHorzCX><sizeHorzCY>302909</sizeHorzCY><sizeVertCX>140625</sizeVertCX><sizeVertCY>231695</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
</Desktop>
</Workspace>

8726
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_25.hex</state>
<state>changer0_26.hex</state>
</option>
<option>
<name>OOCCommandLineProducer</name>