From cf8a76c2cebf8587d52545d3163716f3dbde9dd5 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 8 May 2017 23:47:26 +0200 Subject: [PATCH] Revert "Revert "- remove obsolete ifdef's"" This reverts commit 7aa4eed69b94fbca0e52350158b8adf0ee3bd54a. Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/3c3707b119987d93faaef1fc052b59329a892ba5 Author: vanhofen Date: 2017-05-08 (Mon, 08 May 2017) --- src/gui/info_menue.cpp | 2 -- src/gui/update.cpp | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/gui/info_menue.cpp b/src/gui/info_menue.cpp index b1354e132..985e41593 100644 --- a/src/gui/info_menue.cpp +++ b/src/gui/info_menue.cpp @@ -72,9 +72,7 @@ int CInfoMenu::exec(CMenuTarget* parent, const std::string &actionKey) //NI { char str[1024]; sprintf(str, "cs_get_revision(): 0x%02X\n", cs_get_revision()); -#ifdef BOXMODEL_CS_HD2 sprintf(str, "%scs_get_chip_type(): 0x%04X\n", str, cs_get_chip_type()); -#endif ShowMsg(LOCALE_MESSAGEBOX_INFO, str, CMsgBox::mbrBack, CMsgBox::mbBack); return res; } diff --git a/src/gui/update.cpp b/src/gui/update.cpp index fa899a272..8f01a0375 100644 --- a/src/gui/update.cpp +++ b/src/gui/update.cpp @@ -141,9 +141,7 @@ void CFlashUpdate::update_php(std::string &url, const char* type) if (url.find("update.php") != std::string::npos) { url += "?revision=" + to_string(cs_get_revision()); -#ifdef BOXMODEL_CS_HD2 url += "&chip_type=" + to_string(cs_get_chip_type()); -#endif url += "&image_type=" + (std::string)type; printf("[update_php] url %s\n", url.c_str()); }