Craete project cellular_config file

Craete project cellular_config.h

Author: chinglee-iot

lib/cellular

@@ -126,7 +126,7 @@
     <ClInclude Include="..\..\lib\mbedtls\library\psa_crypto_slot_management.h" />
     <ClInclude Include="..\..\lib\mbedtls\library\psa_crypto_storage.h" />
     <ClInclude Include="..\..\lib\mbedtls\library\ssl_invasive.h" />
-    <ClInclude Include="..\..\source\cellular\cellular_config.h" />
+    <ClInclude Include="..\..\source\cellular\bg96\cellular_config.h" />
     <ClInclude Include="..\..\source\cellular\cellular_platform.h" />
     <ClInclude Include="..\..\source\coreMQTT\core_mqtt_config.h" />
     <ClInclude Include="..\..\source\coreMQTT\sockets_wrapper.h" />
@@ -306,7 +306,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.\..\..\lib\cellular\include;.\..\..\lib\cellular\common\include;.\..\..\lib\cellular\common\include\private;.\..\..\lib\FreeRTOS\portable\MSVC-MingW;.\..\..\lib\FreeRTOS\include;.\..\..\lib\coreMQTT\source\portable;.\..\..\lib\coreMQTT\source\include;.\..\..\lib\coreMQTT\source\interface;.\..\..\lib\mbedtls\include;.\..\..\source;.\..\..\source\coreMQTT;.\..\..\source\FreeRTOS;.\..\..\source\mbedtls;.\..\..\source\cellular;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\..\..\lib\cellular\include;.\..\..\lib\cellular\common\include;.\..\..\lib\cellular\common\include\private;.\..\..\lib\FreeRTOS\portable\MSVC-MingW;.\..\..\lib\FreeRTOS\include;.\..\..\lib\coreMQTT\source\portable;.\..\..\lib\coreMQTT\source\include;.\..\..\lib\coreMQTT\source\interface;.\..\..\lib\mbedtls\include;.\..\..\source;.\..\..\source\coreMQTT;.\..\..\source\FreeRTOS;.\..\..\source\mbedtls;.\..\..\source\cellular;.\..\..\source\cellular\bg96;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>MBEDTLS_CONFIG_FILE="mbedtls_config.h";WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

projects/bg96_mqtt_mutual_auth_demo/WIN32.vcxproj

@@ -1,18 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="..\..\lib\cellular\common\include">
-      <UniqueIdentifier>{20285887-a978-4285-8bcf-9424eaaf19d4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="..\..\lib\cellular\common\src">
-      <UniqueIdentifier>{1d3a8210-7a8e-4beb-9616-f2894df32bf6}</UniqueIdentifier>
-    </Filter>
     <Filter Include="..\..\lib\cellular\common\include\private">
       <UniqueIdentifier>{53878999-cbc4-4041-aded-aa0a519bb66a}</UniqueIdentifier>
     </Filter>
-    <Filter Include="..\..\lib\cellular\modules\bg96">
-      <UniqueIdentifier>{e06971d3-76bc-4697-9cc8-368b097e1532}</UniqueIdentifier>
-    </Filter>
     <Filter Include="lib">
       <UniqueIdentifier>{525fb155-a1a7-46a1-b777-d3fcdacc7277}</UniqueIdentifier>
     </Filter>
@@ -465,10 +456,10 @@
     <ClInclude Include="..\..\source\FreeRTOS\FreeRTOSConfig.h">
       <Filter>source\FreeRTOS</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\cellular\cellular_config.h">
+    <ClInclude Include="..\..\source\cellular\cellular_platform.h">
       <Filter>source\cellular</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\cellular\cellular_platform.h">
+    <ClInclude Include="..\..\source\cellular\bg96\cellular_config.h">
       <Filter>source\cellular</Filter>
     </ClInclude>
   </ItemGroup>

projects/bg96_mqtt_mutual_auth_demo/WIN32.vcxproj.filters

@@ -126,8 +126,8 @@
     <ClInclude Include="..\..\lib\mbedtls\library\psa_crypto_slot_management.h" />
     <ClInclude Include="..\..\lib\mbedtls\library\psa_crypto_storage.h" />
     <ClInclude Include="..\..\lib\mbedtls\library\ssl_invasive.h" />
-    <ClInclude Include="..\..\source\cellular\cellular_config.h" />
     <ClInclude Include="..\..\source\cellular\cellular_platform.h" />
+    <ClInclude Include="..\..\source\cellular\hl7802\cellular_config.h" />
     <ClInclude Include="..\..\source\coreMQTT\core_mqtt_config.h" />
     <ClInclude Include="..\..\source\coreMQTT\sockets_wrapper.h" />
     <ClInclude Include="..\..\source\coreMQTT\using_mbedtls.h" />
@@ -306,8 +306,8 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.\..\..\lib\cellular\include;.\..\..\lib\cellular\common\include;.\..\..\lib\cellular\common\include\private;.\..\..\lib\FreeRTOS\portable\MSVC-MingW;.\..\..\lib\FreeRTOS\include;.\..\..\lib\coreMQTT\source\portable;.\..\..\lib\coreMQTT\source\include;.\..\..\lib\coreMQTT\source\interface;.\..\..\lib\mbedtls\include;.\..\..\source;.\..\..\source\coreMQTT;.\..\..\source\mbedtls;.\..\..\source\cellular;.\..\..\source\FreeRTOS;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>MBEDTLS_CONFIG_FILE="mbedtls_config.h";WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;CELLULAR_MODEM_NO_GSM_NETWORK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>.\..\..\lib\cellular\include;.\..\..\lib\cellular\common\include;.\..\..\lib\cellular\common\include\private;.\..\..\lib\FreeRTOS\portable\MSVC-MingW;.\..\..\lib\FreeRTOS\include;.\..\..\lib\coreMQTT\source\portable;.\..\..\lib\coreMQTT\source\include;.\..\..\lib\coreMQTT\source\interface;.\..\..\lib\mbedtls\include;.\..\..\source;.\..\..\source\coreMQTT;.\..\..\source\mbedtls;.\..\..\source\cellular;.\..\..\source\FreeRTOS;.\..\..\source\cellular\hl7802;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MBEDTLS_CONFIG_FILE="mbedtls_config.h";WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

projects/hl7802_mqtt_mutual_auth_demo/WIN32.vcxproj

@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="..\..\lib\cellular\common\include\private">
-      <UniqueIdentifier>{53878999-cbc4-4041-aded-aa0a519bb66a}</UniqueIdentifier>
-    </Filter>
     <Filter Include="lib">
       <UniqueIdentifier>{525fb155-a1a7-46a1-b777-d3fcdacc7277}</UniqueIdentifier>
     </Filter>
@@ -423,9 +420,6 @@
     <ClInclude Include="..\..\lib\cellular\modules\hl7802\cellular_hl7802.h">
       <Filter>lib\cellular\modules\hl7802</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\cellular\cellular_config.h">
-      <Filter>source\cellular</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\source\cellular\cellular_platform.h">
       <Filter>source\cellular</Filter>
     </ClInclude>
@@ -462,6 +456,9 @@
     <ClInclude Include="..\..\source\logging_stack.h">
       <Filter>source</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\source\cellular\hl7802\cellular_config.h">
+      <Filter>source\cellular</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\lib\cellular\common\src\cellular_common.c">

projects/hl7802_mqtt_mutual_auth_demo/WIN32.vcxproj.filters

@@ -126,8 +126,8 @@
     <ClInclude Include="..\..\lib\mbedtls\library\psa_crypto_slot_management.h" />
     <ClInclude Include="..\..\lib\mbedtls\library\psa_crypto_storage.h" />
     <ClInclude Include="..\..\lib\mbedtls\library\ssl_invasive.h" />
-    <ClInclude Include="..\..\source\cellular\cellular_config.h" />
     <ClInclude Include="..\..\source\cellular\cellular_platform.h" />
+    <ClInclude Include="..\..\source\cellular\sara_r4\cellular_config.h" />
     <ClInclude Include="..\..\source\coreMQTT\core_mqtt_config.h" />
     <ClInclude Include="..\..\source\coreMQTT\sockets_wrapper.h" />
     <ClInclude Include="..\..\source\coreMQTT\using_mbedtls.h" />
@@ -306,8 +306,8 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.\..\..\lib\cellular\include;.\..\..\lib\cellular\common\include;.\..\..\lib\cellular\common\include\private;.\..\..\lib\FreeRTOS\portable\MSVC-MingW;.\..\..\lib\FreeRTOS\include;.\..\..\lib\coreMQTT\source\portable;.\..\..\lib\coreMQTT\source\include;.\..\..\lib\coreMQTT\source\interface;.\..\..\lib\mbedtls\include;..\..\source;..\..\source\cellular;..\..\source\coreMQTT;..\..\source\FreeRTOS;..\..\source\mbedtls;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>MBEDTLS_CONFIG_FILE="mbedtls_config.h";WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;CELLULAR_MAX_SEND_DATA_LEN=1024;CELLULAR_MAX_RECV_DATA_LEN=1024;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>.\..\..\lib\cellular\include;.\..\..\lib\cellular\common\include;.\..\..\lib\cellular\common\include\private;.\..\..\lib\FreeRTOS\portable\MSVC-MingW;.\..\..\lib\FreeRTOS\include;.\..\..\lib\coreMQTT\source\portable;.\..\..\lib\coreMQTT\source\include;.\..\..\lib\coreMQTT\source\interface;.\..\..\lib\mbedtls\include;..\..\source;..\..\source\cellular\sara_r4;..\..\source\cellular;..\..\source\coreMQTT;..\..\source\FreeRTOS;..\..\source\mbedtls;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>MBEDTLS_CONFIG_FILE="mbedtls_config.h";WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

projects/sara_r4_mqtt_mutual_auth_demo/WIN32.vcxproj

@@ -453,10 +453,10 @@
     <ClInclude Include="..\..\source\FreeRTOS\FreeRTOSConfig.h">
       <Filter>source\FreeRTOS</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\cellular\cellular_config.h">
+    <ClInclude Include="..\..\source\cellular\cellular_platform.h">
       <Filter>source\cellular</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\cellular\cellular_platform.h">
+    <ClInclude Include="..\..\source\cellular\sara_r4\cellular_config.h">
       <Filter>source\cellular</Filter>
     </ClInclude>
   </ItemGroup>

projects/sara_r4_mqtt_mutual_auth_demo/WIN32.vcxproj.filters

@@ -0,0 +1,74 @@
+/*
+ * Amazon FreeRTOS Cellular Preview Release
+ * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
+ *
+ * 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.
+ *
+ * http://aws.amazon.com/freertos
+ * http://www.FreeRTOS.org
+ */
+
+/**
+ * @file cellular_config.h
+ * @brief cellular config options.
+ */
+
+#ifndef __CELLULAR_CONFIG_H__
+#define __CELLULAR_CONFIG_H__
+
+/* This is a project specific file and is used to override config values defined
+ * in cellular_config_defaults.h. */
+
+/**
+ * Cellular comm interface make use of COM port on computer to communicate with
+ * cellular module on windows simulator, for example "COM5".
+ * #define CELLULAR_COMM_INTERFACE_PORT                   "...insert here..."
+ */
+
+/*
+ * Default APN for network registartion.
+ * #define CELLULAR_APN                    "...insert here..."
+ */
+
+/*
+ * PDN context id for cellular network.
+ */
+#define CELLULAR_PDN_CONTEXT_ID                         ( CELLULAR_PDN_CONTEXT_ID_MIN )
+
+/*
+ * PDN connect timeout for network registration.
+ */
+#define CELLULAR_PDN_CONNECT_TIMEOUT                    ( 100000UL )
+
+/*
+ * Overwrite default config for different cellular modules.
+ */
+/*
+ * GetHostByName API is not used in the demo. IP address is used to store the hostname.
+ * The value should be longer than the length of democonfigMQTT_BROKER_ENDPOINT in demo_config.h.
+ */
+#define CELLULAR_IP_ADDRESS_MAX_SIZE                    ( 64U )
+
+/* 
+ * GSM network is not supported in HL7800.
+ * Add this config to suppress Error message if you are using HL7800.
+ * #define CELLULAR_MODEM_NO_GSM_NETWORK
+ */
+#define CELLULAR_MODEM_NO_GSM_NETWORK
+
+#endif /* __CELLULAR_CONFIG_H__ */

source/cellular/cellular_config.h source/cellular/bg96/cellular_config.hsource/cellular/cellular_config.h renamed to source/cellular/bg96/cellular_config.h

@@ -0,0 +1,111 @@
+/*
+ * Amazon FreeRTOS Cellular Preview Release
+ * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
+ *
+ * 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.
+ *
+ * http://aws.amazon.com/freertos
+ * http://www.FreeRTOS.org
+ */
+
+/**
+ * @file cellular_config.h
+ * @brief cellular config options.
+ */
+
+#ifndef __CELLULAR_CONFIG_H__
+#define __CELLULAR_CONFIG_H__
+
+/* This is a project specific file and is used to override config values defined
+ * in cellular_config_defaults.h. */
+
+/**
+ * Cellular comm interface make use of COM port on computer to communicate with
+ * cellular module on windows simulator, for example "COM5".
+ * #define CELLULAR_COMM_INTERFACE_PORT                   "...insert here..."
+ */
+
+/*
+ * Default APN for network registartion.
+ * #define CELLULAR_APN                    "...insert here..."
+ */
+
+/*
+ * PDN context id for cellular network.
+ */
+#define CELLULAR_PDN_CONTEXT_ID         ( CELLULAR_PDN_CONTEXT_ID_MIN )
+
+/*
+ * PDN connect timeout for network registration.
+ */
+#define CELLULAR_PDN_CONNECT_TIMEOUT    ( 100000UL )
+
+/*
+ * Overwrite default config for different cellular modules.
+ */
+/*
+ * GetHostByName API is not used in the demo. IP address is used to store the hostname.
+ * The value should be longer than the length of democonfigMQTT_BROKER_ENDPOINT in demo_config.h.
+ */
+#define CELLULAR_IP_ADDRESS_MAX_SIZE                    ( 64U )
+
+/*
+ * Sara R4 maximum socket send buffer size is 1024U.
+ */
+#define CELLULAR_MAX_SEND_DATA_LEN                      ( 1024U )
+
+/*
+ * Sara R4 maximum socket receive buffer size is 1024U.
+ */
+#define CELLULAR_MAX_RECV_DATA_LEN                      ( 1024U )
+
+/*
+ * Sara R4 supports set mobile network operators commands.
+ * Set the mobile network operators of your environment.
+ * Reference https://www.u-blox.com/sites/default/files/SARA-R4_ATCommands_%28UBX-17003787%29.pdf
+ * 0: undefined / regulatory
+ * 1: SIM ICCID/IMSI select
+ * 2: AT&T
+ * 3: Verizon
+ * 4: Telstra
+ * 5: T-Mobile US
+ * 6: China Telecom
+ * 8: Sprint
+ * 19: Vodafone
+ * 20: NTT DoCoMo
+ * 21: Telus
+ * 28: SoftBank
+ * 31: Deutsche Telekom
+ * 32: US Cellular
+ * 33: VIVO
+ * 39: SKT
+ * 44: Claro Brasil
+ * 45: TIM Brasil
+ * 46: Orange France
+ * 90: global
+ * 100: standard Europe
+ * Notes : 
+ * The standard Europe profile should be used as the basis for all other MNOs in
+ * Europe outside of Vodafoneand Deutsche Telekom. However, there may be changes
+ * that need to be applied to the module for properoperation with any given European
+ * MNO such as attach type, RAT preference, band selection, etc. Pleaseconsult with
+ * the preferred network provider.
+ * #define CELLULAR_CONFIG_SARA_R4_SET_MNO_PROFILE         ( ...insert here... )
+ */
+
+#endif /* __CELLULAR_CONFIG_H__ */