Merge Pull Request from <dev>

This commit is contained in:
but0n 2016-12-18 16:10:24 +08:00
commit 72075c218b

View File

@ -35,22 +35,19 @@ void uart_sendData(unsigned char data) {
} }
void uart_showData(short k) { void uart_showData(short k) {
unsigned char a, b, c, d, e; char tem[] = "00000";
char *result = tem;
uart_sendData(k<0?'-':'+'); uart_sendData(k<0 ? '-':'+');
if(k<0) k=-k; if(k<0)
e = (unsigned char)(k % 10); k = -k;
d = (unsigned char)(k / 10 % 10); unsigned short bit = 1;
c = (unsigned char)(k / 100 % 10); while(*result) {
b = (unsigned char)(k / 1000 % 10); (*result++) = (char)(k / bit % 10 + '0');
a = (unsigned char)(k / 10000); bit = bit * 10;
}
uart_sendData(a+'0'); for(unsigned char i = 0; i < 5; i++)
uart_sendData(b+'0'); uart_sendData(tem[4-i]);
uart_sendData(c+'0');
uart_sendData(d+'0');
uart_sendData(e+'0');
uart_sendData(' ');
} }
unsigned char uart_Float2Char(float value) { unsigned char uart_Float2Char(float value) {