Skip to content

Commit

Permalink
Merge branch 'bluetag'
Browse files Browse the repository at this point in the history
  • Loading branch information
DESKTOP-7VKKLTO\ian committed Feb 3, 2025
2 parents e2c1018 + 8c32509 commit d46c576
Show file tree
Hide file tree
Showing 7 changed files with 61 additions and 13 deletions.
31 changes: 18 additions & 13 deletions src/commands/jtag/bluetag.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ static const char* const usage[] = { "bluetag [jtag|swd] [-c <channels>] [-v(ers
// values
// 4. Use the new T_ constant in the help text for the command
static const struct ui_help_options options[] = {
{ 1, "", T_HELP_DUMMY_COMMANDS }, // section heading
/*{ 0, "init", T_HELP_DUMMY_INIT }, // init is an example we'll find by position
{ 0, "test", T_HELP_DUMMY_TEST }, // test is an example we'll find by position
{ 1, "", T_HELP_DUMMY_FLAGS }, // section heading for flags
{ 0, "-b", T_HELP_DUMMY_B_FLAG }, //-a flag, with no optional string or integer
{ 0, "-i", T_HELP_DUMMY_I_FLAG }, //-b flag, with optional integer
{ 0, "-f", T_HELP_DUMMY_FILE_FLAG }, //-f flag, a file name string*/
{ 1, "", T_JTAG_BLUETAG_OPTIONS }, // section heading
{ 0, "jtag", T_JTAG_BLUETAG_JTAG }, // jtag is an example we'll find by position
{ 0, "swd", T_JTAG_BLUETAG_SWD }, // swd is an example we'll find by position
{ 1, "", T_JTAG_BLUETAG_FLAGS }, // section heading for flags
{ 0, "-c", T_JTAG_BLUETAG_CHANNELS }, //-c flag, with optional integer
{ 0, "-v", T_JTAG_BLUETAG_VERSION }, //-v flag, show version
{ 0, "-d", T_JTAG_BLUETAG_DISABLE }, //-d flag, disable pin pulsing
};

static void bluetag_cli(void);
Expand All @@ -65,6 +65,12 @@ void bluetag_handler(struct command_result* res) {
return;
}

//print version
if(cmdln_args_find_flag('v')){
printf("\r\nCurrent version: %s\r\n\r\n", version);
return;
}

// check for option verb
char action_str[5]; // somewhere to store the parameter string
bool jtag=false;
Expand All @@ -79,10 +85,6 @@ void bluetag_handler(struct command_result* res) {
return;
}

//print version
if(cmdln_args_find_flag('v')){
printf("\r\nCurrent version: %s\r\n\r\n", version);
}
//disable pin pulsing
bool disable_pulse=cmdln_args_find_flag('d');
if(disable_pulse){
Expand All @@ -96,6 +98,8 @@ void bluetag_handler(struct command_result* res) {
if(!c_flag){
printf("\r\nSpecify the number of channels with the -c flag, -h for help\r\n");
return;
}else{
printf("\r\nNumber of channels set to: %d\r\n\r\n", channels);
}

// lets do jtag!
Expand Down Expand Up @@ -219,6 +223,8 @@ static void bluetag_cli(void){
{
rx_fifo_get_blocking(&cmd);
printf("%c\r\n",cmd);
struct jtagScan_t jtag;
struct swdScan_t swd;
switch(cmd)
{
// Help menu requested
Expand All @@ -232,7 +238,6 @@ static void bluetag_cli(void){

case 'j':
jtag_cleanup();
struct jtagScan_t jtag;
jtag.channelCount = get_channels(4, 8);
jtag.jPulsePins = jPulsePins;
if(jtag.channelCount == 0){
Expand All @@ -257,7 +262,7 @@ static void bluetag_cli(void){

case 's':
jtag_cleanup();
struct swdScan_t swd;
//struct swdScan_t swd;
swd.channelCount = get_channels(2, 8);
if(swd.channelCount == 0){
printf("\r\nAbort\r\n\r\n");
Expand Down
7 changes: 7 additions & 0 deletions src/translation/base.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,13 @@ enum T_translations{
T_HELP_IRTX_FILE_FLAG,
T_HELP_IRRX_FILE_FLAG,
T_HELP_IRRX_SENSOR_FLAG,
T_JTAG_BLUETAG_OPTIONS,
T_JTAG_BLUETAG_JTAG,
T_JTAG_BLUETAG_SWD,
T_JTAG_BLUETAG_FLAGS,
T_JTAG_BLUETAG_CHANNELS,
T_JTAG_BLUETAG_VERSION,
T_JTAG_BLUETAG_DISABLE,
T_CMDLN_INVALID_COMMAND,
T_CMDLN_NO_HELP,
T_CMDLN_LS,
Expand Down
7 changes: 7 additions & 0 deletions src/translation/bs-ba.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,13 @@ static char const * const bs_ba[T_LAST_ITEM_ALWAYS_AT_THE_END]={
[ T_HELP_IRTX_FILE_FLAG ] = NULL,
[ T_HELP_IRRX_FILE_FLAG ] = NULL,
[ T_HELP_IRRX_SENSOR_FLAG ] = NULL,
[ T_JTAG_BLUETAG_OPTIONS ] = NULL,
[ T_JTAG_BLUETAG_JTAG ] = NULL,
[ T_JTAG_BLUETAG_SWD ] = NULL,
[ T_JTAG_BLUETAG_FLAGS ] = NULL,
[ T_JTAG_BLUETAG_CHANNELS ] = NULL,
[ T_JTAG_BLUETAG_VERSION ] = NULL,
[ T_JTAG_BLUETAG_DISABLE ] = NULL,
[ T_CMDLN_INVALID_COMMAND ] = "Nevažeća naredba: %s. Unesite ? za pomoć.",
[ T_CMDLN_NO_HELP ] = "Pomoć trenutno nije dostupna za ovu naredbu.",
[ T_CMDLN_LS ] = "ls {direktorij} - listing datoteka u trenutnoj lokaciji ili {direktorij} lokaciji.",
Expand Down
8 changes: 8 additions & 0 deletions src/translation/en-us.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,14 @@ static char const * const en_us[]={
[T_HELP_IRTX_FILE_FLAG]="Transmit one or more aIR packets from a file",
[T_HELP_IRRX_FILE_FLAG]="Specify filename for saved signals",
[T_HELP_IRRX_SENSOR_FLAG]="Specify sensor for received signals (38B/38D/56D)irtx -h",
//JTAG
[T_JTAG_BLUETAG_OPTIONS]="blueTAG options",
[T_JTAG_BLUETAG_JTAG]="Scan for JTAG pins",
[T_JTAG_BLUETAG_SWD]="Scan for SWD pins",
[T_JTAG_BLUETAG_FLAGS]="Flags",
[T_JTAG_BLUETAG_CHANNELS]="Number of channels to scan (starting from IO0)",
[T_JTAG_BLUETAG_VERSION]="Show version",
[T_JTAG_BLUETAG_DISABLE]="Disable pin pulsing (JTAG mode)",
//COMMAND LINE
[T_CMDLN_INVALID_COMMAND]="Invalid command: %s. Type ? for help.",
[T_CMDLN_NO_HELP]="Help not currently available for this command.",
Expand Down
7 changes: 7 additions & 0 deletions src/translation/it-it.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,13 @@ static char const * const it_it[T_LAST_ITEM_ALWAYS_AT_THE_END]={
[ T_HELP_IRTX_FILE_FLAG ] = NULL,
[ T_HELP_IRRX_FILE_FLAG ] = NULL,
[ T_HELP_IRRX_SENSOR_FLAG ] = NULL,
[ T_JTAG_BLUETAG_OPTIONS ] = NULL,
[ T_JTAG_BLUETAG_JTAG ] = NULL,
[ T_JTAG_BLUETAG_SWD ] = NULL,
[ T_JTAG_BLUETAG_FLAGS ] = NULL,
[ T_JTAG_BLUETAG_CHANNELS ] = NULL,
[ T_JTAG_BLUETAG_VERSION ] = NULL,
[ T_JTAG_BLUETAG_DISABLE ] = NULL,
[ T_CMDLN_INVALID_COMMAND ] = "Comando non valido: %s. Digita ? per ottenere aiuto.",
[ T_CMDLN_NO_HELP ] = "Aiuto non disponibile al momento per questo comando.",
[ T_CMDLN_LS ] = "ls <directory> - elenca i file nella cartella corrente o nella cartella <directory>.",
Expand Down
7 changes: 7 additions & 0 deletions src/translation/pl-pl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,13 @@ static char const * const pl_pl[T_LAST_ITEM_ALWAYS_AT_THE_END]={
[ T_HELP_IRTX_FILE_FLAG ] = NULL,
[ T_HELP_IRRX_FILE_FLAG ] = NULL,
[ T_HELP_IRRX_SENSOR_FLAG ] = NULL,
[ T_JTAG_BLUETAG_OPTIONS ] = NULL,
[ T_JTAG_BLUETAG_JTAG ] = NULL,
[ T_JTAG_BLUETAG_SWD ] = NULL,
[ T_JTAG_BLUETAG_FLAGS ] = NULL,
[ T_JTAG_BLUETAG_CHANNELS ] = NULL,
[ T_JTAG_BLUETAG_VERSION ] = NULL,
[ T_JTAG_BLUETAG_DISABLE ] = NULL,
[ T_CMDLN_INVALID_COMMAND ] = "Niepoprawne polecenie: %s. Użyj ? aby użyskać pomoc.",
[ T_CMDLN_NO_HELP ] = "Pomoc dla tego polecenia jest aktualnie niedostępna.",
[ T_CMDLN_LS ] = "ls {katalog} - listuje pliki w aktualnej lokacji albo {katalogu}.",
Expand Down
7 changes: 7 additions & 0 deletions src/translation/zh-cn.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,13 @@ static char const * const zh_cn[T_LAST_ITEM_ALWAYS_AT_THE_END]={
[ T_HELP_IRTX_FILE_FLAG ] = NULL,
[ T_HELP_IRRX_FILE_FLAG ] = NULL,
[ T_HELP_IRRX_SENSOR_FLAG ] = NULL,
[ T_JTAG_BLUETAG_OPTIONS ] = NULL,
[ T_JTAG_BLUETAG_JTAG ] = NULL,
[ T_JTAG_BLUETAG_SWD ] = NULL,
[ T_JTAG_BLUETAG_FLAGS ] = NULL,
[ T_JTAG_BLUETAG_CHANNELS ] = NULL,
[ T_JTAG_BLUETAG_VERSION ] = NULL,
[ T_JTAG_BLUETAG_DISABLE ] = NULL,
[ T_CMDLN_INVALID_COMMAND ] = NULL,
[ T_CMDLN_NO_HELP ] = NULL,
[ T_CMDLN_LS ] = NULL,
Expand Down

0 comments on commit d46c576

Please sign in to comment.