diff --git a/trunk/FlickerCalCollector/main.cpp b/trunk/FlickerCalCollector/main.cpp index 122eccd..893ae41 100644 --- a/trunk/FlickerCalCollector/main.cpp +++ b/trunk/FlickerCalCollector/main.cpp @@ -40,6 +40,7 @@ namespace nn::drivers::cal::CTR::LcdFlickerInfo s_LcdFlickerInfo; bool s_LcdFlickerInfoIsValid = false; u8 s_SerialNo[nn::cfg::CTR::CFG_SECURE_INFO_SERIAL_NO_LEN]; +bit64 s_TranferableId; bool s_CanReadSerialNumber = false; u32 s_CalVersion = 0; @@ -166,11 +167,15 @@ extern "C" void nnMain() s_CanReadSerialNumber = true; } + // 移行可能IDの取得 + s_TranferableId = nn::cfg::CTR::GetTransferableId(0); + if(s_LcdFlickerInfoIsValid) { s32 writeSize; char writeData[256]; - nn::nstd::TSNPrintf(writeData, sizeof(writeData), "%s, %0x, %0x\n", s_SerialNo, s_LcdFlickerInfo.vcomTop, s_LcdFlickerInfo.vcomBottom); + nn::nstd::TSNPrintf(writeData, sizeof(writeData), "%s, %llx, %0x, %0x\n", s_SerialNo, s_TranferableId, + s_LcdFlickerInfo.vcomTop, s_LcdFlickerInfo.vcomBottom); NN_LOG("%s", writeData); // SD書き込み result = file.TryWrite(&writeSize, writeData, std::strlen(writeData), true); @@ -194,8 +199,9 @@ extern "C" void nnMain() { s_RenderSystem.DrawText(0, 10, "serial = %s", s_SerialNo); } - s_RenderSystem.DrawText(0, 20, "calVersion = %d\n", s_CalVersion); - s_RenderSystem.DrawText(0, 30, "Flicker = %0x, %0x", s_LcdFlickerInfo.vcomTop, s_LcdFlickerInfo.vcomBottom); + s_RenderSystem.DrawText(0, 20, "TransferrableId = %llx\n", s_TranferableId); + s_RenderSystem.DrawText(0, 30, "calVersion = %d\n", s_CalVersion); + s_RenderSystem.DrawText(0, 40, "Flicker = %0x, %0x", s_LcdFlickerInfo.vcomTop, s_LcdFlickerInfo.vcomBottom); s_RenderSystem.SwapBuffers(); s_RenderSystem.SetRenderTarget(NN_GX_DISPLAY1);