Merge branch 'develop'

Author: MaJerle

.gitignore

@@ -16,12 +16,14 @@
 *.sct
 *.MajerleT
 *.tjuln
+*.tilen
 *.dbgconf
 *.uvguix
 *.uvoptx
 *.__i
 *.i
 *.txt
+!docs/*.txt
 RTE/
 
 # IAR Settings  
@@ -73,6 +75,7 @@ bld/
 [Bb]in/
 [Oo]bj/
 [Ll]og/
+_build/
 
 # Visual Studio 2015/2017 cache/options directory
 .vs/
@@ -377,7 +380,6 @@ log_file.txt
 .metadata/
 .mxproject
 .settings/
-template/
 project.ioc
 mx.scratch
 *.tilen majerle

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "third_party/Embedded_Libs"]
-	path = third_party/Embedded_Libs
-	url = https://github.com/MaJerle/Embedded_Libs
+[submodule "third_party/embedded-libs"]
+	path = third_party/embedded-libs
+	url = https://github.com/MaJerle/embedded-libs

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Tilen Majerle
+Copyright (c) 2020 Tilen MAJERLE
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,17 +1,36 @@
-# GSM AT commands parser for RTOS systems
+# Lightweight GSM-AT parser
 
-GSM-AT Library commands parser is a generic, platform independent, library for communicating with SIMCOM based modules SIM800/SIM900 or SIM70xx. Module is written in C99 and is independent from used platform. Its main targets are embedded system devices like ARM Cortex-M, AVR, PIC and others, but can easily work under `Windows`, `Linux` or `MAC` environments.
+LwGSM is lightweight, platform independent, AT commands parser, targeting for communicion with SIMCOM based modules SIM800/SIM900 or SIM70xx. Module is written in C99 and is independent from used platform. Its main targets are embedded system devices like ARM Cortex-M, AVR, PIC and others, but can easily work under `Windows`, `Linux` or `MAC` environments.
 
-## Features
-
-- Supports `SIM800/SIM900 (2G)` and `SIM7000/SIM7020 (NB-Iot LTE)` modules
-
-## Documentation
+<h3>Read first: <a href="https://docs.majerle.eu/projects/lwgsm/">Documentation</a></h3>
 
-Full API documentation with description and examples is available and is regulary updated with the source changes
-
-http://majerle.eu/documentation/gsm_at/html/index.html
-
-## Contribution
+## Features
 
-I invite you to give feature request or report a bug. Please use issues tracker.
+* Supports ``SIM800/SIM900 (2G)`` and ``SIM7000/SIM7020 (NB-Iot LTE)`` modules
+* Platform independent and very easy to port
+    * Development of library under Win32 platform
+    * Provided examples for ARM Cortex-M or Win32 platforms
+* Written in C language (C99)
+* Allows different configurations to optimize user requirements
+* Supports implementation with operating systems with advanced inter-thread communications
+    * Currently only OS mode is supported
+    * 2 different threads handling user data and received data
+        * First (producer) thread (collects user commands from user threads and starts the command processing)
+        * Second (process) thread reads the data from GSM device and does the job accordingly
+* Allows sequential API for connections in client and server mode
+* Includes several applications built on top of library:
+    * MQTT client for MQTT connection
+* User friendly MIT license
+
+## Contribute
+
+Fresh contributions are always welcome. Simple instructions to proceed::
+
+1. Fork Github repository
+2. Respect [C style & coding rules](https://github.com/MaJerle/c-code-style) used by the library
+3. Create a pull request to develop branch with new features or bug fixes
+
+Alternatively you may:
+
+1. Report a bug
+2. Ask for a feature request

dev/VisualStudio/gsm_config.h

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.28803.452
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gsm_at_lib_dev", "gsm_at_lib_dev.vcxproj", "{87E5EEE1-1C99-458B-A893-DDDB00775631}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lwgsm_dev", "lwgsm_dev.vcxproj", "{87E5EEE1-1C99-458B-A893-DDDB00775631}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,8 +13,8 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{87E5EEE1-1C99-458B-A893-DDDB00775631}.Debug|x64.ActiveCfg = Debug|Win32
-		{87E5EEE1-1C99-458B-A893-DDDB00775631}.Debug|x64.Build.0 = Debug|Win32
+		{87E5EEE1-1C99-458B-A893-DDDB00775631}.Debug|x64.ActiveCfg = Debug|x64
+		{87E5EEE1-1C99-458B-A893-DDDB00775631}.Debug|x64.Build.0 = Debug|x64
 		{87E5EEE1-1C99-458B-A893-DDDB00775631}.Debug|x86.ActiveCfg = Debug|Win32
 		{87E5EEE1-1C99-458B-A893-DDDB00775631}.Debug|x86.Build.0 = Debug|Win32
 		{87E5EEE1-1C99-458B-A893-DDDB00775631}.Release|x64.ActiveCfg = Release|x64

dev/VisualStudio/gsm_at_lib_dev.sln renamed to dev/VisualStudio/lwgsm_dev.sln

@@ -22,7 +22,7 @@
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{87E5EEE1-1C99-458B-A893-DDDB00775631}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <RootNamgsmace>gsm_dev_os</RootNamgsmace>
+    <RootNamgsmace>lwgsm_dev_os</RootNamgsmace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -72,17 +72,19 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>.;..\..\snippets\include;..\..\GSM_AT_Lib\src\include;..\..\..\lwmem\lwmem\src\include;$(IncludePath)</IncludePath>
+    <IncludePath>.;..\..\lwgsm\src\include;..\..\lwgsm\src\include\system\port\win32;..\..\snippets\include;..\..\..\lwmem\lwmem\src\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>.;..\..\snippets\include;..\..\GSM_AT_Lib\src\include;$(IncludePath)</IncludePath>
+    <IncludePath>.;..\..\lwgsm\src\include;..\..\lwgsm\src\include\system\port\win32;..\..\snippets\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <IncludePath>.;..\..\lwgsm\src\include;..\..\lwgsm\src\include\system\port\win32;..\..\snippets\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
+    <IncludePath>.;..\..\lwgsm\src\include;..\..\lwgsm\src\include\system\port\win32;..\..\snippets\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -142,42 +144,47 @@
   <ItemGroup>
     <ClCompile Include="..\..\..\lwmem\lwmem\src\lwmem\lwmem.c" />
     <ClCompile Include="..\..\..\lwmem\lwmem\src\system\lwmem_sys_win32.c" />
-    <ClCompile Include="..\..\GSM_AT_Lib\src\api\gsm_netconn.c" />
-    <ClCompile Include="..\..\GSM_AT_Lib\src\api\gsm_network_api.c" />
-    <ClCompile Include="..\..\GSM_AT_Lib\src\apps\mqtt\gsm_mqtt_client.c" />
-    <ClCompile Include="..\..\GSM_AT_Lib\src\apps\mqtt\gsm_mqtt_client_api.c" />
-    <ClCompile Include="..\..\GSM_AT_Lib\src\apps\mqtt\gsm_mqtt_client_evt.c" />
-    <ClCompile Include="..\..\GSM_AT_Lib\src\gsm\gsm.c" />
-    <ClCompile Include="..\..\GSM_AT_Lib\src\gsm\gsm_buff.c" />
-    <ClCompile Include="..\..\GSM_AT_Lib\src\gsm\gsm_call.c" />
-    <ClCompile Include="..\..\GSM_AT_Lib\src\gsm\gsm_conn.c" />
-    <ClCompile Include="..\..\GSM_AT_Lib\src\gsm\gsm_debug.c" />
-    <ClCompile Include="..\..\GSM_AT_Lib\src\gsm\gsm_device_info.c" />
-    <ClCompile Include="..\..\GSM_AT_Lib\src\gsm\gsm_evt.c" />
-    <ClCompile Include="..\..\GSM_AT_Lib\src\gsm\gsm_http.c" />
-    <ClCompile Include="..\..\GSM_AT_Lib\src\gsm\gsm_input.c" />
-    <ClCompile Include="..\..\GSM_AT_Lib\src\gsm\gsm_int.c" />
-    <ClCompile Include="..\..\GSM_AT_Lib\src\gsm\gsm_mem.c" />
-    <ClCompile Include="..\..\GSM_AT_Lib\src\gsm\gsm_network.c" />
-    <ClCompile Include="..\..\GSM_AT_Lib\src\gsm\gsm_operator.c" />
-    <ClCompile Include="..\..\GSM_AT_Lib\src\gsm\gsm_parser.c" />
-    <ClCompile Include="..\..\GSM_AT_Lib\src\gsm\gsm_pbuf.c" />
-    <ClCompile Include="..\..\GSM_AT_Lib\src\gsm\gsm_phonebook.c" />
-    <ClCompile Include="..\..\GSM_AT_Lib\src\gsm\gsm_sim.c" />
-    <ClCompile Include="..\..\GSM_AT_Lib\src\gsm\gsm_sms.c" />
-    <ClCompile Include="..\..\GSM_AT_Lib\src\gsm\gsm_threads.c" />
-    <ClCompile Include="..\..\GSM_AT_Lib\src\gsm\gsm_timeout.c" />
-    <ClCompile Include="..\..\GSM_AT_Lib\src\gsm\gsm_unicode.c" />
-    <ClCompile Include="..\..\GSM_AT_Lib\src\gsm\gsm_ussd.c" />
-    <ClCompile Include="..\..\GSM_AT_Lib\src\gsm\gsm_utils.c" />
-    <ClCompile Include="..\..\GSM_AT_Lib\src\system\gsm_ll_win32.c" />
-    <ClCompile Include="..\..\GSM_AT_Lib\src\system\gsm_mem_lwmem.c" />
-    <ClCompile Include="..\..\GSM_AT_Lib\src\system\gsm_sys_win32.c" />
+    <ClCompile Include="..\..\lwgsm\src\api\lwgsm_netconn.c" />
+    <ClCompile Include="..\..\lwgsm\src\api\lwgsm_network_api.c" />
+    <ClCompile Include="..\..\lwgsm\src\apps\mqtt\lwgsm_mqtt_client.c" />
+    <ClCompile Include="..\..\lwgsm\src\apps\mqtt\lwgsm_mqtt_client_api.c" />
+    <ClCompile Include="..\..\lwgsm\src\apps\mqtt\lwgsm_mqtt_client_evt.c" />
+    <ClCompile Include="..\..\lwgsm\src\lwgsm\lwgsm.c" />
+    <ClCompile Include="..\..\lwgsm\src\lwgsm\lwgsm_buff.c" />
+    <ClCompile Include="..\..\lwgsm\src\lwgsm\lwgsm_call.c" />
+    <ClCompile Include="..\..\lwgsm\src\lwgsm\lwgsm_conn.c" />
+    <ClCompile Include="..\..\lwgsm\src\lwgsm\lwgsm_debug.c" />
+    <ClCompile Include="..\..\lwgsm\src\lwgsm\lwgsm_device_info.c" />
+    <ClCompile Include="..\..\lwgsm\src\lwgsm\lwgsm_evt.c" />
+    <ClCompile Include="..\..\lwgsm\src\lwgsm\lwgsm_http.c" />
+    <ClCompile Include="..\..\lwgsm\src\lwgsm\lwgsm_input.c" />
+    <ClCompile Include="..\..\lwgsm\src\lwgsm\lwgsm_int.c" />
+    <ClCompile Include="..\..\lwgsm\src\lwgsm\lwgsm_mem.c" />
+    <ClCompile Include="..\..\lwgsm\src\lwgsm\lwgsm_network.c" />
+    <ClCompile Include="..\..\lwgsm\src\lwgsm\lwgsm_operator.c" />
+    <ClCompile Include="..\..\lwgsm\src\lwgsm\lwgsm_parser.c" />
+    <ClCompile Include="..\..\lwgsm\src\lwgsm\lwgsm_pbuf.c" />
+    <ClCompile Include="..\..\lwgsm\src\lwgsm\lwgsm_phonebook.c" />
+    <ClCompile Include="..\..\lwgsm\src\lwgsm\lwgsm_sim.c" />
+    <ClCompile Include="..\..\lwgsm\src\lwgsm\lwgsm_sms.c" />
+    <ClCompile Include="..\..\lwgsm\src\lwgsm\lwgsm_threads.c" />
+    <ClCompile Include="..\..\lwgsm\src\lwgsm\lwgsm_timeout.c" />
+    <ClCompile Include="..\..\lwgsm\src\lwgsm\lwgsm_unicode.c" />
+    <ClCompile Include="..\..\lwgsm\src\lwgsm\lwgsm_ussd.c" />
+    <ClCompile Include="..\..\lwgsm\src\lwgsm\lwgsm_utils.c" />
+    <ClCompile Include="..\..\lwgsm\src\system\lwgsm_ll_win32.c" />
+    <ClCompile Include="..\..\lwgsm\src\system\lwgsm_mem_lwmem.c" />
+    <ClCompile Include="..\..\lwgsm\src\system\lwgsm_sys_win32.c" />
+    <ClCompile Include="..\..\snippets\call.c" />
+    <ClCompile Include="..\..\snippets\call_sms.c" />
+    <ClCompile Include="..\..\snippets\client.c" />
+    <ClCompile Include="..\..\snippets\device_info.c" />
     <ClCompile Include="..\..\snippets\mqtt_client_api.c" />
     <ClCompile Include="..\..\snippets\netconn_client.c" />
     <ClCompile Include="..\..\snippets\network_utils.c" />
     <ClCompile Include="..\..\snippets\sim_manager.c" />
     <ClCompile Include="..\..\snippets\sms_send_receive.c" />
+    <ClCompile Include="..\..\snippets\sms_send_receive_thread.c" />
     <ClCompile Include="main.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />