created separate function for hex to char
Dependencies: SDFileSystem ds3231 eeprom_Nikita mbed testUniGraphic_150217
Fork of SS_SensePOC2P0_11Dec2017_USERPID by
Diff: main.cpp
- Revision:
- 71:8f1851c556d6
- Parent:
- 70:f2e544a5645b
- Child:
- 72:1f990fa8c516
--- a/main.cpp Thu Nov 30 10:25:19 2017 +0000 +++ b/main.cpp Fri Dec 01 11:18:34 2017 +0000 @@ -791,12 +791,12 @@ // gc.printf("%02x",poc2p0_device_heartbeat_res.pid[i]); //} //gc.printf("\n"); - //poc2p0_device_heartbeat_res.pid = pid; } - else + else { - memset((void *)&poc2p0_device_heartbeat_res.pid,0x00,sizeof(poc2p0_device_heartbeat_res.pid)); - //poc2p0_device_heartbeat_res.pid = {0x00u}; + memset(poc2p0_device_heartbeat_res.pid,'0',sizeof(poc2p0_device_heartbeat_res.pid)); + gc.printf("poc2p0_device_heartbeat_res.pid = %s\n",poc2p0_device_heartbeat_res.pid); + } // device current date and time @@ -827,12 +827,16 @@ // calculate chksum poc2p0_device_heartbeat_res.chksum = checksum_struct((uint8_t *)&poc2p0_device_heartbeat_res.cmd, (sizeof(poc2p0_device_heartbeat_res)-1)); - //send_thru_terminal(heartbeat_res_buffer,HEARTBEAT_RES_LEN,(uint8_t *)&poc2p0_device_heartbeat_res,sizeof(poc2p0_device_heartbeat_res)); + send_thru_terminal(heartbeat_res_buffer,HEARTBEAT_RES_LEN,(uint8_t *)&poc2p0_device_heartbeat_res,sizeof(poc2p0_device_heartbeat_res)); blue1.printf("%02x",poc2p0_device_heartbeat_res.sos); blue1.printf("%02x",poc2p0_device_heartbeat_res.cmd); blue1.printf("%02x",poc2p0_device_heartbeat_res.length); blue1.printf("%02x",poc2p0_device_heartbeat_res.did); - blue1.printf("%08x",poc2p0_device_heartbeat_res.pid); + //blue1.printf("%010x",poc2p0_device_heartbeat_res.pid); + for (uint8_t i = 0; i < sizeof(poc2p0_device_heartbeat_res.pid); i++) + { + blue1.printf("%02x",poc2p0_device_heartbeat_res.pid[i]); + } blue1.printf("%02x",poc2p0_device_heartbeat_res.date_time.date); blue1.printf("%02x",poc2p0_device_heartbeat_res.date_time.month); blue1.printf("%02x",poc2p0_device_heartbeat_res.date_time.year); @@ -849,7 +853,11 @@ gc.printf("%02x",poc2p0_device_heartbeat_res.cmd); gc.printf("%02x",poc2p0_device_heartbeat_res.length); gc.printf("%02x",poc2p0_device_heartbeat_res.did); - gc.printf("%08x",poc2p0_device_heartbeat_res.pid); + //gc.printf("%010x",poc2p0_device_heartbeat_res.pid); + for (uint8_t i = 0; i < sizeof(poc2p0_device_heartbeat_res.pid); i++) + { + gc.printf("%02x",poc2p0_device_heartbeat_res.pid[i]); + } gc.printf("%02x",poc2p0_device_heartbeat_res.date_time.date); gc.printf("%02x",poc2p0_device_heartbeat_res.date_time.month); gc.printf("%02x",poc2p0_device_heartbeat_res.date_time.year); @@ -934,16 +942,11 @@ } } -/*void get_userpid(char *output_pid,char input_pid[]) -{ - strcpy(output_pid,input_pid); - gc.printf("Temp User pid = %s\n",output_pid); - //return user_pid; -}*/ char* get_userpid(void) { return user_pid; + } @@ -960,14 +963,14 @@ { temp_ms_nibble = input_buf[i] > '9' ? (input_buf[i]|32) - 'a' + 10 : input_buf[i] - '0'; - gc.printf("\n\r temp_ms_nibble = %2x", temp_ms_nibble); + //gc.printf("\n\r temp_ms_nibble = %2x", temp_ms_nibble); //temp_ls_nibble = input_buf[i+1] > '9' ? (input_buf[i+1]|32) - 'a' + 10 : input_buf[i+1] - '0'; //gc.printf("\n\r temp_ls_nibble = %2x", temp_ls_nibble); //temp_buf[j] = ((temp_ms_nibble << 4)) | temp_ls_nibble; temp_buf[j] = temp_ms_nibble ; - gc.printf("\n\r msg_SOS = %02x", temp_buf[j]); + //gc.printf("\n\r msg_SOS = %02x", temp_buf[j]); } memcpy((void *)input_buf,&temp_buf, len);