@@ -10,7 +10,8 @@ import * as child_process from 'child_process';
1010
1111import { File } from "../lib/node-utility/File" ;
1212import {
13- view_str$compile$storageLayout , view_str$compile$useCustomScatterFile , view_str$compile$scatterFilePath ,
13+ view_str$compile$storageLayout ,
14+ view_str$compile$useCustomScatterFile , view_str$compile$scatterFilePath , view_str$compile$scatterFilePath_mdk ,
1415 view_str$compile$floatingPointHardware , view_str$compile$cpuType , view_str$compile$deprecated ,
1516 view_str$compile$options ,
1617 view_str$flasher$binPath ,
@@ -570,6 +571,9 @@ export abstract class ArmBaseCompileConfigModel
570571 }
571572
572573 GetKeyDescription ( key : string ) : string {
574+
575+ const toolchain = this . prjConfigData . toolchain ;
576+
573577 switch ( key ) {
574578 case 'cpuType' :
575579 return view_str$compile$cpuType ;
@@ -578,7 +582,9 @@ export abstract class ArmBaseCompileConfigModel
578582 case 'useCustomScatterFile' :
579583 return view_str$compile$useCustomScatterFile ;
580584 case 'scatterFilePath' :
581- return view_str$compile$scatterFilePath ;
585+ return ( toolchain == 'AC5' || toolchain == 'AC6' )
586+ ? view_str$compile$scatterFilePath_mdk
587+ : view_str$compile$scatterFilePath ;
582588 case 'floatingPointHardware' :
583589 return view_str$compile$floatingPointHardware ;
584590 case 'options' :
0 commit comments