Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Dependencies: MaximTinyTester MAX11410 CmdLine USBDevice
Diff: Test_Menu_MAX11410.cpp
- Revision:
- 56:6e9c52cc9abe
- Parent:
- 55:73d886c105f5
- Child:
- 59:c0376adb6ebc
diff -r 73d886c105f5 -r 6e9c52cc9abe Test_Menu_MAX11410.cpp --- a/Test_Menu_MAX11410.cpp Tue Mar 10 09:02:10 2020 +0000 +++ b/Test_Menu_MAX11410.cpp Thu Mar 12 23:53:27 2020 +0000 @@ -398,6 +398,10 @@ // CODE GENERATOR: CommandReturn '@return resistance calculated from raw LSB code and reference resistance' // CODE GENERATOR: MAX11410 Command Name = TemperatureOfRTD_PT1000 (double rtd_resistance) --> double // CODE GENERATOR: no Menu item hint in description +// CODE GENERATOR: MAX11410 Command Name = TemperatureOfRTD_PT100 (double rtd_resistance) --> double +// CODE GENERATOR: no Menu item hint in description +// CODE GENERATOR: MAX11410 Command Name = TemperatureOfRTD (double rtd_resistance) --> double +// CODE GENERATOR: no Menu item hint in description // CODE GENERATOR: MAX11410 Command Name = Measure_Thermocouple (MAX11410_AINP_SEL_enum_t tc_ainp, MAX11410_AINN_SEL_enum_t tc_ainn, MAX11410_AINP_SEL_enum_t rtd_iout, MAX11410_AINP_SEL_enum_t rtd_ainp, MAX11410_AINN_SEL_enum_t rtd_ainn) --> double // CODE GENERATOR: Menu item hint description Menu item 'TM' // CODE GENERATOR: Menu item 'TM' -- Menu item TM @@ -812,14 +816,14 @@ { cmdLine.serial().printf(" RegRead"); g_MAX11410_device.RegRead((MAX11410::MAX11410_CMD_enum_t)regAddress, ®Data); - cmdLine.serial().printf("regData=0x%6.6x\r\n", (regData & 0x00FFFFFF)); + cmdLine.serial().printf("regData=0x%6.6lx\r\n", (regData & 0x00FFFFFF)); return true; // command handled by MAX11410 } // accept regName "=0x123456" as "RegWrite" by name if (is_regname_assignment) { cmdLine.serial().printf(" RegWrite"); - cmdLine.serial().printf("regData=0x%6.6x\r\n", (regData & 0x00FFFFFF)); + cmdLine.serial().printf("regData=0x%6.6lx\r\n", (regData & 0x00FFFFFF)); g_MAX11410_device.RegWrite((MAX11410::MAX11410_CMD_enum_t)regAddress, regData); return true; // command handled by MAX11410 } @@ -865,7 +869,7 @@ uint32_t regData = 0; if (g_MAX11410_device.RegSize(regAddress) == 0) continue; // skip undefined regs if (g_MAX11410_device.RegRead(regAddress, ®Data) == 0) continue; // skip unreadable regs - cmdLine.serial().printf("%s=0x%6.6x\r\n", g_MAX11410_device.RegName(regAddress), regData); + cmdLine.serial().printf("%s=0x%6.6lx\r\n", g_MAX11410_device.RegName(regAddress), regData); } // end for regAddr g_MAX11410_device.onSPIprint = saved_onSPIprint_handler; return true; // command handled by MAX11410 @@ -895,20 +899,20 @@ cmdLine.serial().printf("%f\r\n", g_MAX11410_device.RTD_Temperature); // CODE GENERATOR: @ command print uint32_t g_MAX11410_device.ctrl cmdLine.serial().printf("ctrl = "); - cmdLine.serial().printf("%d = 0x%8.8x\r\n", g_MAX11410_device.ctrl, g_MAX11410_device.ctrl); + cmdLine.serial().printf("%ld = 0x%8.8lx\r\n", g_MAX11410_device.ctrl, g_MAX11410_device.ctrl); // CODE GENERATOR: @ command print uint8_t g_MAX11410_device.pgaGain cmdLine.serial().printf("pgaGain = "); cmdLine.serial().printf("%d = 0x%2.2x\r\n", g_MAX11410_device.pgaGain, g_MAX11410_device.pgaGain); // CODE GENERATOR: @ command print uint32_t g_MAX11410_device.status cmdLine.serial().printf("status = "); - cmdLine.serial().printf("%d = 0x%8.8x\r\n", g_MAX11410_device.status, g_MAX11410_device.status); + cmdLine.serial().printf("%ld = 0x%8.8lx\r\n", g_MAX11410_device.status, g_MAX11410_device.status); // CODE GENERATOR: @ command print uint32_t g_MAX11410_device.data0 cmdLine.serial().printf("data0 = "); - cmdLine.serial().printf("%d = 0x%8.8x\r\n", g_MAX11410_device.data0, g_MAX11410_device.data0); + cmdLine.serial().printf("%ld = 0x%8.8lx\r\n", g_MAX11410_device.data0, g_MAX11410_device.data0); // CODE GENERATOR: @ command print uint32_t array g_MAX11410_device.AINcode[0..10] for(int index = 0; (index < 11) && (index < 16); index++) { cmdLine.serial().printf("AINcode[%d] = ", index); - cmdLine.serial().printf("%d = 0x%8.8x\r\n", g_MAX11410_device.AINcode[index], g_MAX11410_device.AINcode[index]); + cmdLine.serial().printf("%ld = 0x%8.8lx\r\n", g_MAX11410_device.AINcode[index], g_MAX11410_device.AINcode[index]); } return true; // command handled by MAX11410 break; @@ -988,17 +992,17 @@ uint8_t result = g_MAX11410_device.Read_All_Voltages(); cmdLine.serial().printf(" =%d\r\n", result); // Menu item '$' -> AINcode[0], AINcode[1], AINcode[2], AINcode[3], AINcode[4], AINcode[5], AINcode[6], AINcode[7], AINcode[8], AINcode[9], AINcode[10] - cmdLine.serial().printf("%s=%d\r\n", "AINcode[0]", g_MAX11410_device.AINcode[0]); - cmdLine.serial().printf("%s=%d\r\n", "AINcode[1]", g_MAX11410_device.AINcode[1]); - cmdLine.serial().printf("%s=%d\r\n", "AINcode[2]", g_MAX11410_device.AINcode[2]); - cmdLine.serial().printf("%s=%d\r\n", "AINcode[3]", g_MAX11410_device.AINcode[3]); - cmdLine.serial().printf("%s=%d\r\n", "AINcode[4]", g_MAX11410_device.AINcode[4]); - cmdLine.serial().printf("%s=%d\r\n", "AINcode[5]", g_MAX11410_device.AINcode[5]); - cmdLine.serial().printf("%s=%d\r\n", "AINcode[6]", g_MAX11410_device.AINcode[6]); - cmdLine.serial().printf("%s=%d\r\n", "AINcode[7]", g_MAX11410_device.AINcode[7]); - cmdLine.serial().printf("%s=%d\r\n", "AINcode[8]", g_MAX11410_device.AINcode[8]); - cmdLine.serial().printf("%s=%d\r\n", "AINcode[9]", g_MAX11410_device.AINcode[9]); - cmdLine.serial().printf("%s=%d\r\n", "AINcode[10]", g_MAX11410_device.AINcode[10]); + cmdLine.serial().printf("%s=%ld\r\n", "AINcode[0]", g_MAX11410_device.AINcode[0]); + cmdLine.serial().printf("%s=%ld\r\n", "AINcode[1]", g_MAX11410_device.AINcode[1]); + cmdLine.serial().printf("%s=%ld\r\n", "AINcode[2]", g_MAX11410_device.AINcode[2]); + cmdLine.serial().printf("%s=%ld\r\n", "AINcode[3]", g_MAX11410_device.AINcode[3]); + cmdLine.serial().printf("%s=%ld\r\n", "AINcode[4]", g_MAX11410_device.AINcode[4]); + cmdLine.serial().printf("%s=%ld\r\n", "AINcode[5]", g_MAX11410_device.AINcode[5]); + cmdLine.serial().printf("%s=%ld\r\n", "AINcode[6]", g_MAX11410_device.AINcode[6]); + cmdLine.serial().printf("%s=%ld\r\n", "AINcode[7]", g_MAX11410_device.AINcode[7]); + cmdLine.serial().printf("%s=%ld\r\n", "AINcode[8]", g_MAX11410_device.AINcode[8]); + cmdLine.serial().printf("%s=%ld\r\n", "AINcode[9]", g_MAX11410_device.AINcode[9]); + cmdLine.serial().printf("%s=%ld\r\n", "AINcode[10]", g_MAX11410_device.AINcode[10]); return true; // command handled by MAX11410 // CODE GENERATOR: bottom of loop: testMenuCommand="$", testMenuFirstCharHandler="None" } // end case '$' @@ -1211,7 +1215,7 @@ } // print arguments cmdLine.serial().printf("TemperatureOfTC_TypeK"); - cmdLine.serial().printf(" tc_voltage=%d", tc_voltage); + cmdLine.serial().printf(" tc_voltage=%f", tc_voltage); cmdLine.serial().printf("\r\n"); // call function TemperatureOfTC_TypeK(tc_voltage) double result = g_MAX11410_device.TemperatureOfTC_TypeK(tc_voltage); @@ -2133,11 +2137,11 @@ { cmdLine.serial().printf(" RegRead"); g_MAX11410_device.RegRead(commandByte, ®Data); - cmdLine.serial().printf("regData=0x%6.6x\r\n", (regData & 0x00FFFFFF)); + cmdLine.serial().printf("regData=0x%6.6lx\r\n", (regData & 0x00FFFFFF)); } else { - cmdLine.serial().printf(" RegWrite regData=0x%6.6X\r\n", (regData & 0x00FFFFFF)); + cmdLine.serial().printf(" RegWrite regData=0x%6.6lX\r\n", (regData & 0x00FFFFFF)); g_MAX11410_device.RegWrite(commandByte, regData); } // is there support function shadow regValue of regAddr?