INI Request: rusEFI 2020.07.06.mre_f4.2108843221 #54

.github/workflows/gen-configs.yaml

@@ -22,7 +22,7 @@ jobs:
       run: sh gen_config.sh
 
     - name: Upload .ini files
-      working-directory: ./firmware/tunerstudio
+      working-directory: ./firmware/tunerstudio/generated
 #      run: ./upload.sh ${{ secrets.RUSEFI_DOXYGEN_FTP_USER }} ${{ secrets.RUSEFI_DOXYGEN_FTP_PASS }} ${{ secrets.RUSEFI_FTP_SERVER }}
       run: ./upload.sh ${{ secrets.RUSEFI_ONLINE_FTP_USER }} ${{ secrets.RUSEFI_ONLINE_FTP_PASS }} ${{ secrets.RUSEFI_FTP_SERVER }}
 

firmware/gen_config.sh

@@ -19,6 +19,7 @@ java -DSystemOut.name=gen_config \
  -definition integration/rusefi_config.txt \
  -romraider integration \
  -ts_destination tunerstudio \
+ -ts_output_name generated/rusefi.ini \
  -cache . \
  -cache_zip_file tunerstudio/generated/cache.zip \
  -with_c_defines false \
@@ -42,7 +43,7 @@ if [ -z "${TS_PATH}" ]; then
  echo "TS_PATH not defined"
 else
  echo "This would automatically copy latest file to 'dev' TS project at ${TS_PATH}"
- cp -v tunerstudio/rusefi.ini $TS_PATH/dev/projectCfg/mainController.ini
+ cp -v tunerstudio/generated/rusefi.ini $TS_PATH/dev/projectCfg/mainController.ini
  cp -v tunerstudio/generated/rusefi_microrusefi.ini $TS_PATH/dev_mre/projectCfg/mainController.ini
 fi
 

firmware/tunerstudio/upload.sh

@@ -6,7 +6,9 @@ if [ ! "$1" ] || [ ! "$2" ] || [ ! "$3" ]; then
  exit 0
 fi
 
+pwd
 echo -e "\nUploading .ini files"
+ls -l .
 
 for f in *.ini; do if [[ -f "$f" ]]; then
   echo "Processing file $f:"