add:软件行列键盘

add:不依赖luatos主库可编译纯C
update:优化ADC读取

Third_Party/vsprintf/printf.c

@@ -0,0 +1,914 @@
+///////////////////////////////////////////////////////////////////////////////
+// \author (c) Marco Paland (info@paland.com)
+//             2014-2019, PALANDesign Hannover, Germany
+//
+// \license The MIT License (MIT)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+// \brief Tiny printf, sprintf and (v)snprintf implementation, optimized for speed on
+//        embedded systems with a very limited resources. These routines are thread
+//        safe and reentrant!
+//        Use this instead of the bloated standard/newlib printf cause these use
+//        malloc for printf (and may not be thread safe).
+//
+///////////////////////////////////////////////////////////////////////////////
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "printf.h"
+
+
+// define this globally (e.g. gcc -DPRINTF_INCLUDE_CONFIG_H ...) to include the
+// printf_config.h header file
+// default: undefined
+#ifdef PRINTF_INCLUDE_CONFIG_H
+#include "printf_config.h"
+#endif
+
+
+// 'ntoa' conversion buffer size, this must be big enough to hold one converted
+// numeric number including padded zeros (dynamically created on stack)
+// default: 32 byte
+#ifndef PRINTF_NTOA_BUFFER_SIZE
+#define PRINTF_NTOA_BUFFER_SIZE    32U
+#endif
+
+// 'ftoa' conversion buffer size, this must be big enough to hold one converted
+// float number including padded zeros (dynamically created on stack)
+// default: 32 byte
+#ifndef PRINTF_FTOA_BUFFER_SIZE
+#define PRINTF_FTOA_BUFFER_SIZE    32U
+#endif
+
+// support for the floating point type (%f)
+// default: activated
+#ifndef PRINTF_DISABLE_SUPPORT_FLOAT
+#define PRINTF_SUPPORT_FLOAT
+#endif
+
+// support for exponential floating point notation (%e/%g)
+// default: activated
+#ifndef PRINTF_DISABLE_SUPPORT_EXPONENTIAL
+#define PRINTF_SUPPORT_EXPONENTIAL
+#endif
+
+// define the default floating point precision
+// default: 6 digits
+#ifndef PRINTF_DEFAULT_FLOAT_PRECISION
+#define PRINTF_DEFAULT_FLOAT_PRECISION  6U
+#endif
+
+// define the largest float suitable to print with %f
+// default: 1e9
+#ifndef PRINTF_MAX_FLOAT
+#define PRINTF_MAX_FLOAT  1e9
+#endif
+
+// support for the long long types (%llu or %p)
+// default: activated
+#ifndef PRINTF_DISABLE_SUPPORT_LONG_LONG
+#define PRINTF_SUPPORT_LONG_LONG
+#endif
+
+// support for the ptrdiff_t type (%t)
+// ptrdiff_t is normally defined in <stddef.h> as long or long long type
+// default: activated
+#ifndef PRINTF_DISABLE_SUPPORT_PTRDIFF_T
+#define PRINTF_SUPPORT_PTRDIFF_T
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+
+// internal flag definitions
+#define FLAGS_ZEROPAD   (1U <<  0U)
+#define FLAGS_LEFT      (1U <<  1U)
+#define FLAGS_PLUS      (1U <<  2U)
+#define FLAGS_SPACE     (1U <<  3U)
+#define FLAGS_HASH      (1U <<  4U)
+#define FLAGS_UPPERCASE (1U <<  5U)
+#define FLAGS_CHAR      (1U <<  6U)
+#define FLAGS_SHORT     (1U <<  7U)
+#define FLAGS_LONG      (1U <<  8U)
+#define FLAGS_LONG_LONG (1U <<  9U)
+#define FLAGS_PRECISION (1U << 10U)
+#define FLAGS_ADAPT_EXP (1U << 11U)
+
+
+// import float.h for DBL_MAX
+#if defined(PRINTF_SUPPORT_FLOAT)
+#include <float.h>
+#endif
+
+
+// output function type
+typedef void (*out_fct_type)(char character, void* buffer, size_t idx, size_t maxlen);
+
+
+// wrapper (used as buffer) for output function type
+typedef struct {
+  void  (*fct)(char character, void* arg);
+  void* arg;
+} out_fct_wrap_type;
+
+
+// internal buffer output
+static inline void _out_buffer(char character, void* buffer, size_t idx, size_t maxlen)
+{
+  if (idx < maxlen) {
+    ((char*)buffer)[idx] = character;
+  }
+}
+
+
+// internal null output
+static inline void _out_null(char character, void* buffer, size_t idx, size_t maxlen)
+{
+  (void)character; (void)buffer; (void)idx; (void)maxlen;
+}
+
+
+// internal _putchar wrapper
+static inline void _out_char(char character, void* buffer, size_t idx, size_t maxlen)
+{
+  (void)buffer; (void)idx; (void)maxlen;
+  if (character) {
+    //_putchar(character);
+  }
+}
+
+
+// internal output function wrapper
+static inline void _out_fct(char character, void* buffer, size_t idx, size_t maxlen)
+{
+  (void)idx; (void)maxlen;
+  if (character) {
+    // buffer is the output fct pointer
+    ((out_fct_wrap_type*)buffer)->fct(character, ((out_fct_wrap_type*)buffer)->arg);
+  }
+}
+
+
+// internal secure strlen
+// \return The length of the string (excluding the terminating 0) limited by 'maxsize'
+static inline unsigned int _strnlen_s(const char* str, size_t maxsize)
+{
+  const char* s;
+  for (s = str; *s && maxsize--; ++s);
+  return (unsigned int)(s - str);
+}
+
+
+// internal test if char is a digit (0-9)
+// \return true if char is a digit
+static inline bool _is_digit(char ch)
+{
+  return (ch >= '0') && (ch <= '9');
+}
+
+
+// internal ASCII string to unsigned int conversion
+static unsigned int _atoi(const char** str)
+{
+  unsigned int i = 0U;
+  while (_is_digit(**str)) {
+    i = i * 10U + (unsigned int)(*((*str)++) - '0');
+  }
+  return i;
+}
+
+
+// output the specified string in reverse, taking care of any zero-padding
+static size_t _out_rev(out_fct_type out, char* buffer, size_t idx, size_t maxlen, const char* buf, size_t len, unsigned int width, unsigned int flags)
+{
+  const size_t start_idx = idx;
+
+  // pad spaces up to given width
+  if (!(flags & FLAGS_LEFT) && !(flags & FLAGS_ZEROPAD)) {
+    for (size_t i = len; i < width; i++) {
+      out(' ', buffer, idx++, maxlen);
+    }
+  }
+
+  // reverse string
+  while (len) {
+    out(buf[--len], buffer, idx++, maxlen);
+  }
+
+  // append pad spaces up to given width
+  if (flags & FLAGS_LEFT) {
+    while (idx - start_idx < width) {
+      out(' ', buffer, idx++, maxlen);
+    }
+  }
+
+  return idx;
+}
+
+
+// internal itoa format
+static size_t _ntoa_format(out_fct_type out, char* buffer, size_t idx, size_t maxlen, char* buf, size_t len, bool negative, unsigned int base, unsigned int prec, unsigned int width, unsigned int flags)
+{
+  // pad leading zeros
+  if (!(flags & FLAGS_LEFT)) {
+    if (width && (flags & FLAGS_ZEROPAD) && (negative || (flags & (FLAGS_PLUS | FLAGS_SPACE)))) {
+      width--;
+    }
+    while ((len < prec) && (len < PRINTF_NTOA_BUFFER_SIZE)) {
+      buf[len++] = '0';
+    }
+    while ((flags & FLAGS_ZEROPAD) && (len < width) && (len < PRINTF_NTOA_BUFFER_SIZE)) {
+      buf[len++] = '0';
+    }
+  }
+
+  // handle hash
+  if (flags & FLAGS_HASH) {
+    if (!(flags & FLAGS_PRECISION) && len && ((len == prec) || (len == width))) {
+      len--;
+      if (len && (base == 16U)) {
+        len--;
+      }
+    }
+    if ((base == 16U) && !(flags & FLAGS_UPPERCASE) && (len < PRINTF_NTOA_BUFFER_SIZE)) {
+      buf[len++] = 'x';
+    }
+    else if ((base == 16U) && (flags & FLAGS_UPPERCASE) && (len < PRINTF_NTOA_BUFFER_SIZE)) {
+      buf[len++] = 'X';
+    }
+    else if ((base == 2U) && (len < PRINTF_NTOA_BUFFER_SIZE)) {
+      buf[len++] = 'b';
+    }
+    if (len < PRINTF_NTOA_BUFFER_SIZE) {
+      buf[len++] = '0';
+    }
+  }
+
+  if (len < PRINTF_NTOA_BUFFER_SIZE) {
+    if (negative) {
+      buf[len++] = '-';
+    }
+    else if (flags & FLAGS_PLUS) {
+      buf[len++] = '+';  // ignore the space if the '+' exists
+    }
+    else if (flags & FLAGS_SPACE) {
+      buf[len++] = ' ';
+    }
+  }
+
+  return _out_rev(out, buffer, idx, maxlen, buf, len, width, flags);
+}
+
+
+// internal itoa for 'long' type
+static size_t _ntoa_long(out_fct_type out, char* buffer, size_t idx, size_t maxlen, unsigned long value, bool negative, unsigned long base, unsigned int prec, unsigned int width, unsigned int flags)
+{
+  char buf[PRINTF_NTOA_BUFFER_SIZE];
+  size_t len = 0U;
+
+  // no hash for 0 values
+  if (!value) {
+    flags &= ~FLAGS_HASH;
+  }
+
+  // write if precision != 0 and value is != 0
+  if (!(flags & FLAGS_PRECISION) || value) {
+    do {
+      const char digit = (char)(value % base);
+      buf[len++] = digit < 10 ? '0' + digit : (flags & FLAGS_UPPERCASE ? 'A' : 'a') + digit - 10;
+      value /= base;
+    } while (value && (len < PRINTF_NTOA_BUFFER_SIZE));
+  }
+
+  return _ntoa_format(out, buffer, idx, maxlen, buf, len, negative, (unsigned int)base, prec, width, flags);
+}
+
+
+// internal itoa for 'long long' type
+#if defined(PRINTF_SUPPORT_LONG_LONG)
+static size_t _ntoa_long_long(out_fct_type out, char* buffer, size_t idx, size_t maxlen, unsigned long long value, bool negative, unsigned long long base, unsigned int prec, unsigned int width, unsigned int flags)
+{
+  char buf[PRINTF_NTOA_BUFFER_SIZE];
+  size_t len = 0U;
+
+  // no hash for 0 values
+  if (!value) {
+    flags &= ~FLAGS_HASH;
+  }
+
+  // write if precision != 0 and value is != 0
+  if (!(flags & FLAGS_PRECISION) || value) {
+    do {
+      const char digit = (char)(value % base);
+      buf[len++] = digit < 10 ? '0' + digit : (flags & FLAGS_UPPERCASE ? 'A' : 'a') + digit - 10;
+      value /= base;
+    } while (value && (len < PRINTF_NTOA_BUFFER_SIZE));
+  }
+
+  return _ntoa_format(out, buffer, idx, maxlen, buf, len, negative, (unsigned int)base, prec, width, flags);
+}
+#endif  // PRINTF_SUPPORT_LONG_LONG
+
+
+#if defined(PRINTF_SUPPORT_FLOAT)
+
+#if defined(PRINTF_SUPPORT_EXPONENTIAL)
+// forward declaration so that _ftoa can switch to exp notation for values > PRINTF_MAX_FLOAT
+static size_t _etoa(out_fct_type out, char* buffer, size_t idx, size_t maxlen, double value, unsigned int prec, unsigned int width, unsigned int flags);
+#endif
+
+
+// internal ftoa for fixed decimal floating point
+static size_t _ftoa(out_fct_type out, char* buffer, size_t idx, size_t maxlen, double value, unsigned int prec, unsigned int width, unsigned int flags)
+{
+  char buf[PRINTF_FTOA_BUFFER_SIZE];
+  size_t len  = 0U;
+  double diff = 0.0;
+
+  // powers of 10
+  static const double pow10[] = { 1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000 };
+
+  // test for special values
+  if (value != value)
+    return _out_rev(out, buffer, idx, maxlen, "nan", 3, width, flags);
+  if (value < -DBL_MAX)
+    return _out_rev(out, buffer, idx, maxlen, "fni-", 4, width, flags);
+  if (value > DBL_MAX)
+    return _out_rev(out, buffer, idx, maxlen, (flags & FLAGS_PLUS) ? "fni+" : "fni", (flags & FLAGS_PLUS) ? 4U : 3U, width, flags);
+
+  // test for very large values
+  // standard printf behavior is to print EVERY whole number digit -- which could be 100s of characters overflowing your buffers == bad
+  if ((value > PRINTF_MAX_FLOAT) || (value < -PRINTF_MAX_FLOAT)) {
+#if defined(PRINTF_SUPPORT_EXPONENTIAL)
+    return _etoa(out, buffer, idx, maxlen, value, prec, width, flags);
+#else
+    return 0U;
+#endif
+  }
+
+  // test for negative
+  bool negative = false;
+  if (value < 0) {
+    negative = true;
+    value = 0 - value;
+  }
+
+  // set default precision, if not set explicitly
+  if (!(flags & FLAGS_PRECISION)) {
+    prec = PRINTF_DEFAULT_FLOAT_PRECISION;
+  }
+  // limit precision to 9, cause a prec >= 10 can lead to overflow errors
+  while ((len < PRINTF_FTOA_BUFFER_SIZE) && (prec > 9U)) {
+    buf[len++] = '0';
+    prec--;
+  }
+
+  int whole = (int)value;
+  double tmp = (value - whole) * pow10[prec];
+  unsigned long frac = (unsigned long)tmp;
+  diff = tmp - frac;
+
+  if (diff > 0.5) {
+    ++frac;
+    // handle rollover, e.g. case 0.99 with prec 1 is 1.0
+    if (frac >= pow10[prec]) {
+      frac = 0;
+      ++whole;
+    }
+  }
+  else if (diff < 0.5) {
+  }
+  else if ((frac == 0U) || (frac & 1U)) {
+    // if halfway, round up if odd OR if last digit is 0
+    ++frac;
+  }
+
+  if (prec == 0U) {
+    diff = value - (double)whole;
+    if ((!(diff < 0.5) || (diff > 0.5)) && (whole & 1)) {
+      // exactly 0.5 and ODD, then round up
+      // 1.5 -> 2, but 2.5 -> 2
+      ++whole;
+    }
+  }
+  else {
+    unsigned int count = prec;
+    // now do fractional part, as an unsigned number
+    while (len < PRINTF_FTOA_BUFFER_SIZE) {
+      --count;
+      buf[len++] = (char)(48U + (frac % 10U));
+      if (!(frac /= 10U)) {
+        break;
+      }
+    }
+    // add extra 0s
+    while ((len < PRINTF_FTOA_BUFFER_SIZE) && (count-- > 0U)) {
+      buf[len++] = '0';
+    }
+    if (len < PRINTF_FTOA_BUFFER_SIZE) {
+      // add decimal
+      buf[len++] = '.';
+    }
+  }
+
+  // do whole part, number is reversed
+  while (len < PRINTF_FTOA_BUFFER_SIZE) {
+    buf[len++] = (char)(48 + (whole % 10));
+    if (!(whole /= 10)) {
+      break;
+    }
+  }
+
+  // pad leading zeros
+  if (!(flags & FLAGS_LEFT) && (flags & FLAGS_ZEROPAD)) {
+    if (width && (negative || (flags & (FLAGS_PLUS | FLAGS_SPACE)))) {
+      width--;
+    }
+    while ((len < width) && (len < PRINTF_FTOA_BUFFER_SIZE)) {
+      buf[len++] = '0';
+    }
+  }
+
+  if (len < PRINTF_FTOA_BUFFER_SIZE) {
+    if (negative) {
+      buf[len++] = '-';
+    }
+    else if (flags & FLAGS_PLUS) {
+      buf[len++] = '+';  // ignore the space if the '+' exists
+    }
+    else if (flags & FLAGS_SPACE) {
+      buf[len++] = ' ';
+    }
+  }
+
+  return _out_rev(out, buffer, idx, maxlen, buf, len, width, flags);
+}
+
+
+#if defined(PRINTF_SUPPORT_EXPONENTIAL)
+// internal ftoa variant for exponential floating-point type, contributed by Martijn Jasperse <m.jasperse@gmail.com>
+static size_t _etoa(out_fct_type out, char* buffer, size_t idx, size_t maxlen, double value, unsigned int prec, unsigned int width, unsigned int flags)
+{
+  // check for NaN and special values
+  if ((value != value) || (value > DBL_MAX) || (value < -DBL_MAX)) {
+    return _ftoa(out, buffer, idx, maxlen, value, prec, width, flags);
+  }
+
+  // determine the sign
+  const bool negative = value < 0;
+  if (negative) {
+    value = -value;
+  }
+
+  // default precision
+  if (!(flags & FLAGS_PRECISION)) {
+    prec = PRINTF_DEFAULT_FLOAT_PRECISION;
+  }
+
+  // determine the decimal exponent
+  // based on the algorithm by David Gay (https://www.ampl.com/netlib/fp/dtoa.c)
+  union {
+    uint64_t U;
+    double   F;
+  } conv;
+
+  conv.F = value;
+  int exp2 = (int)((conv.U >> 52U) & 0x07FFU) - 1023;           // effectively log2
+  conv.U = (conv.U & ((1ULL << 52U) - 1U)) | (1023ULL << 52U);  // drop the exponent so conv.F is now in [1,2)
+  // now approximate log10 from the log2 integer part and an expansion of ln around 1.5
+  int expval = (int)(0.1760912590558 + exp2 * 0.301029995663981 + (conv.F - 1.5) * 0.289529654602168);
+  // now we want to compute 10^expval but we want to be sure it won't overflow
+  exp2 = (int)(expval * 3.321928094887362 + 0.5);
+  const double z  = expval * 2.302585092994046 - exp2 * 0.6931471805599453;
+  const double z2 = z * z;
+  conv.U = (uint64_t)(exp2 + 1023) << 52U;
+  // compute exp(z) using continued fractions, see https://en.wikipedia.org/wiki/Exponential_function#Continued_fractions_for_ex
+  conv.F *= 1 + 2 * z / (2 - z + (z2 / (6 + (z2 / (10 + z2 / 14)))));
+  // correct for rounding errors
+  if (value < conv.F) {
+    expval--;
+    conv.F /= 10;
+  }
+
+  // the exponent format is "%+03d" and largest value is "307", so set aside 4-5 characters
+  unsigned int minwidth = ((expval < 100) && (expval > -100)) ? 4U : 5U;
+
+  // in "%g" mode, "prec" is the number of *significant figures* not decimals
+  if (flags & FLAGS_ADAPT_EXP) {
+    // do we want to fall-back to "%f" mode?
+    if ((value >= 1e-4) && (value < 1e6)) {
+      if ((int)prec > expval) {
+        prec = (unsigned)((int)prec - expval - 1);
+      }
+      else {
+        prec = 0;
+      }
+      flags |= FLAGS_PRECISION;   // make sure _ftoa respects precision
+      // no characters in exponent
+      minwidth = 0U;
+      expval   = 0;
+    }
+    else {
+      // we use one sigfig for the whole part
+      if ((prec > 0) && (flags & FLAGS_PRECISION)) {
+        --prec;
+      }
+    }
+  }
+
+  // will everything fit?
+  unsigned int fwidth = width;
+  if (width > minwidth) {
+    // we didn't fall-back so subtract the characters required for the exponent
+    fwidth -= minwidth;
+  } else {
+    // not enough characters, so go back to default sizing
+    fwidth = 0U;
+  }
+  if ((flags & FLAGS_LEFT) && minwidth) {
+    // if we're padding on the right, DON'T pad the floating part
+    fwidth = 0U;
+  }
+
+  // rescale the float value
+  if (expval) {
+    value /= conv.F;
+  }
+
+  // output the floating part
+  const size_t start_idx = idx;
+  idx = _ftoa(out, buffer, idx, maxlen, negative ? -value : value, prec, fwidth, flags & ~FLAGS_ADAPT_EXP);
+
+  // output the exponent part
+  if (minwidth) {
+    // output the exponential symbol
+    out((flags & FLAGS_UPPERCASE) ? 'E' : 'e', buffer, idx++, maxlen);
+    // output the exponent value
+    idx = _ntoa_long(out, buffer, idx, maxlen, (expval < 0) ? -expval : expval, expval < 0, 10, 0, minwidth-1, FLAGS_ZEROPAD | FLAGS_PLUS);
+    // might need to right-pad spaces
+    if (flags & FLAGS_LEFT) {
+      while (idx - start_idx < width) out(' ', buffer, idx++, maxlen);
+    }
+  }
+  return idx;
+}
+#endif  // PRINTF_SUPPORT_EXPONENTIAL
+#endif  // PRINTF_SUPPORT_FLOAT
+
+
+// internal vsnprintf
+static int _vsnprintf(out_fct_type out, char* buffer, const size_t maxlen, const char* format, va_list va)
+{
+  unsigned int flags, width, precision, n;
+  size_t idx = 0U;
+
+  if (!buffer) {
+    // use null output function
+    out = _out_null;
+  }
+
+  while (*format)
+  {
+    // format specifier?  %[flags][width][.precision][length]
+    if (*format != '%') {
+      // no
+      out(*format, buffer, idx++, maxlen);
+      format++;
+      continue;
+    }
+    else {
+      // yes, evaluate it
+      format++;
+    }
+
+    // evaluate flags
+    flags = 0U;
+    do {
+      switch (*format) {
+        case '0': flags |= FLAGS_ZEROPAD; format++; n = 1U; break;
+        case '-': flags |= FLAGS_LEFT;    format++; n = 1U; break;
+        case '+': flags |= FLAGS_PLUS;    format++; n = 1U; break;
+        case ' ': flags |= FLAGS_SPACE;   format++; n = 1U; break;
+        case '#': flags |= FLAGS_HASH;    format++; n = 1U; break;
+        default :                                   n = 0U; break;
+      }
+    } while (n);
+
+    // evaluate width field
+    width = 0U;
+    if (_is_digit(*format)) {
+      width = _atoi(&format);
+    }
+    else if (*format == '*') {
+      const int w = va_arg(va, int);
+      if (w < 0) {
+        flags |= FLAGS_LEFT;    // reverse padding
+        width = (unsigned int)-w;
+      }
+      else {
+        width = (unsigned int)w;
+      }
+      format++;
+    }
+
+    // evaluate precision field
+    precision = 0U;
+    if (*format == '.') {
+      flags |= FLAGS_PRECISION;
+      format++;
+      if (_is_digit(*format)) {
+        precision = _atoi(&format);
+      }
+      else if (*format == '*') {
+        const int prec = (int)va_arg(va, int);
+        precision = prec > 0 ? (unsigned int)prec : 0U;
+        format++;
+      }
+    }
+
+    // evaluate length field
+    switch (*format) {
+      case 'l' :
+        flags |= FLAGS_LONG;
+        format++;
+        if (*format == 'l') {
+          flags |= FLAGS_LONG_LONG;
+          format++;
+        }
+        break;
+      case 'h' :
+        flags |= FLAGS_SHORT;
+        format++;
+        if (*format == 'h') {
+          flags |= FLAGS_CHAR;
+          format++;
+        }
+        break;
+#if defined(PRINTF_SUPPORT_PTRDIFF_T)
+      case 't' :
+        flags |= (sizeof(ptrdiff_t) == sizeof(long) ? FLAGS_LONG : FLAGS_LONG_LONG);
+        format++;
+        break;
+#endif
+      case 'j' :
+        flags |= (sizeof(intmax_t) == sizeof(long) ? FLAGS_LONG : FLAGS_LONG_LONG);
+        format++;
+        break;
+      case 'z' :
+        flags |= (sizeof(size_t) == sizeof(long) ? FLAGS_LONG : FLAGS_LONG_LONG);
+        format++;
+        break;
+      default :
+        break;
+    }
+
+    // evaluate specifier
+    switch (*format) {
+      case 'd' :
+      case 'i' :
+      case 'u' :
+      case 'x' :
+      case 'X' :
+      case 'o' :
+      case 'b' : {
+        // set the base
+        unsigned int base;
+        if (*format == 'x' || *format == 'X') {
+          base = 16U;
+        }
+        else if (*format == 'o') {
+          base =  8U;
+        }
+        else if (*format == 'b') {
+          base =  2U;
+        }
+        else {
+          base = 10U;
+          flags &= ~FLAGS_HASH;   // no hash for dec format
+        }
+        // uppercase
+        if (*format == 'X') {
+          flags |= FLAGS_UPPERCASE;
+        }
+
+        // no plus or space flag for u, x, X, o, b
+        if ((*format != 'i') && (*format != 'd')) {
+          flags &= ~(FLAGS_PLUS | FLAGS_SPACE);
+        }
+
+        // ignore '0' flag when precision is given
+        if (flags & FLAGS_PRECISION) {
+          flags &= ~FLAGS_ZEROPAD;
+        }
+
+        // convert the integer
+        if ((*format == 'i') || (*format == 'd')) {
+          // signed
+          if (flags & FLAGS_LONG_LONG) {
+#if defined(PRINTF_SUPPORT_LONG_LONG)
+            const long long value = va_arg(va, long long);
+            idx = _ntoa_long_long(out, buffer, idx, maxlen, (unsigned long long)(value > 0 ? value : 0 - value), value < 0, base, precision, width, flags);
+#endif
+          }
+          else if (flags & FLAGS_LONG) {
+            const long value = va_arg(va, long);
+            idx = _ntoa_long(out, buffer, idx, maxlen, (unsigned long)(value > 0 ? value : 0 - value), value < 0, base, precision, width, flags);
+          }
+          else {
+            const int value = (flags & FLAGS_CHAR) ? (char)va_arg(va, int) : (flags & FLAGS_SHORT) ? (short int)va_arg(va, int) : va_arg(va, int);
+            idx = _ntoa_long(out, buffer, idx, maxlen, (unsigned int)(value > 0 ? value : 0 - value), value < 0, base, precision, width, flags);
+          }
+        }
+        else {
+          // unsigned
+          if (flags & FLAGS_LONG_LONG) {
+#if defined(PRINTF_SUPPORT_LONG_LONG)
+            idx = _ntoa_long_long(out, buffer, idx, maxlen, va_arg(va, unsigned long long), false, base, precision, width, flags);
+#endif
+          }
+          else if (flags & FLAGS_LONG) {
+            idx = _ntoa_long(out, buffer, idx, maxlen, va_arg(va, unsigned long), false, base, precision, width, flags);
+          }
+          else {
+            const unsigned int value = (flags & FLAGS_CHAR) ? (unsigned char)va_arg(va, unsigned int) : (flags & FLAGS_SHORT) ? (unsigned short int)va_arg(va, unsigned int) : va_arg(va, unsigned int);
+            idx = _ntoa_long(out, buffer, idx, maxlen, value, false, base, precision, width, flags);
+          }
+        }
+        format++;
+        break;
+      }
+#if defined(PRINTF_SUPPORT_FLOAT)
+      case 'f' :
+      case 'F' :
+        if (*format == 'F') flags |= FLAGS_UPPERCASE;
+        idx = _ftoa(out, buffer, idx, maxlen, va_arg(va, double), precision, width, flags);
+        format++;
+        break;
+#if defined(PRINTF_SUPPORT_EXPONENTIAL)
+      case 'e':
+      case 'E':
+      case 'g':
+      case 'G':
+        if ((*format == 'g')||(*format == 'G')) flags |= FLAGS_ADAPT_EXP;
+        if ((*format == 'E')||(*format == 'G')) flags |= FLAGS_UPPERCASE;
+        idx = _etoa(out, buffer, idx, maxlen, va_arg(va, double), precision, width, flags);
+        format++;
+        break;
+#endif  // PRINTF_SUPPORT_EXPONENTIAL
+#endif  // PRINTF_SUPPORT_FLOAT
+      case 'c' : {
+        unsigned int l = 1U;
+        // pre padding
+        if (!(flags & FLAGS_LEFT)) {
+          while (l++ < width) {
+            out(' ', buffer, idx++, maxlen);
+          }
+        }
+        // char output
+        out((char)va_arg(va, int), buffer, idx++, maxlen);
+        // post padding
+        if (flags & FLAGS_LEFT) {
+          while (l++ < width) {
+            out(' ', buffer, idx++, maxlen);
+          }
+        }
+        format++;
+        break;
+      }
+
+      case 's' : {
+        const char* p = va_arg(va, char*);
+        unsigned int l = _strnlen_s(p, precision ? precision : (size_t)-1);
+        // pre padding
+        if (flags & FLAGS_PRECISION) {
+          l = (l < precision ? l : precision);
+        }
+        if (!(flags & FLAGS_LEFT)) {
+          while (l++ < width) {
+            out(' ', buffer, idx++, maxlen);
+          }
+        }
+        // string output
+        while ((*p != 0) && (!(flags & FLAGS_PRECISION) || precision--)) {
+          out(*(p++), buffer, idx++, maxlen);
+        }
+        // post padding
+        if (flags & FLAGS_LEFT) {
+          while (l++ < width) {
+            out(' ', buffer, idx++, maxlen);
+          }
+        }
+        format++;
+        break;
+      }
+
+      case 'p' : {
+        width = sizeof(void*) * 2U;
+        flags |= FLAGS_ZEROPAD | FLAGS_UPPERCASE;
+#if defined(PRINTF_SUPPORT_LONG_LONG)
+        const bool is_ll = sizeof(uintptr_t) == sizeof(long long);
+        if (is_ll) {
+          idx = _ntoa_long_long(out, buffer, idx, maxlen, (uintptr_t)va_arg(va, void*), false, 16U, precision, width, flags);
+        }
+        else {
+#endif
+          idx = _ntoa_long(out, buffer, idx, maxlen, (unsigned long)((uintptr_t)va_arg(va, void*)), false, 16U, precision, width, flags);
+#if defined(PRINTF_SUPPORT_LONG_LONG)
+        }
+#endif
+        format++;
+        break;
+      }
+
+      case '%' :
+        out('%', buffer, idx++, maxlen);
+        format++;
+        break;
+
+      default :
+        out(*format, buffer, idx++, maxlen);
+        format++;
+        break;
+    }
+  }
+
+  // termination
+  out((char)0, buffer, idx < maxlen ? idx : maxlen - 1U, maxlen);
+
+  // return written chars without terminating \0
+  return (int)idx;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+
+int printf_(const char* format, ...)
+{
+  va_list va;
+  va_start(va, format);
+  char buffer[1];
+  const int ret = _vsnprintf(_out_char, buffer, (size_t)-1, format, va);
+  va_end(va);
+  return ret;
+}
+
+
+int sprintf_(char* buffer, const char* format, ...)
+{
+  va_list va;
+  va_start(va, format);
+  const int ret = _vsnprintf(_out_buffer, buffer, (size_t)-1, format, va);
+  va_end(va);
+  return ret;
+}
+
+
+int snprintf_(char* buffer, size_t count, const char* format, ...)
+{
+  va_list va;
+  va_start(va, format);
+  const int ret = _vsnprintf(_out_buffer, buffer, count, format, va);
+  va_end(va);
+  return ret;
+}
+
+
+int vprintf_(const char* format, va_list va)
+{
+  char buffer[1];
+  return _vsnprintf(_out_char, buffer, (size_t)-1, format, va);
+}
+
+
+int vsnprintf_(char* buffer, size_t count, const char* format, va_list va)
+{
+  return _vsnprintf(_out_buffer, buffer, count, format, va);
+}
+
+
+int fctprintf(void (*out)(char character, void* arg), void* arg, const char* format, ...)
+{
+  va_list va;
+  va_start(va, format);
+  const out_fct_wrap_type out_fct_wrap = { out, arg };
+  const int ret = _vsnprintf(_out_fct, (char*)(uintptr_t)&out_fct_wrap, (size_t)-1, format, va);
+  va_end(va);
+  return ret;
+}

application/src/luat_base_air105.c

@@ -254,7 +254,7 @@ static int32_t _lvgl_handler(void *pData, void *pParam) {
 }
 void luat_lvgl_tick_sleep(uint8_t OnOff)
 {
-	if (OnOff)
+	if (!OnOff)
 	{
 		Timer_StartMS(lv_timer, LVGL_TICK_PERIOD, 1);
 	}

application/src/luat_spi_air105.c

@@ -249,3 +249,32 @@ int luat_lcd_draw_no_block(luat_lcd_conf_t* conf, uint16_t x1, uint16_t y1, uint
 		return -1;
 	}
 }
+
+void luat_lcd_draw_block(luat_lcd_conf_t* conf, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, luat_color_t* color, uint8_t last_flush)
+{
+	LCD_DrawStruct draw;
+	if (conf->port == LUAT_LCD_SPI_DEVICE){
+		luat_spi_device_t* spi_dev = (luat_spi_device_t*)conf->userdata;
+		int spi_id = spi_dev->bus_id;
+	    uint8_t spi_mode = SPI_MODE_0;
+	    if(spi_dev->spi_config.CPHA&&spi_dev->spi_config.CPOL)spi_mode = SPI_MODE_3;
+	    else if(spi_dev->spi_config.CPOL)spi_mode = SPI_MODE_2;
+	    else if(spi_dev->spi_config.CPHA)spi_mode = SPI_MODE_1;
+	    draw.DCDelay = conf->dc_delay_us;
+	    draw.Mode = spi_mode;
+	    draw.Speed = spi_dev->spi_config.bandrate;
+	    draw.SpiID = luat_spi[spi_id].id;
+	    draw.CSPin = spi_dev->spi_config.cs;
+	    draw.DCPin = conf->pin_dc;
+	    draw.x1 = x1;
+	    draw.x2 = x2;
+	    draw.y1 = y1;
+	    draw.y2 = y2;
+	    draw.xoffset = conf->xoffset;
+	    draw.yoffset = conf->yoffset;
+	    draw.Size = (draw.x2 - draw.x1 + 1) * (draw.y2 - draw.y1 + 1) * 2;
+	    draw.ColorMode = COLOR_MODE_RGB_565;
+	    draw.Data = color;
+	    Core_LCDDrawBlock(&draw);
+	}
+}

bsp/air105/hal/core_adc.c

@@ -20,7 +20,7 @@
  */
 
 #include "user.h"
-#define SAMPLE_PER_CH	(15)
+#define SAMPLE_PER_CH	(10)
 #if 0
 typedef struct
 {
@@ -185,6 +185,7 @@ void ADC_GlobalInit(void)
 	ISR_SetPriority(ADC0_IRQn, 6);
 #endif
 	ISR_OnOff(ADC0_IRQn, 0);
+//	ADC_IntelResistance(1);
 }
 
 void ADC_IntelResistance(uint8_t OnOff)
@@ -216,7 +217,7 @@ uint32_t ADC_GetChannelValue(uint8_t Channel)
 	ISR_OnOff(ADC0_IRQn, 1);
 	ADC0->ADC_CR1 = 0x060 | Channel;
 	while(!prvADC.Done){;}
-	for (i = 10; i < SAMPLE_PER_CH; i++)
+	for (i = 5; i < SAMPLE_PER_CH; i++)
 	{
 //		DBG("%d,%d", i, prvADC.Data[i]);
 		value = prvADC.Data[i];
@@ -227,7 +228,7 @@ uint32_t ADC_GetChannelValue(uint8_t Channel)
 		total += value;
 	}
 	ADC0->ADC_CR1 = 0;
-	return ((total - max) -min)/(SAMPLE_PER_CH-12);
+	return ((total - max) -min)/(SAMPLE_PER_CH-7);
 }
 
 #ifdef __BUILD_APP__

bsp/air105/hal/core_gpio.c

@@ -160,14 +160,15 @@ void __FUNC_IN_RAM__ GPIO_ODConfig(uint32_t Pin, uint8_t InitValue)
 	uint8_t orgPin = Pin;
 	Pin = 1 << (Pin & 0x0000000f);
 	GPIO_Iomux(orgPin, 1);
-	prvGPIO_Resource[Port].RegBase->OEN |= Pin;
+
 	if (InitValue)
 	{
-		prvGPIO_Resource[Port].RegBase->PUE |= Pin;
+		prvGPIO_Resource[Port].RegBase->OEN |= Pin;
 	}
 	else
 	{
-		prvGPIO_Resource[Port].RegBase->PUE &= ~Pin;
+		prvGPIO_Resource[Port].RegBase->BSRR |= (Pin << 16);
+		prvGPIO_Resource[Port].RegBase->OEN &= ~Pin;
 	}
 	prvGPIO_Resource[Port].ODBitMap |= Pin;
 }
@@ -270,11 +271,12 @@ void __FUNC_IN_RAM__ GPIO_Output(uint32_t Pin, uint8_t Level)
 	{
 		if (Level)
 		{
-			prvGPIO_Resource[Port].RegBase->PUE |= Pin;
+			prvGPIO_Resource[Port].RegBase->OEN |= Pin;
 		}
 		else
 		{
-			prvGPIO_Resource[Port].RegBase->PUE &= ~Pin;
+			prvGPIO_Resource[Port].RegBase->BSRR |= (Pin << 16);
+			prvGPIO_Resource[Port].RegBase->OEN &= ~Pin;
 		}
 	}
 	else

bsp/air105/hal/core_soft_keyboard.c

@@ -0,0 +1,271 @@
+#include "user.h"
+typedef struct
+{
+	CBFuncEx_t CB;
+	void *pParam;
+	Timer_t *ScanTimer;
+	uint32_t ScanPeriod;			//扫描周期，US
+	uint8_t ScanTimes;				//一次判决所需周期
+	uint8_t PressConfirmTimes;		//判决按下所需周期
+	uint8_t InIO[16];
+	uint8_t OutIO[16];
+	uint8_t InIONum;
+	uint8_t OutIONum;
+	uint8_t PressKeyIOLevel;
+	uint8_t IrqMode;
+	uint8_t IsScan;
+	uint8_t IsEnable;
+	uint8_t Init;
+	uint8_t ScanCnt;
+	uint8_t KeyPress[256];
+	uint8_t KeyState[32];
+}SoftKB_CtrlStruct;
+static SoftKB_CtrlStruct prvSoftKB;
+
+static int32_t prvSoftKB_DummyCB(void *pData, void *pParam)
+{
+	DBG("%x", pData);
+	return 0;
+}
+
+
+static int32_t prvSoftKB_IOIrqCB(void *pData, void *pParam)
+{
+	int i;
+	for(i = 0; i < prvSoftKB.InIONum; i++)
+	{
+		GPIO_ExtiConfig(prvSoftKB.InIO[i], 0, 0, 0);
+
+	}
+	for(i = 0; i < prvSoftKB.OutIONum; i++)
+	{
+		GPIO_ODConfig(prvSoftKB.OutIO[i], !prvSoftKB.PressKeyIOLevel);
+	}
+
+	if (prvSoftKB.IsEnable)
+	{
+		Timer_StartUS(prvSoftKB.ScanTimer, prvSoftKB.ScanPeriod, 1);
+		prvSoftKB.IsScan = 1;
+		prvSoftKB.ScanCnt = 0;
+	}
+	return 0;
+}
+
+static int32_t prvSoftKB_TimerIrqCB(void *pData, void *pParam)
+{
+	if (!prvSoftKB.IsScan || !prvSoftKB.IsEnable)
+	{
+		Timer_Stop(prvSoftKB.ScanTimer);
+		return -1;
+	}
+#ifdef __BUILD_OS__
+	if (prvSoftKB.IrqMode)
+	{
+#endif
+		SoftKB_ScanOnce();
+#ifdef __BUILD_OS__
+	}
+	else
+	{
+		Core_ScanKeyBoard();
+	}
+#endif
+	return 0;
+}
+
+void SoftKB_Setup(uint32_t ScanPeriodUS, uint8_t ScanTimes, uint8_t PressConfirmTimes, uint8_t IsIrqMode, CBFuncEx_t CB, void *pParam)
+{
+	prvSoftKB.ScanPeriod = ScanPeriodUS;
+	prvSoftKB.ScanTimes = ScanTimes;
+	prvSoftKB.PressConfirmTimes = PressConfirmTimes;
+	if (CB)
+	{
+		prvSoftKB.CB = CB;
+	}
+	else
+	{
+		prvSoftKB.CB = prvSoftKB_DummyCB;
+	}
+	prvSoftKB.pParam = pParam;
+	prvSoftKB.Init |= 0xf0;
+	prvSoftKB.IrqMode = IsIrqMode;
+}
+
+void SoftKB_IOConfig(const uint8_t *InIO, uint8_t InIONum, const uint8_t *OutIO, uint8_t OutIONum, uint8_t PressKeyIOLevel)
+{
+	if (InIONum > 16 || OutIONum > 16) return;
+	if (InIO)
+	{
+		memset(prvSoftKB.InIO, 0xff, sizeof(prvSoftKB.InIO));
+		memcpy(prvSoftKB.InIO, InIO, InIONum);
+		prvSoftKB.InIONum = InIONum;
+		prvSoftKB.Init |= 0x03;
+	}
+	if (OutIO)
+	{
+		memset(prvSoftKB.OutIO, 0xff, sizeof(prvSoftKB.OutIO));
+		memcpy(prvSoftKB.OutIO, OutIO, OutIONum);
+		prvSoftKB.OutIONum = OutIONum;
+		prvSoftKB.Init |= 0x0c;
+	}
+	prvSoftKB.PressKeyIOLevel = PressKeyIOLevel;
+
+}
+
+void SoftKB_Start(void)
+{
+	int i;
+	if (!prvSoftKB.ScanTimer)
+	{
+		prvSoftKB.ScanTimer = Timer_Create(prvSoftKB_TimerIrqCB, NULL, NULL);
+	}
+	if (prvSoftKB.Init != 0xff)
+	{
+		return;
+	}
+	memset(prvSoftKB.KeyPress, 0, sizeof(prvSoftKB.KeyPress));
+	memset(prvSoftKB.KeyState, 0, sizeof(prvSoftKB.KeyState));
+	prvSoftKB.IsScan = 0;
+	prvSoftKB.ScanCnt = 0;
+	for(i = 0; i < prvSoftKB.OutIONum; i++)
+	{
+		GPIO_ODConfig(prvSoftKB.OutIO[i], prvSoftKB.PressKeyIOLevel);
+	}
+	for(i = 0; i < prvSoftKB.InIONum; i++)
+	{
+		GPIO_Config(prvSoftKB.InIO[i], 1, 0);
+		GPIO_PullConfig(prvSoftKB.InIO[i], 1, !prvSoftKB.PressKeyIOLevel);
+		if (GPIO_Input(prvSoftKB.InIO[i]) == prvSoftKB.PressKeyIOLevel)
+		{
+			prvSoftKB.IsScan = 1;
+		}
+		GPIO_ExtiSetCB(prvSoftKB.InIO[i], prvSoftKB_IOIrqCB, NULL);
+	}
+	if (prvSoftKB.IsScan)
+	{
+		Timer_StartUS(prvSoftKB.ScanTimer, prvSoftKB.ScanPeriod, 1);
+	}
+	else
+	{
+		for(i = 0; i < prvSoftKB.InIONum; i++)
+		{
+			GPIO_ExtiConfig(prvSoftKB.InIO[i], 0, prvSoftKB.PressKeyIOLevel, !prvSoftKB.PressKeyIOLevel);
+		}
+	}
+	prvSoftKB.IsEnable = 1;
+}
+
+void SoftKB_Stop(void)
+{
+	int i;
+	if (!prvSoftKB.ScanTimer)
+	{
+		prvSoftKB.ScanTimer = Timer_Create(prvSoftKB_TimerIrqCB, NULL, NULL);
+	}
+	else
+	{
+		Timer_Stop(prvSoftKB.ScanTimer);
+	}
+	for(i = 0; i < prvSoftKB.InIONum; i++)
+	{
+		GPIO_ExtiConfig(prvSoftKB.InIO[i], 0, 0, 0);
+		GPIO_ExtiSetCB(prvSoftKB.InIO[i], NULL, NULL);
+	}
+	for(i = 0; i < prvSoftKB.OutIONum; i++)
+	{
+		GPIO_Output(prvSoftKB.OutIO[i], prvSoftKB.PressKeyIOLevel);
+	}
+	prvSoftKB.IsEnable = 0;
+}
+
+void SoftKB_ScanOnce(void)
+{
+	int i, j;
+	uint32_t KeySn;
+	if (!prvSoftKB.IsEnable || !prvSoftKB.IsScan)
+	{
+		return;
+	}
+	for(i = 0; i < prvSoftKB.OutIONum; i++)
+	{
+		GPIO_Output(prvSoftKB.OutIO[i], prvSoftKB.PressKeyIOLevel);
+		for(j = 0; j < prvSoftKB.InIONum; j++)
+		{
+			//DBG("%d,%d,%d", i, j, GPIO_Input(prvSoftKB.InIO[j]));
+			prvSoftKB.KeyPress[(i << 4) + j] += (GPIO_Input(prvSoftKB.InIO[j]) == prvSoftKB.PressKeyIOLevel);
+		}
+		GPIO_Output(prvSoftKB.OutIO[i], !prvSoftKB.PressKeyIOLevel);
+	}
+	prvSoftKB.ScanCnt++;
+	if (prvSoftKB.ScanCnt >= prvSoftKB.ScanTimes)
+	{
+		prvSoftKB.ScanCnt = 0;
+		for(i = 0; i < prvSoftKB.OutIONum; i++)
+		{
+			for(j = 0; j < prvSoftKB.InIONum; j++)
+			{
+				KeySn = (i << 4) + j;
+				if (prvSoftKB.KeyPress[KeySn] >= prvSoftKB.PressConfirmTimes)
+				{
+					if (!BSP_TestBit(prvSoftKB.KeyState, KeySn))
+					{
+						BSP_SetBit(prvSoftKB.KeyState, KeySn, 1);
+						prvSoftKB.CB(KeySn|(1 << 16), prvSoftKB.pParam);
+					}
+				}
+				else
+				{
+					if (BSP_TestBit(prvSoftKB.KeyState, KeySn))
+					{
+						BSP_SetBit(prvSoftKB.KeyState, KeySn, 0);
+						prvSoftKB.CB(KeySn, prvSoftKB.pParam);
+					}
+				}
+			}
+		}
+		memset(prvSoftKB.KeyPress, 0, sizeof(prvSoftKB.KeyPress));
+		for(i = 0; i < sizeof(prvSoftKB.KeyState); i++)
+		{
+			if (prvSoftKB.KeyState[i])
+			{
+				return;
+			}
+		}
+		Timer_Stop(prvSoftKB.ScanTimer);
+		prvSoftKB.IsScan = 0;
+		for(i = 0; i < prvSoftKB.OutIONum; i++)
+		{
+			GPIO_Output(prvSoftKB.OutIO[i], prvSoftKB.PressKeyIOLevel);
+		}
+		for(i = 0; i < prvSoftKB.InIONum; i++)
+		{
+			GPIO_ExtiConfig(prvSoftKB.InIO[i], 0, prvSoftKB.PressKeyIOLevel, !prvSoftKB.PressKeyIOLevel);
+		}
+
+	}
+}
+
+
+void SoftKB_SetCB(CBFuncEx_t CB, void *pParam)
+{
+	if (CB)
+	{
+		prvSoftKB.CB = CB;
+	}
+	else
+	{
+		prvSoftKB.CB = prvSoftKB_DummyCB;
+	}
+	prvSoftKB.pParam = pParam;
+}
+
+void SoftKB_Test(void)
+{
+	uint8_t In[4] = {GPIOD_10, GPIOE_00, GPIOE_01, GPIOE_02};
+	uint8_t Out[4] = {GPIOD_12, GPIOD_13, GPIOD_14, GPIOD_15};
+	SoftKB_Setup(6250, 4, 2, 0, NULL, NULL);
+	SoftKB_IOConfig(In, 4, Out, 4, 0);
+	SoftKB_Start();
+}
+
+//INIT_TASK_EXPORT(SoftKB_Test, "3");

bsp/air105/hal/core_spi.c

@@ -226,7 +226,7 @@ static int32_t SPI_DMADoneCB(void *pData, void *pParam)
 		if (prvSPI[SpiID].IsOnlyTx)
 		{
 			DMA_ForceStartStream(prvSPI[SpiID].DMATxStream, &prvSPI[SpiID].TxBuf.Data[prvSPI[SpiID].TxBuf.Pos], RxLevel, SPI_DMADoneCB, (void *)SpiID, 1);
-			DMA_ForceStartStream(prvSPI[SpiID].DMARxStream, &prvSPI[SpiID].RxBuf.Data[prvSPI[SpiID].RxBuf.Pos], RxLevel, NULL, NULL, 0);
+//			DMA_ForceStartStream(prvSPI[SpiID].DMARxStream, &prvSPI[SpiID].RxBuf.Data[prvSPI[SpiID].RxBuf.Pos], RxLevel, NULL, NULL, 0);
 		}
 		else
 		{
@@ -502,7 +502,7 @@ static void SPI_DMATransfer(uint8_t SpiID, uint8_t UseDMA)
 	if (prvSPI[SpiID].IsOnlyTx)
 	{
 		DMA_ForceStartStream(prvSPI[SpiID].DMATxStream, prvSPI[SpiID].TxBuf.Data, RxLevel, SPI_DMADoneCB, (void *)SpiID, 1);
-		DMA_ForceStartStream(prvSPI[SpiID].DMARxStream, prvSPI[SpiID].RxBuf.Data, RxLevel, NULL, NULL, 0);
+//		DMA_ForceStartStream(prvSPI[SpiID].DMARxStream, prvSPI[SpiID].RxBuf.Data, RxLevel, NULL, NULL, 0);
 	}
 	else
 	{

bsp/air105/include/app_inc.h

@@ -42,7 +42,6 @@ typedef unsigned long long  uint64_t;
 typedef long long           int64_t;
 #endif
 #include "core_hwtimer.h"
-#include "core_spi.h"
 #include "core_adc.h"
 #include "core_dac.h"
 #include "core_wdt.h"

bsp/air105/include/bl_inc.h

@@ -41,6 +41,8 @@
 #include "core_rtc.h"
 #include "core_i2c.h"
 #include "core_pm.h"
+#include "core_spi.h"
+#include "core_soft_keyboard.h"
 
 #include "usb_driver.h"
 #include "usb_device.h"

bsp/air105/include/core_soft_keyboard.h

@@ -0,0 +1,8 @@
+#ifndef __CORE_SOFT_KEYBOARD_H__
+#define __CORE_SOFT_KEYBOARD_H__
+void SoftKB_Setup(uint32_t ScanPeriodUS, uint8_t ScanTimes, uint8_t PressConfirmTimes, uint8_t IsIrqMode, CBFuncEx_t CB, void *pParam);
+void SoftKB_IOConfig(const uint8_t *InIO, uint8_t InIONum, const uint8_t *OutIO, uint8_t OutIONum, uint8_t PressKeyIOLevel);
+void SoftKB_Start(void);
+void SoftKB_Stop(void);
+void SoftKB_ScanOnce(void);
+#endif

bsp/common/include/core_service.h

@@ -44,11 +44,13 @@ typedef struct
 
 void Core_ServiceInit(void);
 void Core_LCDDraw(LCD_DrawStruct *Draw);
+void Core_LCDDrawBlock(LCD_DrawStruct *Draw);
 void Core_CameraDraw(LCD_DrawStruct *Draw);
 void Core_DecodeQR(uint8_t *ImageData, uint16_t ImageW, uint16_t ImageH,  CBDataFun_t CB);
 uint32_t Core_LCDDrawCacheLen(void);
 void Core_USBDefaultDeviceStart(uint8_t USB_ID);
 void Core_USBAction(uint8_t USB_ID, uint8_t Action, void *pParam);
+void Core_ScanKeyBoard(void);
 void Core_PrintMemInfo(void);
 void Core_PrintServiceStack(void);
 void Core_DebugMem(uint8_t HeapID, const char *FuncName, uint32_t Line);

bsp/common/src/core_service.c

@@ -101,6 +101,7 @@ enum
 	SERVICE_CAMERA_DRAW,
 	SERVICE_USB_ACTION,
 	SERVICE_DECODE_QR,
+	SERVICE_SCAN_KEYBOARD,
 };
 
 
@@ -1267,6 +1268,9 @@ static void prvService_Task(void* params)
 		Task_GetEventByMS(prvService.ServiceHandle, CORE_EVENT_ID_ANY, &Event, NULL, 0);
 		switch(Event.ID)
 		{
+		case SERVICE_SCAN_KEYBOARD:
+			SoftKB_ScanOnce();
+			break;
 		case SERVICE_USB_ACTION:
 			switch (Event.Param2)
 			{
@@ -1354,6 +1358,40 @@ void Core_LCDDraw(LCD_DrawStruct *Draw)
 	Task_SendEvent(prvService.HardwareHandle, SERVICE_LCD_DRAW, Draw, 0, 0);
 }
 
+void Core_LCDDrawBlock(LCD_DrawStruct *Draw)
+{
+	PV_Union uPV;
+	uint64_t StartUS;
+//	if (Draw->Speed > 30000000)
+//	{
+//		SPI_SetTxOnlyFlag(Draw->SpiID, 1);
+//	}
+	SPI_SetNewConfig(Draw->SpiID, Draw->Speed, Draw->Mode);
+//	SPI_DMATxInit(Draw->SpiID, LCD_SPI_TX_DMA_STREAM, 0);
+//	SPI_DMARxInit(Draw->SpiID, LCD_SPI_RX_DMA_STREAM, 0);
+	prvCore_LCDCmd(Draw, 0x2a);
+	BytesPutBe16(uPV.u8, Draw->x1 + Draw->xoffset);
+	BytesPutBe16(uPV.u8 + 2, Draw->x2 + Draw->xoffset);
+	prvCore_LCDData(Draw, uPV.u8, 4);
+	prvCore_LCDCmd(Draw, 0x2b);
+	BytesPutBe16(uPV.u8, Draw->y1 + Draw->yoffset);
+	BytesPutBe16(uPV.u8 + 2, Draw->y2 + Draw->yoffset);
+	prvCore_LCDData(Draw, uPV.u8, 4);
+	prvCore_LCDCmd(Draw, 0x2c);
+	GPIO_Output(Draw->CSPin, 0);
+//	StartUS = GetSysTickUS();
+//			SPI_Transfer(Draw->SpiID, Draw->Data, Draw->Data, Draw->Size, 2);
+
+	SPI_BlockTransfer(Draw->SpiID, Draw->Data, Draw->Data, Draw->Size);
+//	DBG("%u, %u", Draw->Size, (uint32_t)(GetSysTickUS() - StartUS));
+//	if (Draw->Speed > 30000000)
+//	{
+//		Task_DelayUS(1);
+//	}
+	GPIO_Output(Draw->CSPin, 1);
+	SPI_SetTxOnlyFlag(Draw->SpiID, 0);
+}
+
 void Core_CameraDraw(LCD_DrawStruct *Draw)
 {
 	Task_SendEvent(prvService.HardwareHandle, SERVICE_CAMERA_DRAW, Draw, 0, 0);
@@ -1372,6 +1410,11 @@ void Core_USBAction(uint8_t USB_ID, uint8_t Action, void *pParam)
 	Task_SendEvent(prvService.ServiceHandle, SERVICE_USB_ACTION, USB_ID, Action, pParam);
 }
 
+void Core_ScanKeyBoard(void)
+{
+	Task_SendEvent(prvService.ServiceHandle, SERVICE_SCAN_KEYBOARD, 0, 0, 0);
+}
+
 void Core_PrintMemInfo(void)
 {
 	uint32_t curalloc, totfree, maxfree;

xmake.lua

@@ -191,6 +191,12 @@ target("app.elf")
 
     add_files("Third_Party/lzma/src/*.c",{public = true})
     add_includedirs("Third_Party/lzma/include",{public = true})
+
+    add_files("Third_Party/vsprintf/*.c",{public = true})
+    add_includedirs("Third_Party/vsprintf",{public = true})
+
+    add_files("Third_Party/heap/*.c",{public = true})
+    add_includedirs("Third_Party/heap",{public = true})
     
     --add_files("bsp/common/*.c",{public = true})
 	add_files("bsp/common/src/*.c",{public = true})
@@ -202,7 +208,7 @@ target("app.elf")
     add_includedirs("bsp/device/include",{public = true})
     add_includedirs("bsp/audio/include",{public = true})
     add_files("bsp/audio/**.c",{public = true})
-    -- add_files("bsp/device/src/*.c",{public = true})
+    add_files("bsp/device/src/*.c",{public = true})
     -- add files
     add_files("bsp/air105/platform/startup_full.s")
     add_files("bsp/air105/platform/app_main.c")
@@ -228,6 +234,8 @@ target("app.elf")
     add_files(luatos.."luat/modules/*.c")
     add_files(luatos.."luat/vfs/*.c")
     remove_files(luatos.."luat/vfs/luat_fs_posix.c")
+    remove_files(luatos.."lua/src/bget.c")
+    remove_files(luatos.."lua/src/printf.c")
 
     add_files(luatos.."components/lcd/*.c")
     add_files(luatos.."components/sfd/*.c")