diff --git a/CMakeLists.txt b/CMakeLists.txt index e107882..675e6a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ project(ics3 CXX) SET(PROJECT_VER_MAJOR 1) SET(PROJECT_VER_MINOR 2) -SET(PROJECT_VER_PATCH 1) +SET(PROJECT_VER_PATCH 2) SET(PROJECT_VER "${PROJECT_VER_MAJOR}.${PROJECT_VER_MINOR}.${PROJECT_VER_PATCH}") SET(PROJECT_APIVER "${PROJECT_VER_MAJOR}.${PROJECT_VER_MINOR}") diff --git a/script/setup.sh b/script/setup.sh index 17db39f..916fe9a 100755 --- a/script/setup.sh +++ b/script/setup.sh @@ -5,20 +5,29 @@ invalidPID(){ [ $1 -lt 9 ] && return 1 return 0 } - -echo "Please select your device" -echo "1. ICS USB ADAPTER" -echo "2. SERIAL USB ADAPTER" -echo "3~5: nothing" -echo "6. ICS USB ADAPTER HS" -echo "7. SERIAL USB ADAPTER HS" -echo "8. DUAl USB ADAPTER HS" -read onePID -expr $onePID + 1 > /dev/null 2>&1 -INTCHECK=$? -if [ $INTCHECK -gt 1 ]; then - echo "Invalid argument" - return 1 +if [ $# -gt 0 ]; then + expr $1 + 1 > /dev/null 2>&1 + inputCheck=$? +else + inputCheck=5 +fi +if [ $inputCheck -gt 1 ]; then + echo "Please select your device" + echo "1. ICS USB ADAPTER" + echo "2. SERIAL USB ADAPTER" + echo "3~5: nothing" + echo "6. ICS USB ADAPTER HS" + echo "7. SERIAL USB ADAPTER HS" + echo "8. DUAl USB ADAPTER HS" + read onePID + expr $onePID + 1 > /dev/null 2>&1 + INTCHECK=$? + if [ $INTCHECK -gt 1 ]; then + echo "Invalid argument" + return 1 +fi +else + onePID=$1 fi if invalidPID $onePID; then echo "Out of range" diff --git a/src/ics3.cpp b/src/ics3.cpp index 3ad01e5..312322d 100644 --- a/src/ics3.cpp +++ b/src/ics3.cpp @@ -50,7 +50,7 @@ void ics::ICS3::set(const ID& id, const Parameter& param) { } ics::EepRom ics::ICS3::getRom(const ID& id) { - const Core::Container tx {getCmd(0xA0, id), 0}; + const Core::Container tx {getCmd(0xA0, id), 0x00}; Core::Container rx(68); core->communicate(tx, rx); // throw std::runtime_error EepRom::Container romData; @@ -73,7 +73,7 @@ ics::ID ics::ICS3::getID() { } void ics::ICS3::setID(const ID& id) { - const Core::IDContainerTx tx {getCmd(0xE0, id), 1, 1, 1}; + const Core::IDContainerTx tx {getCmd(0xE0, id), 0x01, 0x01, 0x01}; Core::IDContainerRx rx; core->communicateID(tx, rx); }