Merge pull request #35 from m5stack/develop

0.0.20

Author: lovyan03

library.json

@@ -10,7 +10,7 @@
     "type": "git",
     "url": "https://github.com/m5stack/M5GFX.git"
   },
-  "version": "0.0.19",
+  "version": "0.0.20",
   "frameworks": "arduino",
   "platforms": "espressif32",
   "headers": "M5GFX.h"

library.properties

@@ -1,5 +1,5 @@
 name=M5GFX
-version=0.0.19
+version=0.0.20
 author=M5Stack
 maintainer=M5Stack
 sentence=Library for M5Stack All Display

src/M5GFX.cpp

@@ -286,19 +286,33 @@ namespace m5gfx
     } while (lgfx::millis() - time < 10);
   }
 
+  /// TF card dummy clock送信 ;
+  static void _send_sd_dummy_clock(int_fast16_t pin_cs)
+  {
+    static constexpr uint32_t dummy_clock[] = { ~0u, ~0u, ~0u, ~0u, ~0u };
+    _pin_level(pin_cs, true);
+    m5gfx::spi::writeBytes(VSPI_HOST, (const uint8_t*)dummy_clock, sizeof(dummy_clock));
+    _pin_level(pin_cs, false);
+  }
+
   /// TF card をSPIモードに移行する ;
   static void _set_sd_spimode(int_fast16_t pin_cs)
   {
-    _pin_level(pin_cs, true);
     m5gfx::spi::beginTransaction(VSPI_HOST, 400000, 0);
-    static constexpr uint32_t dummy_clock[] = { ~0u, ~0u, ~0u, ~0u, ~0u };
-    m5gfx::spi::writeBytes(VSPI_HOST, (const uint8_t*)dummy_clock, sizeof(dummy_clock));
+    _send_sd_dummy_clock(pin_cs);
 
-    _pin_level(pin_cs, false);
-    static constexpr uint8_t sd_cmd0[] = { 0x40, 0, 0, 0, 0, 0x95, 0xFF, 0xFF };
-    m5gfx::spi::writeBytes(VSPI_HOST, sd_cmd0, sizeof(sd_cmd0));
-    m5gfx::spi::endTransaction(VSPI_HOST);
+    uint8_t sd_cmd58[] = { 0x7A, 0, 0, 0, 0, 0xFD, 0xFF, 0xFF }; // READ_OCR command.
+    m5gfx::spi::readBytes(VSPI_HOST, sd_cmd58, sizeof(sd_cmd58));
+
+    if (sd_cmd58[6] == sd_cmd58[7])  // not SPI mode
+    {
+      _send_sd_dummy_clock(pin_cs);
+
+      static constexpr uint8_t sd_cmd0[] = { 0x40, 0, 0, 0, 0, 0x95, 0xFF, 0xFF }; // GO_IDLE_STATE command.
+      m5gfx::spi::writeBytes(VSPI_HOST, sd_cmd0, sizeof(sd_cmd0));
+    }
     _pin_level(pin_cs, true);
+    m5gfx::spi::endTransaction(VSPI_HOST);
   }
 
   static std::uint32_t _read_panel_id(lgfx::Bus_SPI* bus, std::int32_t pin_cs, std::uint32_t cmd = 0x04, std::uint8_t dummy_read_bit = 1) // 0x04 = RDDID command

src/lgfx/utility/miniz.c

@@ -190,7 +190,7 @@
 // functions (such as tdefl_compress_mem_to_heap() and tinfl_decompress_mem_to_heap()) won't work.
 //#define MINIZ_NO_MALLOC
 
-// 
+//
 //#define MINIZ_NO_COMPRESSION
 
 
@@ -216,8 +216,6 @@
 #if MINIZ_X86_OR_X64_CPU
 // Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES to 1 on CPU's that permit efficient integer loads and stores from unaligned addresses.
 #define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 1
-#elif defined (ESP_PLATFORM)
-#define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 1
 #else
 #endif
 
@@ -830,7 +828,7 @@ size_t tdefl_compress_mem_to_mem(void *pOut_buf, size_t out_buf_len, const void
 
 // Compresses an image to a compressed PNG file in memory.
 // On entry:
-//  pImage, w, h, and num_chans describe the image to compress. num_chans may be 1, 2, 3, or 4. 
+//  pImage, w, h, and num_chans describe the image to compress. num_chans may be 1, 2, 3, or 4.
 //  The image pitch in bytes per scanline will be w*num_chans. The leftmost pixel on the top scanline is stored first in memory.
 //  level may range from [0,10], use MZ_NO_COMPRESSION, MZ_BEST_SPEED, MZ_BEST_COMPRESSION, etc. or a decent default is MZ_DEFAULT_LEVEL
 //  If flip is true, the image will be flipped on the Y axis (useful for OpenGL apps).
@@ -4494,7 +4492,7 @@ mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name,
 
   if (!mz_zip_get_file_modified_time(pSrc_filename, &dos_time, &dos_date))
     return MZ_FALSE;
-    
+
   pSrc_file = MZ_FOPEN(pSrc_filename, "rb");
   if (!pSrc_file)
     return MZ_FALSE;

src/lgfx/v1/Bus.hpp

@@ -49,6 +49,12 @@ namespace lgfx
     /// ペリフェラルを解放する。;
     virtual void release(void) = 0;
 
+    /// 通信速度を取得する。;
+    virtual uint32_t getClock(void) const { return 0; }
+
+    /// 通信速度を設定する。;
+    virtual void setClock(uint32_t) {};
+
     /// 通信トランザクションを開始する。（ペリフェラルを占有する）;
     virtual void beginTransaction(void) = 0;
 

src/lgfx/v1/LGFXBase.hpp

@@ -1117,7 +1117,7 @@ namespace lgfx
 
 //----------------------------------------------------------------------------
 
-  class Panel_Device;
+  struct Panel_Device;
 
   class LGFX_Device : public LovyanGFX
   {

src/lgfx/v1/Touch.hpp

@@ -47,6 +47,7 @@ namespace lgfx
       uint16_t y_max = 3600;
       bool bus_shared = true;          /// パネルとタッチが同じバスに繋がっている場合true;
       int16_t pin_int = -1;
+      int16_t pin_rst = -1;
       uint8_t offset_rotation = 0;
       union
       {

src/lgfx/v1/gitTagVersion.h

@@ -1,4 +1,4 @@
 #define LGFX_VERSION_MAJOR 1
 #define LGFX_VERSION_MINOR 0
-#define LGFX_VERSION_PATCH 15
+#define LGFX_VERSION_PATCH 16
 #define LOVYANGFX_VERSION F( LGFX_VERSION_MAJOR "." LGFX_VERSION_MINOR "." LGFX_VERSION_PATCH )