Merge branch 'develop'

ARM-software · Dec 2, 2019 · a1d0abe · a1d0abe
2 parents a5d86b6 + 071a594
commit a1d0abe
Show file tree

Hide file tree

Showing 65 changed files with 37,676 additions and 1,016 deletions.
diff --git a/ARM.CMSIS-Driver.pdsc b/ARM.CMSIS-Driver.pdsc
@@ -1,14 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<package schemaVersion="1.4.0" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="Utilities/PACK.xsd">
+<package schemaVersion="1.4.9" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="PACK.xsd">
   <name>CMSIS-Driver</name>
   <description>CMSIS Drivers for external devices</description>
   <vendor>ARM</vendor>
   <url>http://www.keil.com/pack/</url>
-  <!-- <license>LICENSE.txt</license> -->
+  <license>LICENSE.txt</license>
 
   <releases>
+    <release version="2.5.0" date="2019-12-02">
+      Added Espressif ESP32 WiFi driver
+      Added Espressif ESP8266 WiFi driver
+      Added Wiznet WizFi360 WiFi driver
+      Updated Inventek ISM43362 WiFi driver (version 1.3.0):
+      - Fixed SocketClose functionality
+      - Fixed Activate function not to set password if OPEN security is used
+      - Updated Initialization function to handle unavailable reset pin
+      - Added debug of SPI traffic with Event Recorder
+      - Added CMSIS Driver Validation test results
+    </release>
     <release version="2.4.1" date="2019-07-11">
-      Updated Inventek ISM43362 WiFi driver (version 1.0)
+      Updated Inventek ISM43362 WiFi driver (version 1.0.0)
       Corrected PHY_LAN8742A power down bit definition
     </release>
     <release version="2.4.0" date="2019-03-15">
@@ -100,6 +111,12 @@
       <require condition="CMSIS RTOS2"/>
       <require Cclass="CMSIS Driver" Cgroup="I2C"/>
     </condition>
+    <condition id="CMSIS Core with RTOS2 and USART Driver">
+      <description>CMSIS Core with RTOS2 for Cortex-M and USART Driver</description>
+      <require condition="CMSIS Core"/>
+      <require condition="CMSIS RTOS2"/>
+      <require Cclass="CMSIS Driver" Cgroup="USART"/>
+    </condition>
   </conditions>
 
   <components>
@@ -344,17 +361,78 @@
     <!-- CMSIS-Driver WiFi -->
 
     <!-- Inventek ISM43362 -->    
-    <component Cvendor="Keil" Cclass="CMSIS Driver" Cgroup="WiFi" Csub="ISM43362" Capiversion="1.0.0" Cvariant="SPI" Cversion="1.0.0" condition="CMSIS Core with RTOS2 and SPI Driver">
+    <component Cvendor="Keil" Cclass="CMSIS Driver" Cgroup="WiFi" Csub="ISM43362" Capiversion="1.0.0" Cvariant="SPI" Cversion="1.3.0" condition="CMSIS Core with RTOS2 and SPI Driver">
       <description>WiFi Inventek ISM43362 Driver (SPI)</description>
       <RTE_Components_h>
         <!-- the following content goes into file 'RTE_Components.h' -->
         #define RTE_Drivers_WiFi_ISM43362_SPI   /* Driver WiFi ISM43362 (SPI) */
       </RTE_Components_h>
       <files>
-        <file category="doc"    name="https://www.inventeksys.com/wifi/wifi-modules/ism4336-m3g-l44-e-embedded-serial-to-wifi-module"/>
-        <file category="header" name="WiFi/ISM43362/Config/WiFi_ISM43362_Config.h" attr="config" version="1.0.0"/>
-        <file category="source" name="WiFi/ISM43362/Config/WiFi_ISM43362_HW.c"     attr="config" version="1.0.0"/>
-        <file category="source" name="WiFi/ISM43362/WiFi_ISM43362.c"/>
+        <file category="other"   name="WiFi/ISM43362/WiFi_ISM43362.scvd"/>
+        <file category="include" name="WiFi/ISM43362/"/>
+        <file category="header"  name="WiFi/ISM43362/Config/WiFi_ISM43362_Config.h" attr="config" version="1.0.0"/>
+        <file category="source"  name="WiFi/ISM43362/Config/WiFi_ISM43362_HW.c"     attr="config" version="1.0.0"/>
+        <file category="source"  name="WiFi/ISM43362/WiFi_ISM43362.c"/>
+        <file category="source"  name="WiFi/ISM43362/WiFi_ISM43362_Buf.c"/>
+        <file category="source"  name="WiFi/ISM43362/WiFi_ISM43362_Mem.c"/>
+      </files>
+    </component>
+
+    <!-- ESP32 -->
+    <component Cvendor="Keil" Cclass="CMSIS Driver" Cgroup="WiFi" Csub="ESP32" Capiversion="1.0.0" Cvariant="UART" Cversion="1.0.0" condition="CMSIS Core with RTOS2 and USART Driver">
+      <description>Espressif ESP32 WiFi Driver (UART)</description>
+      <RTE_Components_h>
+        #define RTE_Drivers_WiFi_ESP32_UART   /* Driver WiFi ESP32 (UART) */
+      </RTE_Components_h>
+      <files>
+        <file category="header"  name="WiFi/ESP32/Config/WiFi_ESP32_Config.h" attr="config" version="1.0.0"/>
+        <file category="include" name="WiFi/ESP32/"/>
+        <file category="source"  name="WiFi/ESP32/WiFi_ESP32.c"/>
+        <file category="source"  name="WiFi/ESP32/WiFi_ESP32_Os.c"/>
+        <file category="source"  name="WiFi/ESP32/ESP32.c"/>
+        <file category="source"  name="WiFi/ESP32/ESP32_Serial.c"/>
+        <file category="include" name="WiFi/ESP32/BufList/"/>
+        <file category="source"  name="WiFi/ESP32/BufList/BufList.c"/>
+        <file category="source"  name="WiFi/ESP32/BufList/LinkList.c"/>
+      </files>
+    </component>
+
+    <!-- ESP8266 -->
+    <component Cvendor="Keil" Cclass="CMSIS Driver" Cgroup="WiFi" Csub="ESP8266" Capiversion="1.0.0" Cvariant="UART" Cversion="1.0.0" condition="CMSIS Core with RTOS2 and USART Driver">
+      <description>Espressif ESP8266 WiFi Driver (UART)</description>
+      <RTE_Components_h>
+        <!-- the following content goes into file 'RTE_Components.h' -->
+        #define RTE_Drivers_WiFi_ESP8266_UART   /* Driver WiFi ESP8266 (UART) */
+      </RTE_Components_h>
+      <files>
+        <file category="header"  name="WiFi/ESP8266/Config/WiFi_ESP8266_Config.h" attr="config" version="1.0.0"/>
+        <file category="include" name="WiFi/ESP8266/"/>
+        <file category="source"  name="WiFi/ESP8266/WiFi_ESP8266.c"/>
+        <file category="source"  name="WiFi/ESP8266/WiFi_ESP8266_Os.c"/>
+        <file category="source"  name="WiFi/ESP8266/ESP8266.c"/>
+        <file category="source"  name="WiFi/ESP8266/ESP8266_Serial.c"/>
+        <file category="include" name="WiFi/ESP8266/BufList/"/>
+        <file category="source"  name="WiFi/ESP8266/BufList/BufList.c"/>
+        <file category="source"  name="WiFi/ESP8266/BufList/LinkList.c"/>
+      </files>
+    </component>
+
+    <!-- WizFi360 -->
+    <component Cvendor="Keil" Cclass="CMSIS Driver" Cgroup="WiFi" Csub="WizFi360" Capiversion="1.0.0" Cvariant="UART" Cversion="1.0.0" condition="CMSIS Core with RTOS2 and USART Driver">
+      <description>WIZnet WizFi360 WiFi Driver (UART)</description>
+      <RTE_Components_h>
+        #define RTE_Drivers_WiFi_WIZFI360_UART   /* Driver WiFi WIZFI360 (UART) */
+      </RTE_Components_h>
+      <files>
+        <file category="header"  name="WiFi/WizFi360/Config/WiFi_WizFi360_Config.h" attr="config" version="1.0.0"/>
+        <file category="include" name="WiFi/WizFi360/"/>
+        <file category="source"  name="WiFi/WizFi360/WiFi_WizFi360.c"/>
+        <file category="source"  name="WiFi/WizFi360/WiFi_WizFi360_Os.c"/>
+        <file category="source"  name="WiFi/WizFi360/WizFi360.c"/>
+        <file category="source"  name="WiFi/WizFi360/WizFi360_Serial.c"/>
+        <file category="include" name="WiFi/WizFi360/BufList/"/>
+        <file category="source"  name="WiFi/WizFi360/BufList/BufList.c"/>
+        <file category="source"  name="WiFi/WizFi360/BufList/LinkList.c"/>
       </files>
     </component>
   </components>

diff --git a/DoxyGen/General/general.dxy b/DoxyGen/General/general.dxy
@@ -38,7 +38,7 @@ PROJECT_NAME           = "CMSIS-Driver Implementations"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "Version 2.4.1"
+PROJECT_NUMBER         = "Version 2.5.0"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/DoxyGen/General/src/introduction.txt b/DoxyGen/General/src/introduction.txt
@@ -44,6 +44,20 @@ Revision History
       <th>Version</th>
       <th>Description</th>
     </tr>
+    <tr>
+      <td>2.5.0</td>
+      <td>
+        - Added Espressif ESP32 WiFi driver
+        - Added Espressif ESP8266 WiFi driver
+        - Added Wiznet WizFi360 WiFi driver
+        - Updated Inventek ISM43362 WiFi driver (version 1.3.0):
+          - Fixed SocketClose functionality
+          - Fixed Activate function not to set password if OPEN security is used
+          - Updated Initialization function to handle unavailable reset pin
+          - Added debug of SPI traffic with Event Recorder
+          - Added CMSIS Driver Validation test results
+      </td>
+    </tr>    
     <tr>
       <td>2.4.1</td>
       <td>
@@ -157,6 +171,18 @@ http://www.st.com/content/ccc/resource/technical/document/data_brief/37/8e/14/c7
 
 The documentation for the Inventek ISM43362 can be found here: https://www.inventeksys.com/ism4336-m3g-l44-e-embedded-serial-to-wifi-module/
 
+\section driver_ESP32 ESP32
+
+The documentation for the Espressif ESP32 can be found here: https://www.espressif.com/en/products/hardware/esp-wroom-32/overview
+
+\section driver_ESP8266 ESP8266
+
+The documentation for the Espressif ESP8266 can be found here: https://www.espressif.com/en/products/hardware/esp8266ex/overview/
+
+\section driver_WizFi360 WizFi360
+
+The documentation for the WIZnet WizFi360 can be found here: https://www.wiznet.io/product-item/wizfi360/
+
 */
 
 /*=======0=========1=========2=========3=========4=========5=========6=========7=========8=========9=========0=========1====*/

diff --git a/README.md b/README.md
@@ -33,8 +33,11 @@ All drivers refer the API Interface header file defintions published in the CMSI
 ## SPI - MultiSlave wrapper for SPI CMSIS-Driver implementations
 - SPI_MultiSlave
 
-## WiFi - WiFi device drivers (compliant with CMSIS-Driver WiFi specification 1.0.0)
+## WiFi - WiFi device drivers
 - ISM43362
+- ESP32
+- ESP8266
+- WizFi360
 
 ## License
 Licensed under Apache 2.0 License.
diff --git a/Utilities/gen_pack.bat b/Utilities/gen_pack.bat
@@ -92,6 +92,9 @@ FOR %%A IN (%PACK_FOLDER_LIST%) DO (
   RMDIR /Q /S  %RELEASE_PATH%\%%A
 )
 
+:: remove intermediate Documentation directory from root
+RMDIR /Q /S ..\Documentation
+
 DEL ..\zip.log
 
 ECHO gen_pack.bat completed successfully