Use my_atoui for parse string command

pull/4/head
DiSlord 6 years ago
parent 46616a6ce7
commit 1e71848eb9

@ -274,36 +274,18 @@ VNA_SHELL_FUNCTION(cmd_v)
shell_printf("VFO %d\r\n", VFO); shell_printf("VFO %d\r\n", VFO);
} }
int xtoi(char *t)
{
int v=0;
while (*t) {
if ('0' <= *t && *t <= '9')
v = v*16 + *t - '0';
else if ('a' <= *t && *t <= 'f')
v = v*16 + *t - 'a' + 10;
else if ('A' <= *t && *t <= 'F')
v = v*16 + *t - 'A' + 10;
else
return v;
t++;
}
return v;
}
VNA_SHELL_FUNCTION(cmd_y) VNA_SHELL_FUNCTION(cmd_y)
{ {
int rvalue; int rvalue;
int lvalue = 0; int lvalue = 0;
if (argc != 1 && argc != 2) { if (argc != 1 && argc != 2) {
shell_printf("usage: y {addr(0-95)} [value(0-FF)]\r\n"); shell_printf("usage: y {addr(0-95)} [value(0-0xFF)]\r\n");
return; return;
} }
rvalue = xtoi(argv[0]); rvalue = my_atoui(argv[0]);
SI4432_Sel = VFO; SI4432_Sel = VFO;
if (argc == 2){ if (argc == 2){
lvalue = xtoi(argv[1]); lvalue = my_atoui(argv[1]);
SI4432_Write_Byte(rvalue, lvalue); SI4432_Write_Byte(rvalue, lvalue);
} else { } else {
lvalue = SI4432_Read_Byte(rvalue); lvalue = SI4432_Read_Byte(rvalue);
@ -359,7 +341,7 @@ return; // Don't use!!!!
SI4432_Init(); SI4432_Init();
shell_printf("SI4432 init done\r\n"); shell_printf("SI4432 init done\r\n");
if (argc == 1) { if (argc == 1) {
rvalue = xtoi(argv[0]); rvalue = my_atoui(argv[0]);
set_switches(rvalue); set_switches(rvalue);
set_mode(rvalue); set_mode(rvalue);
shell_printf("SI4432 mode %d set\r\n", rvalue); shell_printf("SI4432 mode %d set\r\n", rvalue);
@ -392,7 +374,7 @@ VNA_SHELL_FUNCTION(cmd_a)
shell_printf("a=%d\r\n", frequencyStart); shell_printf("a=%d\r\n", frequencyStart);
return; return;
} }
int32_t value = my_atoi(argv[0]); uint32_t value = my_atoui(argv[0]);
frequencyStart = value; frequencyStart = value;
} }
@ -404,7 +386,7 @@ VNA_SHELL_FUNCTION(cmd_b)
shell_printf("b=%d\r\n", frequencyStop); shell_printf("b=%d\r\n", frequencyStop);
return; return;
} }
int32_t value = my_atoi(argv[0]); uint32_t value = my_atoui(argv[0]);
frequencyStop = value; frequencyStop = value;
} }

Loading…
Cancel
Save

Powered by TurnKey Linux.