rusefi
/
rusefi-full
mirror of https://github.com/rusefi/rusefi-full.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SHORT_BOARDNAME becomes BUNDLE_NAME

This commit is contained in:
rusefi 2020-07-06 00:48:43 -04:00
parent 08ed3284fb
commit d78089be81
18 changed files with 31106 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/controllers/generated/signature_frankenso_na6.h Normal file
View File

@ -0,0 +1,8 @@
//
// was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt
//
#define SIGNATURE_BOARD frankenso_na6
#define SIGNATURE_DATE 2020.07.06
#define SIGNATURE_HASH 776283387
#define TS_SIGNATURE "rusEFI 2020.07.06.frankenso_na6.776283387"

8
firmware/controllers/generated/signature_mre_f4.h Normal file
View File

@ -0,0 +1,8 @@
//
// was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt
//
#define SIGNATURE_BOARD mre_f4
#define SIGNATURE_DATE 2020.07.06
#define SIGNATURE_HASH 1631789576
#define TS_SIGNATURE "rusEFI 2020.07.06.mre_f4.1631789576"

8
firmware/controllers/generated/signature_mre_f7.h Normal file
View File

@ -0,0 +1,8 @@
//
// was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt
//
#define SIGNATURE_BOARD mre_f7
#define SIGNATURE_DATE 2020.07.06
#define SIGNATURE_HASH 1631789576
#define TS_SIGNATURE "rusEFI 2020.07.06.mre_f7.1631789576"

8
firmware/controllers/generated/signature_prometheus_405.h Normal file
View File

@ -0,0 +1,8 @@
//
// was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt
//
#define SIGNATURE_BOARD prometheus_405
#define SIGNATURE_DATE 2020.07.06
#define SIGNATURE_HASH 2757207833
#define TS_SIGNATURE "rusEFI 2020.07.06.prometheus_405.2757207833"

8
firmware/controllers/generated/signature_prometheus_469.h Normal file
View File

@ -0,0 +1,8 @@
//
// was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt
//
#define SIGNATURE_BOARD prometheus_469
#define SIGNATURE_DATE 2020.07.06
#define SIGNATURE_HASH 2757207833
#define TS_SIGNATURE "rusEFI 2020.07.06.prometheus_469.2757207833"

8
firmware/controllers/generated/signature_proteus_f4.h Normal file
View File

@ -0,0 +1,8 @@
//
// was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt
//
#define SIGNATURE_BOARD proteus_f4
#define SIGNATURE_DATE 2020.07.06
#define SIGNATURE_HASH 721885622
#define TS_SIGNATURE "rusEFI 2020.07.06.proteus_f4.721885622"

8
firmware/controllers/generated/signature_proteus_f7.h Normal file
View File

@ -0,0 +1,8 @@
//
// was generated automatically by rusEfi tool ConfigDefinition.jar based on gen_config.sh integration/rusefi_config.txt
//
#define SIGNATURE_BOARD proteus_f7
#define SIGNATURE_DATE 2020.07.06
#define SIGNATURE_HASH 721885622
#define TS_SIGNATURE "rusEFI 2020.07.06.proteus_f7.721885622"

2
firmware/gen_config.sh
View File

@ -46,7 +46,7 @@ else
cp -v tunerstudio/rusefi_microrusefi.ini $TS_PATH/dev_mre/projectCfg/mainController.ini
fi
for BOARD in "microrusefi mre" "frankenso fra" "prometheus pth" "proteus pro"; do
for BOARD in "microrusefi mre_f7" "microrusefi mre_f4" "frankenso frankenso_na6" "prometheus prometheus_469" "prometheus prometheus_405" "proteus proteus_f7" "proteus proteus_f4"; do
BOARD_NAME="${BOARD% *}"
BOARD_SHORT_NAME="${BOARD#* }"
sh gen_config_board.sh $BOARD_NAME $BOARD_SHORT_NAME

2
firmware/gen_config_board.sh
View File

@ -37,7 +37,7 @@ java -DSystemOut.name=gen_config_board \
-definition integration/rusefi_config.txt \
-tool gen_config.sh \
-ts_destination tunerstudio \
-cache ${BOARDNAME} \
-cache ${SHORT_BOARDNAME} \
-cache_zip_file tunerstudio/cache.zip \
-firing_order controllers/algo/firing_order.h \
-ts_output_name rusefi_${SHORT_BOARDNAME}.ini \

1
firmware/integration/rusefi_config.txt
View File

@ -35,7 +35,6 @@
! rusEFI console from TS_FILE_VERSION to TS_SIGNATURE :(
#define TS_FILE_VERSION 20200310
! This is the version of the data stored in flash configuration
! Any time an incompatible change is made to the configuration format stored in flash,
! update this string to the current date! It is required to also update TS_SIGNATURE above

4454
firmware/tunerstudio/rusefi_frankenso_na6.ini Normal file
View File

File diff suppressed because it is too large Load Diff

4425
firmware/tunerstudio/rusefi_mre_f4.ini Normal file
View File

File diff suppressed because it is too large Load Diff

4425
firmware/tunerstudio/rusefi_mre_f7.ini Normal file
View File

File diff suppressed because it is too large Load Diff

4450
firmware/tunerstudio/rusefi_prometheus_405.ini Normal file
View File

File diff suppressed because it is too large Load Diff

4450
firmware/tunerstudio/rusefi_prometheus_469.ini Normal file
View File

File diff suppressed because it is too large Load Diff

4421
firmware/tunerstudio/rusefi_proteus_f4.ini Normal file
View File

File diff suppressed because it is too large Load Diff

4421
firmware/tunerstudio/rusefi_proteus_f7.ini Normal file
View File

File diff suppressed because it is too large Load Diff

5
java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java
View File

@ -98,8 +98,6 @@ public class ConfigDefinition {
String signaturePrependFile = null;
CHeaderConsumer.withC_Defines = true;
// used to update .ini files
List<String> inputAllFiles = new ArrayList<>();
// used to update other files
List<String> inputFiles = new ArrayList<>();
// disable the lazy checks because we use timestamps to detect changes
@ -162,7 +160,8 @@ public class ConfigDefinition {
}
}
inputAllFiles = new ArrayList<>(inputFiles);
// used to update .ini files
List<String> inputAllFiles = new ArrayList<>(inputFiles);
boolean needToUpdateTsFiles = false;
if (tsPath != null) {
inputAllFiles.add(TSProjectConsumer.getTsFileInputName(tsPath));