diff --git a/lib/basic.cpp b/lib/basic.cpp index f1dbd44e112bb2c155a85cfba6da11c5adedad6a..791213fb772e46898778c2c798cf1e66f26fcc27 100644 --- a/lib/basic.cpp +++ b/lib/basic.cpp @@ -152,41 +152,6 @@ EXPORT void sum(pFunCallArg_t pArgs, float* output) output[i] = res; } -EXPORT void __sqrt(pFunCallArg_t pArgs, float* output) -{ - int allCalNum = pArgs->allCalNum; - float* arg0 = static_cast(pArgs->args[0]); - - for (int i = 0;i < allCalNum;i++) - output[i] = sqrtf(arg0[i]); -} - -EXPORT void to_signed(pFunCallArg_t pArgs, float* output) -{ - int allCalNum = pArgs->allCalNum; - float* arg0 = static_cast(pArgs->args[0]); - int bits = (int) *static_cast(pArgs->args[1]); - - uint32_t mask = 1 << bits - 1; - uint32_t maxValue = 1 << bits; - - for (int i = 0;i < allCalNum;i++) - output[i] = arg0[i] < mask ? arg0[i] : arg0[i] - maxValue; -} - -EXPORT void to_unsigned(pFunCallArg_t pArgs, float* output) -{ - int allCalNum = pArgs->allCalNum; - float* arg0 = static_cast(pArgs->args[0]); - int bits = (int) *static_cast(pArgs->args[1]); - - uint32_t maxValue = 1 << bits; - - for (int i = 0;i < allCalNum;i++) - output[i] = arg0[i] > 0 ? arg0[i] : arg0[i] + maxValue; -} - - LibFunction_t funcs[] = { LIB_FUNCTION(__sin, 1, .name = "sin"), LIB_FUNCTION(__cos, 1, .name = "cos"), @@ -200,9 +165,6 @@ LibFunction_t funcs[] = { // LIB_FUNCTION(angle, 1), LIB_FUNCTION(conv, 4), LIB_FUNCTION(sum, 1), - LIB_FUNCTION(__sqrt, 1, .name = "sqrt"), - LIB_FUNCTION(to_signed, 2), - LIB_FUNCTION(to_unsigned, 2), END_OF_LIB }; diff --git a/lib/io.cpp b/lib/io.cpp index d92b05f6a0b92a7410e1c647488090b0a0f5ba95..c2d95088dd9bb380d6e96bde1c2ba91e86ec6a19 100644 --- a/lib/io.cpp +++ b/lib/io.cpp @@ -19,28 +19,15 @@ EXPORT void read_file(pFunCallArg_t pArgs, float* output) QFile file(arg0); if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { - const auto& lineList = file.readAll().split('\n'); - auto pt = lineList.begin(); - auto end = lineList.end(); - - file.close(); - for (size_t i = 0;i < arg1;i++) - pt++; + file.readLine(); - for (int i = 0;i < allCalNum && pt != end;i++, pt++) + for (int i = 0;i < allCalNum;i++) { - const QString& line = pt->trimmed();//file.readLine(64).trimmed(); - + QString line = file.readLine(64); if (line.isEmpty()) break; - - if (line.startsWith("0x")) - output[i] = line.toInt(nullptr, 16); - else if (line.startsWith("0b")) - output[i] = line.right(line.length() - 2).toInt(nullptr, 2); - else - output[i] = line.toFloat(); + output[i] = line.toFloat(); } } diff --git a/util/log.h b/util/log.h index bb6830f40c1ed381c99432f9dd22a63f745165ba..6bdadfa1a83078c07028cb18d40745f8277f058d 100644 --- a/util/log.h +++ b/util/log.h @@ -21,13 +21,10 @@ #define UI_WARNING(fmt, ...) DEBUG_LEVEL("\r\n", ui, warning, "[%s:%d]: " fmt, __func__, __LINE__, ##__VA_ARGS__) #define UI_ERROR(fmt, ...) DEBUG_LEVEL("\r\n\r\n", ui, error, "[%s:%d][%s]: " fmt "\r\n", __FILE__, __LINE__, __func__, ##__VA_ARGS__) -#define LIB_DEBUG_OUTPUT qDebug -#define LIB_DEBUG_LEVEL(pre, mod, level, fmt, ...) LIB_DEBUG_OUTPUT(pre "[" #level "]" "[" #mod "]" fmt "\r\n", ##__VA_ARGS__) - -#define LIB_LOG(fmt, ...) LIB_DEBUG_LEVEL("", lib, log, ": " fmt, ##__VA_ARGS__) -#define LIB_INFO(fmt, ...) LIB_DEBUG_LEVEL("", lib, info, "[%s]: " fmt, __func__, ##__VA_ARGS__) -#define LIB_WARNING(fmt, ...) LIB_DEBUG_LEVEL("\r\n", lib, warning, "[%s:%d]: " fmt, __func__, __LINE__, ##__VA_ARGS__) -#define LIB_ERROR(fmt, ...) LIB_DEBUG_LEVEL("\r\n\r\n", lib, error, "[%s:%d][%s]: " fmt "\r\n", __FILE__, __LINE__, __func__, ##__VA_ARGS__) +#define LIB_LOG(fmt, ...) DEBUG_LEVEL("", lib, log, ": " fmt, ##__VA_ARGS__) +#define LIB_INFO(fmt, ...) DEBUG_LEVEL("", lib, info, "[%s]: " fmt, __func__, ##__VA_ARGS__) +#define LIB_WARNING(fmt, ...) DEBUG_LEVEL("\r\n", lib, warning, "[%s:%d]: " fmt, __func__, __LINE__, ##__VA_ARGS__) +#define LIB_ERROR(fmt, ...) DEBUG_LEVEL("\r\n\r\n", lib, error, "[%s:%d][%s]: " fmt "\r\n", __FILE__, __LINE__, __func__, ##__VA_ARGS__) #ifndef __max #define __max(a,b) (((a) > (b)) ? (a) : (b))