mirror of
https://github.com/dimoniche/solarium.vlad.git
synced 2026-01-29 20:43:31 +03:00
Merge branch 'develop' into feature/new_journal
This commit is contained in:
commit
6a2fb3730a
@ -4,7 +4,7 @@
|
|||||||
#if defined(BOARD_SOLARIUM_WEB)
|
#if defined(BOARD_SOLARIUM_WEB)
|
||||||
#define DEVICE_FW_VERSION "7.09"
|
#define DEVICE_FW_VERSION "7.09"
|
||||||
#elif defined(BOARD_SOLARIUM_VLAD)
|
#elif defined(BOARD_SOLARIUM_VLAD)
|
||||||
#define DEVICE_FW_VERSION "8.48"
|
#define DEVICE_FW_VERSION "8.49"
|
||||||
#elif defined(BOARD_CENTRAL_CARWASH) || defined(BOARD_POST_CARWASH)
|
#elif defined(BOARD_CENTRAL_CARWASH) || defined(BOARD_POST_CARWASH)
|
||||||
#define DEVICE_FW_VERSION "5.55"
|
#define DEVICE_FW_VERSION "5.55"
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
2561
sk-mlpc2368.dep
2561
sk-mlpc2368.dep
File diff suppressed because it is too large
Load Diff
@ -5003,7 +5003,7 @@
|
|||||||
</option>
|
</option>
|
||||||
<option>
|
<option>
|
||||||
<name>OOCOutputFile</name>
|
<name>OOCOutputFile</name>
|
||||||
<state>solarium_vlad_8_48.hex</state>
|
<state>solarium_vlad_8_49.hex</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
<option>
|
||||||
<name>OOCCommandLineProducer</name>
|
<name>OOCCommandLineProducer</name>
|
||||||
@ -5021,7 +5021,7 @@
|
|||||||
<data>
|
<data>
|
||||||
<extensions></extensions>
|
<extensions></extensions>
|
||||||
<cmdline></cmdline>
|
<cmdline></cmdline>
|
||||||
<hasPrio>176</hasPrio>
|
<hasPrio>1</hasPrio>
|
||||||
<buildSequence>inputOutputBased</buildSequence>
|
<buildSequence>inputOutputBased</buildSequence>
|
||||||
</data>
|
</data>
|
||||||
</settings>
|
</settings>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user