eddy/stm32samples
1
0
Fork 0
mirror of https://github.com/eddyem/stm32samples.git synced 2025-12-06 18:55:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix I2C scan

Browse Source
This commit is contained in:
Edward Emelianov 2021-02-19 00:44:39 +03:00
parent 0db802b031
commit 8bbc858de4
4 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
F1-nolib/I2Cscan/I2Cscan.bin
View File

Binary file not shown.

5
F1-nolib/I2Cscan/main.c
View File

@ -80,8 +80,9 @@ int main(void){
int ok = scan_next_addr(&addr); int ok = scan_next_addr(&addr);
if(addr == I2C_ADDREND) USB_send("Scan ends\n"); if(addr == I2C_ADDREND) USB_send("Scan ends\n");
else if(ok){ else if(ok){
USB_send(u2str(addr)); USB_send(u2hexstr(addr));
USB_send(" - found device\n"); USB_send(" ("); USB_send(u2str(addr));
USB_send(") - found device\n");
} }
} }
char *txt, *ans; char *txt, *ans;

33
F1-nolib/I2Cscan/proto.c
View File

@ -153,17 +153,17 @@ char *getnum(const char *txt, uint32_t *N){
return nxt; return nxt;
} }
static void displaydata(uint8_t *data, int N){ static void displaydata(uint8_t *data, int start, int N){
if(N == 0){ if(N == 0){
USB_send("Done\n"); USB_send("Done\n");
return; return;
} }
USB_send("Got: "); USB_send("Got:\naddr\tval(x)\tval(d)\n");
for(int i = 0; i < N; ++i){ for(int i = 0; i < N; ++i){
USB_send(u2str(data[i])); USB_send(u2hexstr(i+start)); USB_send("\t");
USB_send(" "); USB_send(u2hexstr(data[i])); USB_send("\t");
USB_send(u2str(data[i])); USB_send("\n");
} }
USB_send("\n");
} }
const char* helpmsg = const char* helpmsg =
@ -208,7 +208,7 @@ const char *parse_cmd(const char *buf){
n = Num; n = Num;
if(ptr != getnum(ptr, &Num)){ if(ptr != getnum(ptr, &Num)){
if(Num > 128) return "Not more than 128 bytes\n"; if(Num > 128) return "Not more than 128 bytes\n";
if(read_reg(n, data, Num)) displaydata(data, Num); if(read_reg(n, data, Num)) displaydata(data, n, Num);
else return "Error\n"; else return "Error\n";
}else return "Need data amount to read\n"; }else return "Need data amount to read\n";
}else return "Need register address\n"; }else return "Need register address\n";
@ -258,3 +258,24 @@ char *i2str(int32_t i){
}else val = i; }else val = i;
return _2str(val, minus); return _2str(val, minus);
} }
char *u2hexstr(uint32_t val){
static char strbuf[11] = "0x";
char *sptr = strbuf + 2;
uint8_t *ptr = (uint8_t*)&val + 3;
int8_t i, j, z=1;
for(i = 0; i < 4; ++i, --ptr){
if(*ptr == 0){ // omit leading zeros
if(i == 3) z = 0;
if(z) continue;
}
else z = 0;
for(j = 1; j > -1; --j){
uint8_t half = (*ptr >> (4*j)) & 0x0f;
if(half < 10) *sptr++ = half + '0';
else *sptr++ = half - 10 + 'a';
}
}
*sptr = 0;
return strbuf;
}

1
F1-nolib/I2Cscan/proto.h
View File

@ -26,5 +26,6 @@ char *omit_spaces(const char *buf);
char *getnum(const char *buf, uint32_t *N); char *getnum(const char *buf, uint32_t *N);
char *u2str(uint32_t val); char *u2str(uint32_t val);
char *i2str(int32_t val); char *i2str(int32_t val);
char *u2hexstr(uint32_t val);
#endif // PROTO_H__ #endif // PROTO_H__