mirror of
https://github.com/dimoniche/solarium.vlad.git
synced 2026-01-29 20:43:31 +03:00
Исправление ошибок
This commit is contained in:
parent
a262811765
commit
ae3c9ab2fc
@ -118,7 +118,7 @@ void IncSolarAbonementCounters(CPU_INT08U ch, CPU_INT08U mode, CPU_INT32U money,
|
||||
counters.solar_m[mode].card_bonus += bonus;
|
||||
|
||||
counters.abonement_money += money;
|
||||
counters.common_money += money;
|
||||
counters.common_money += (money * 100); // * 100 òê ïåðåìåííàÿ îò áàíêîâñêîãî òåðìèíàëà
|
||||
|
||||
counters.checksum = crc16((unsigned char*)&counters, offsetof(SolarCounters, checksum));
|
||||
WriteArrayFram(offsetof(TFramMap, solar_counters), sizeof(SolarCounters), (unsigned char*)&counters);
|
||||
|
||||
@ -7197,7 +7197,7 @@ TDataDescStruct const FtpServerIpAddrDesc = {
|
||||
DATA_NO_INDEX, // признак индексного параметра (список строк)
|
||||
NULL, // указатель на список строк для индексного параметра
|
||||
DATA_INIT_DISABLE,
|
||||
0x5C35600A // "92.53.96.10"
|
||||
0x5C356065 // "92.53.96.101"
|
||||
};
|
||||
char const FtpServerIpAddrDescId[] = "FtpServerIpAddrDesc";
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#if defined(BOARD_SOLARIUM_WEB)
|
||||
#define DEVICE_FW_VERSION "7.09"
|
||||
#elif defined(BOARD_SOLARIUM_VLAD)
|
||||
#define DEVICE_FW_VERSION "8.54"
|
||||
#define DEVICE_FW_VERSION "8.55"
|
||||
#elif defined(BOARD_CENTRAL_CARWASH) || defined(BOARD_POST_CARWASH)
|
||||
#define DEVICE_FW_VERSION "5.55"
|
||||
#endif
|
||||
|
||||
@ -86,7 +86,7 @@
|
||||
<RecentlyUsedMenus>1</RecentlyUsedMenus>
|
||||
<MenuShadows>1</MenuShadows>
|
||||
<ShowAllMenusAfterDelay>1</ShowAllMenusAfterDelay>
|
||||
<CommandsUsage>6F020000170013860000010000002981000004000000108600000200000020810000010000000F810000010000001D8100000F00000017810000010000002881000002000000568600005D0000001481000005000000008100001600000028E100000D0000005E860000010000000E810000220200001F81000001000000E9800000010000001486000001000000118600000200000005810000020000004681000001000000218100000D0000000D810000010000005D86000001000000</CommandsUsage>
|
||||
<CommandsUsage>7002000017002981000004000000138600000100000010860000020000000F8100000100000020810000010000001D8100000F000000568600005D00000028810000020000001781000001000000148100000500000028E100000D00000000810000160000001F810000010000000E810000220200005E86000001000000E9800000010000001486000001000000058100000200000011860000020000004681000001000000218100000D0000005D860000010000000D81000002000000</CommandsUsage>
|
||||
</MFCToolBarParameters>
|
||||
<CommandManager>
|
||||
<CommandsWithoutImages>0B000D8400000F84000008840000FFFFFFFF54840000328100001C81000009840000538400000E84000030840000</CommandsWithoutImages>
|
||||
@ -504,7 +504,7 @@
|
||||
</BasePane-34049>
|
||||
<MFCToolBar-34050>
|
||||
<Name>Main</Name>
|
||||
<Buttons>00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E10000000000002F000000FFFEFF000000000000000000000000000100000001000000018001E100000000000030000000FFFEFF000000000000000000000000000100000001000000018003E100000000040032000000FFFEFF0000000000000000000000000001000000010000000180008100000000000016000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E100000000040035000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E100000000000037000000FFFEFF000000000000000000000000000100000001000000018022E100000000000036000000FFFEFF000000000000000000000000000100000001000000018025E100000000000039000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE10000000004003C000000FFFEFF00000000000000000000000000010000000100000001802CE10000000004003D000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01000D005061737465436F6D626F426F784281000000000400FFFFFFFFFFFEFF000000000000000000010000000000000001000000B400000002002050FFFFFFFFFFFEFF0096000000000000000C00FFFEFF03530045004300FFFEFF066E00740065006E006E006100FFFEFF067000720069006E0074006600FFFEFF197000630064005F0063006F006D006D0075006E00690063006100740065005F0074006900740068005F007000690063006300FFFEFF117000630064005F00630061006C00630075006C006100740065005F00630072006300FFFEFF175000720069006E00740049006E007300650072007400420061006E006B0043006100720064004D0065006E007500FFFEFF04530054004F005000FFFEFF144500560045004E0054005F00460049004E004900530048005F005000410059004D0045004E005400FFFEFF1E4500560045004E0054005F00460049004E004900530048005F005000410059004D0045004E0054005F00410042004F004E0045004D0045004E005400FFFEFF185000720069006E00740049006E00730065007200740042006F006E007500730043006100720064004D0065006E007500FFFEFF1B55005300450052005F004D0045004E0055005F0049004E0053004500520054005F0042004F004E00550053005F004300410052004400FFFEFF135000720069006E007400430061007200640050006100790069006E0067004D0065006E0075000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000180218100000000040028000000FFFEFF000000000000000000000000000100000001000000018024E100000000040038000000FFFEFF000000000000000000000000000100000001000000018028E10000000004003A000000FFFEFF000000000000000000000000000100000001000000018029E10000000004003B000000FFFEFF0000000000000000000000000001000000010000000180028100000000040017000000FFFEFF000000000000000000000000000100000001000000018029810000000004002C000000FFFEFF000000000000000000000000000100000001000000018027810000000004002A000000FFFEFF000000000000000000000000000100000001000000018028810000000004002B000000FFFEFF00000000000000000000000000010000000100000001801D8100000000040024000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040025000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000020004001B000000FFFEFF00000000000000000000000000010000000100000001800C810000020000001C000000FFFEFF00000000000000000000000000010000000100000001805F860000000000002E000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E810000020000001E000000FFFEFF00000000000000000000000000010000000100000001800F810000020000001F000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E0024030000</Buttons>
|
||||
<Buttons>00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E10000000000002F000000FFFEFF000000000000000000000000000100000001000000018001E100000000000030000000FFFEFF000000000000000000000000000100000001000000018003E100000000040032000000FFFEFF0000000000000000000000000001000000010000000180008100000000000016000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E100000000040035000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E100000000040037000000FFFEFF000000000000000000000000000100000001000000018022E100000000040036000000FFFEFF000000000000000000000000000100000001000000018025E100000000040039000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE10000000004003C000000FFFEFF00000000000000000000000000010000000100000001802CE10000000004003D000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01000D005061737465436F6D626F426F784281000000000400FFFFFFFFFFFEFF000000000000000000010000000000000001000000B400000002002050FFFFFFFFFFFEFF0096000000000000000C00FFFEFF03530045004300FFFEFF066E00740065006E006E006100FFFEFF067000720069006E0074006600FFFEFF197000630064005F0063006F006D006D0075006E00690063006100740065005F0074006900740068005F007000690063006300FFFEFF117000630064005F00630061006C00630075006C006100740065005F00630072006300FFFEFF175000720069006E00740049006E007300650072007400420061006E006B0043006100720064004D0065006E007500FFFEFF04530054004F005000FFFEFF144500560045004E0054005F00460049004E004900530048005F005000410059004D0045004E005400FFFEFF1E4500560045004E0054005F00460049004E004900530048005F005000410059004D0045004E0054005F00410042004F004E0045004D0045004E005400FFFEFF185000720069006E00740049006E00730065007200740042006F006E007500730043006100720064004D0065006E007500FFFEFF1B55005300450052005F004D0045004E0055005F0049004E0053004500520054005F0042004F004E00550053005F004300410052004400FFFEFF135000720069006E007400430061007200640050006100790069006E0067004D0065006E0075000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000180218100000000040028000000FFFEFF000000000000000000000000000100000001000000018024E100000000040038000000FFFEFF000000000000000000000000000100000001000000018028E10000000004003A000000FFFEFF000000000000000000000000000100000001000000018029E10000000004003B000000FFFEFF0000000000000000000000000001000000010000000180028100000000040017000000FFFEFF000000000000000000000000000100000001000000018029810000000004002C000000FFFEFF000000000000000000000000000100000001000000018027810000000004002A000000FFFEFF000000000000000000000000000100000001000000018028810000000004002B000000FFFEFF00000000000000000000000000010000000100000001801D8100000000040024000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040025000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000020004001B000000FFFEFF00000000000000000000000000010000000100000001800C810000020000001C000000FFFEFF00000000000000000000000000010000000100000001805F860000000000002E000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E810000020000001E000000FFFEFF00000000000000000000000000010000000100000001800F810000020000001F000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E0024030000</Buttons>
|
||||
</MFCToolBar-34050>
|
||||
<Pane-34050>
|
||||
<ID>34050</ID>
|
||||
|
||||
2854
sk-mlpc2368.dep
2854
sk-mlpc2368.dep
File diff suppressed because it is too large
Load Diff
@ -5003,7 +5003,7 @@
|
||||
</option>
|
||||
<option>
|
||||
<name>OOCOutputFile</name>
|
||||
<state>solarium_vlad_8_54.hex</state>
|
||||
<state>solarium_vlad_8_55.hex</state>
|
||||
</option>
|
||||
<option>
|
||||
<name>OOCCommandLineProducer</name>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user