|
|
|
@ -176,7 +176,8 @@ int DAQ(int t_hrs, int sp_s)
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
char *getMeasures(char src[], char fval, int nchar){
|
|
|
|
|
char *getMeasures(char src[], char fval, int nchar)
|
|
|
|
|
{
|
|
|
|
|
char * ptr = &src[0];
|
|
|
|
|
static char s[10]="";
|
|
|
|
|
|
|
|
|
@ -185,32 +186,3 @@ char *getMeasures(char src[], char fval, int nchar){
|
|
|
|
|
memcpy(s, ptr, nchar);
|
|
|
|
|
return s;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int read_measure(unsigned char uartNumber, int multiplier, int excess){
|
|
|
|
|
int measure;
|
|
|
|
|
uartReceive(uartNumber);
|
|
|
|
|
measure = (str2int(&receive[uartNumber]) - excess)*multiplier ;
|
|
|
|
|
return measure;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int str2int(unsigned char *ptr){
|
|
|
|
|
|
|
|
|
|
int number = 0;
|
|
|
|
|
|
|
|
|
|
while (*ptr != '\0') {
|
|
|
|
|
if ((*ptr >= '0') && (*ptr <= '9')) {
|
|
|
|
|
int dig = (*ptr) - '0';
|
|
|
|
|
number = number*10 + dig;
|
|
|
|
|
}
|
|
|
|
|
ptr++;
|
|
|
|
|
}
|
|
|
|
|
return number;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int measure(unsigned char uartNumber, unsigned char command[], int multiplier, int excess){
|
|
|
|
|
int measure;
|
|
|
|
|
uartTransmit(uartNumber, command);
|
|
|
|
|
uartReceive(uartNumber);
|
|
|
|
|
measure = (str2int(&receive[uartNumber]) - excess)*multiplier ;
|
|
|
|
|
return measure;
|
|
|
|
|
}
|
|
|
|
|