修改配置文件格式：驼峰命名;

TCLCommand/TCLCommand/Command.cpp

@@ -139,13 +139,13 @@ int TCLCommand::parse_cmds_from_file(const TCHAR* file_name, std::vector<Command
 #endif
         {
             CommandParam cp;
-            parse_pair_key(cp.name, name, _T("Name"));
-            parse_pair_key(cp.head, head, _T("HeadCode"));
-            parse_pair_key(cp.code, code, _T("Command"));
-            parse_pair_key(cp.param, param, _T("CMDParam"));
+            parse_pair_key(cp.name, name, _T("name"));
+            parse_pair_key(cp.head, head, _T("head"));
+            parse_pair_key(cp.code, code, _T("cmd"));
+            parse_pair_key(cp.param, param, _T("param"));
 
             std::string value;
-            parse_pair_key(value, option, _T("Option"));
+            parse_pair_key(value, option, _T("option"));
             if (!_tcsicmp(value.c_str(), _T("None")))
                 cp.nOption = CMDOPT_None;
             else if (!_tcsicmp(value.c_str(), _T("Get")))
@@ -153,13 +153,13 @@ int TCLCommand::parse_cmds_from_file(const TCHAR* file_name, std::vector<Command
             else if (!_tcsicmp(value.c_str(), _T("Set")))
                 cp.nOption = CMDOPT_Set;
 
-            parse_pair_key(value, multicode, _T("MultiParams"));
+            parse_pair_key(value, multicode, _T("returnParam"));
             cp.bMulticode = !_tcsicmp(value.c_str(), _T("true")) ? true : false;
 
-            parse_pair_key(value, read_wait_time, _T("ReadWaitTime"));
+            parse_pair_key(value, read_wait_time, _T("readWaitTime"));
             cp.read_wait_time = pares_time_value(value.c_str());
 
-            parse_pair_key(value, cmd_wait_time, _T("CMDWaitTime"));
+            parse_pair_key(value, cmd_wait_time, _T("cmdWaitTime"));
             cp.cmd_wait_time = pares_time_value(value.c_str());
             cp.UpdateRtnCode();
 
@@ -234,13 +234,13 @@ void TCLCommand::parse_cmds_from_string(std::string str, std::vector<CommandPara
 #endif
         {
             CommandParam cp;
-            parse_pair_key(cp.name, name, _T("Name"));
-            parse_pair_key(cp.head, head, _T("HeadCode"));
-            parse_pair_key(cp.code, code, _T("Command"));
-            parse_pair_key(cp.param, param, _T("CMDParam"));
+            parse_pair_key(cp.name, name, _T("name"));
+            parse_pair_key(cp.head, head, _T("head"));
+            parse_pair_key(cp.code, code, _T("cmd"));
+            parse_pair_key(cp.param, param, _T("param"));
 
             std::string value;
-            parse_pair_key(value, option, _T("Option"));
+            parse_pair_key(value, option, _T("option"));
             if (!_tcsicmp(value.c_str(), _T("None")))
                 cp.nOption = CMDOPT_None;
             else if (!_tcsicmp(value.c_str(), _T("Get")))
@@ -248,13 +248,13 @@ void TCLCommand::parse_cmds_from_string(std::string str, std::vector<CommandPara
             else if (!_tcsicmp(value.c_str(), _T("Set")))
                 cp.nOption = CMDOPT_Set;
 
-            parse_pair_key(value, multicode, _T("MultiParams"));
+            parse_pair_key(value, multicode, _T("returnParam"));
             cp.bMulticode = !_tcsicmp(value.c_str(), _T("true")) ? true : false;
 
-            parse_pair_key(value, read_wait_time, _T("ReadWaitTime"));
+            parse_pair_key(value, read_wait_time, _T("readWaitTime"));
             cp.read_wait_time = pares_time_value(value.c_str());
 
-            parse_pair_key(value, cmd_wait_time, _T("CMDWaitTime"));
+            parse_pair_key(value, cmd_wait_time, _T("cmdWaitTime"));
             cp.cmd_wait_time = pares_time_value(value.c_str());
             cp.UpdateRtnCode();
 

TCLCommand/TCLCommand/command.data

@@ -1,45 +1,45 @@
 # Get Info;
-Name=EnterFactory; Option=None; HeadCode=AA; Command=10; CMDParam=01; MultiParams=false; ReadWaitTime=150ms; CMDWaitTime=100ms
-Name=GetSoftVersion; Option=Get; HeadCode=AA; Command=57; CMDParam=00; MultiParams=false; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=GetProjectID; Option=Get; HeadCode=AA; Command=84; CMDParam=00; MultiParams=false; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=GetDeviceId; Option=Get; HeadCode=AA; Command=BE; CMDParam=01; MultiParams=true; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=GetClientType; Option=Get; HeadCode=AA; Command=8C; CMDParam=00; MultiParams=false; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=GetMAC; Option=Get; HeadCode=AA; Command=BE; CMDParam=00; MultiParams=true; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=GetHDCPKey; Option=Get; HeadCode=AA; Command=EE; CMDParam=00; MultiParams=false; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=GetHDCPKey22; Option=Get; HeadCode=AA; Command=E7; CMDParam=00; MultiParams=false; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=GetWidi; Option=Get; HeadCode=AA; Command=E7; CMDParam=00; MultiParams=false; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=GetNetflixESN; Option=Get; HeadCode=AA; Command=BE; CMDParam=06; MultiParams=true; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=GetWidevine; Option=Get; HeadCode=AA; Command=EC; CMDParam=00; MultiParams=true; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=GetCiKey; Option=Get; HeadCode=AA; Command=EC; CMDParam=01; MultiParams=true; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=GetOSDLanguage; Option=Get; HeadCode=AA; Command=97; CMDParam=00; MultiParams=true; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=GetShopLanguage; Option=Get; HeadCode=AA; Command=97; CMDParam=01; MultiParams=true; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=GetChannel; Option=Get; HeadCode=AA; Command=97; CMDParam=13; MultiParams=true; ReadWaitTime=100ms; CMDWaitTime=100ms
+name=EnterFactory; option=None; head=AA; cmd=10; param=01; returnParam=false; readWaitTime=150ms; cmdWaitTime=100ms
+name=GetSoftVersion; option=Get; head=AA; cmd=57; param=00; returnParam=false; readWaitTime=100ms; cmdWaitTime=100ms
+name=GetProjectID; option=Get; head=AA; cmd=84; param=00; returnParam=false; readWaitTime=100ms; cmdWaitTime=100ms
+name=GetDeviceId; option=Get; head=AA; cmd=BE; param=01; returnParam=true; readWaitTime=100ms; cmdWaitTime=100ms
+name=GetClientType; option=Get; head=AA; cmd=8C; param=00; returnParam=false; readWaitTime=100ms; cmdWaitTime=100ms
+name=GetMAC; option=Get; head=AA; cmd=BE; param=00; returnParam=true; readWaitTime=100ms; cmdWaitTime=100ms
+name=GetHDCPKey; option=Get; head=AA; cmd=EE; param=00; returnParam=false; readWaitTime=100ms; cmdWaitTime=100ms
+name=GetHDCPKey22; option=Get; head=AA; cmd=E7; param=00; returnParam=false; readWaitTime=100ms; cmdWaitTime=100ms
+name=GetWidi; option=Get; head=AA; cmd=E7; param=00; returnParam=false; readWaitTime=100ms; cmdWaitTime=100ms
+name=GetNetflixESN; option=Get; head=AA; cmd=BE; param=06; returnParam=true; readWaitTime=100ms; cmdWaitTime=100ms
+name=GetWidevine; option=Get; head=AA; cmd=EC; param=00; returnParam=true; readWaitTime=100ms; cmdWaitTime=100ms
+name=GetCiKey; option=Get; head=AA; cmd=EC; param=01; returnParam=true; readWaitTime=100ms; cmdWaitTime=100ms
+name=GetOSDLanguage; option=Get; head=AA; cmd=97; param=00; returnParam=true; readWaitTime=100ms; cmdWaitTime=100ms
+name=GetShopLanguage; option=Get; head=AA; cmd=97; param=01; returnParam=true; readWaitTime=100ms; cmdWaitTime=100ms
+name=GetChannel; option=Get; head=AA; cmd=97; param=13; returnParam=true; readWaitTime=100ms; cmdWaitTime=100ms
 # Check is Get-Option
-Name=CheckMAC; Option=Get; HeadCode=AA; Command=B4; CMDParam=00; MultiParams=false; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=CheckDeviceId; Option=Get; HeadCode=AA; Command=B4; CMDParam=00; MultiParams=false; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=CheckHDCP; Option=Get; HeadCode=AA; Command=87; CMDParam=00; MultiParams=false; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=CheckNetflixESN; Option=Get; HeadCode=AA; Command=9A; CMDParam=00; MultiParams=true; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=CheckWidi; Option=Get; HeadCode=AA; Command=E5; CMDParam=00; MultiParams=false; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=CheckWidevine; Option=Get; HeadCode=AA; Command=EA; CMDParam=00; MultiParams=true; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=CheckCikey; Option=Get; HeadCode=AA; Command=EA; CMDParam=01; MultiParams=true; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=CheckHDCP22; Option=Get; HeadCode=AA; Command=E5; CMDParam=00; MultiParams=false; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=LeaveFactory; Option=None; HeadCode=AA; Command=10; CMDParam=00; MultiParams=false; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=WBInit; Option=Get; HeadCode=AA; Command=16; CMDParam=02; MultiParams=false; ReadWaitTime=100ms; CMDWaitTime=100ms
+name=CheckMAC; option=Get; head=AA; cmd=B4; param=00; returnParam=false; readWaitTime=100ms; cmdWaitTime=100ms
+name=CheckDeviceId; option=Get; head=AA; cmd=B4; param=00; returnParam=false; readWaitTime=100ms; cmdWaitTime=100ms
+name=CheckHDCP; option=Get; head=AA; cmd=87; param=00; returnParam=false; readWaitTime=100ms; cmdWaitTime=100ms
+name=CheckNetflixESN; option=Get; head=AA; cmd=9A; param=00; returnParam=true; readWaitTime=100ms; cmdWaitTime=100ms
+name=CheckWidi; option=Get; head=AA; cmd=E5; param=00; returnParam=false; readWaitTime=100ms; cmdWaitTime=100ms
+name=CheckWidevine; option=Get; head=AA; cmd=EA; param=00; returnParam=true; readWaitTime=100ms; cmdWaitTime=100ms
+name=CheckCikey; option=Get; head=AA; cmd=EA; param=01; returnParam=true; readWaitTime=100ms; cmdWaitTime=100ms
+name=CheckHDCP22; option=Get; head=AA; cmd=E5; param=00; returnParam=false; readWaitTime=100ms; cmdWaitTime=100ms
+name=LeaveFactory; option=None; head=AA; cmd=10; param=00; returnParam=false; readWaitTime=100ms; cmdWaitTime=100ms
+name=WBInit; option=Get; head=AA; cmd=16; param=02; returnParam=false; readWaitTime=100ms; cmdWaitTime=100ms
 # Set Info;
-Name=SetProjectId; Option=Set; HeadCode=AA; Command=70; CMDParam=/; MultiParams=false; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=SetDeviceID; Option=Set; HeadCode=AA; Command=B2; CMDParam=/; MultiParams=false; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=SetMAC; Option=Set; HeadCode=AA; Command=B3; CMDParam=/; MultiParams=false; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=SetHDCPKey; Option=Set; HeadCode=AA FE; Command=86; CMDParam=/; MultiParams=false; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=SetHDCPKey22; Option=Set; HeadCode=AA FE; Command=E4; CMDParam=/; MultiParams=false; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=SetNetflixESN; Option=Set; HeadCode=AA; Command=99 00; CMDParam=/; MultiParams=false; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=SetWidi; Option=Set; HeadCode=AA FE; Command=E4; CMDParam=/; MultiParams=false; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=SetWidevine; Option=Set; HeadCode=AA FE; Command=E9 00; CMDParam=/; MultiParams=false; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=SetCiKey; Option=Set; HeadCode=AA FE; Command=E9 01; CMDParam=/; MultiParams=false; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=SetOSDLanguage; Option=Set; HeadCode=AA; Command=99 00; CMDParam=/; MultiParams=true; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=SetShopLanguage; Option=Set; HeadCode=AA; Command=96 01; CMDParam=/; MultiParams=true; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=SetChannel; Option=Set; HeadCode=AA; Command=15; CMDParam=/; MultiParams=false; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=SetWBNormal; Option=Set; HeadCode=AA; Command=4D 04 01 01; CMDParam=/; MultiParams=false; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=SetWBCool; Option=Set; HeadCode=AA; Command=4D 04 02 01; CMDParam=/; MultiParams=false; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=SetWBWarm; Option=Set; HeadCode=AA; Command=4D 04 03 01; CMDParam=/; MultiParams=false; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=StarWarmUpMode; Option=None; HeadCode=AA; Command=13; CMDParam=01; MultiParams=false; ReadWaitTime=100ms; CMDWaitTime=100ms
-Name=StopWarmUpMode; Option=None; HeadCode=AA; Command=13; CMDParam=00; MultiParams=false; ReadWaitTime=100ms; CMDWaitTime=100ms
+name=SetProjectId; option=Set; head=AA; cmd=70; param=/; returnParam=false; readWaitTime=100ms; cmdWaitTime=100ms
+name=SetDeviceID; option=Set; head=AA; cmd=B2; param=/; returnParam=false; readWaitTime=100ms; cmdWaitTime=100ms
+name=SetMAC; option=Set; head=AA; cmd=B3; param=/; returnParam=false; readWaitTime=100ms; cmdWaitTime=100ms
+name=SetHDCPKey; option=Set; head=AA FE; cmd=86; param=/; returnParam=false; readWaitTime=100ms; cmdWaitTime=100ms
+name=SetHDCPKey22; option=Set; head=AA FE; cmd=E4; param=/; returnParam=false; readWaitTime=100ms; cmdWaitTime=100ms
+name=SetNetflixESN; option=Set; head=AA; cmd=99 00; param=/; returnParam=false; readWaitTime=100ms; cmdWaitTime=100ms
+name=SetWidi; option=Set; head=AA FE; cmd=E4; param=/; returnParam=false; readWaitTime=100ms; cmdWaitTime=100ms
+name=SetWidevine; option=Set; head=AA FE; cmd=E9 00; param=/; returnParam=false; readWaitTime=100ms; cmdWaitTime=100ms
+name=SetCiKey; option=Set; head=AA FE; cmd=E9 01; param=/; returnParam=false; readWaitTime=100ms; cmdWaitTime=100ms
+name=SetOSDLanguage; option=Set; head=AA; cmd=99 00; param=/; returnParam=true; readWaitTime=100ms; cmdWaitTime=100ms
+name=SetShopLanguage; option=Set; head=AA; cmd=96 01; param=/; returnParam=true; readWaitTime=100ms; cmdWaitTime=100ms
+name=SetChannel; option=Set; head=AA; cmd=15; param=/; returnParam=false; readWaitTime=100ms; cmdWaitTime=100ms
+name=SetWBNormal; option=Set; head=AA; cmd=4D 04 01 01; param=/; returnParam=false; readWaitTime=100ms; cmdWaitTime=100ms
+name=SetWBCool; option=Set; head=AA; cmd=4D 04 02 01; param=/; returnParam=false; readWaitTime=100ms; cmdWaitTime=100ms
+name=SetWBWarm; option=Set; head=AA; cmd=4D 04 03 01; param=/; returnParam=false; readWaitTime=100ms; cmdWaitTime=100ms
+name=StarWarmUpMode; option=None; head=AA; cmd=13; param=01; returnParam=false; readWaitTime=100ms; cmdWaitTime=100ms
+name=StopWarmUpMode; option=None; head=AA; cmd=13; param=00; returnParam=false; readWaitTime=100ms; cmdWaitTime=100ms