Skip to content

Commit

Permalink
Merge branch 'release/v4.4.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel Jäckle committed Sep 8, 2017
2 parents e506c24 + 40e6a91 commit f42be67
Show file tree
Hide file tree
Showing 159 changed files with 124,618 additions and 9,728 deletions.
1,046 changes: 987 additions & 59 deletions Keil/LoRaMote/LoRaMac/classA/LoRaMac.uvopt
View file

Large diffs are not rendered by default.

4,177 changes: 4,146 additions & 31 deletions Keil/LoRaMote/LoRaMac/classA/LoRaMac.uvproj
View file

Large diffs are not rendered by default.

1,046 changes: 987 additions & 59 deletions Keil/LoRaMote/LoRaMac/classB/LoRaMac.uvopt
View file

Large diffs are not rendered by default.

4,177 changes: 4,146 additions & 31 deletions Keil/LoRaMote/LoRaMac/classB/LoRaMac.uvproj
View file

Large diffs are not rendered by default.

1,046 changes: 987 additions & 59 deletions Keil/LoRaMote/LoRaMac/classC/LoRaMac.uvopt
View file

Large diffs are not rendered by default.

4,177 changes: 4,146 additions & 31 deletions Keil/LoRaMote/LoRaMac/classC/LoRaMac.uvproj
View file

Large diffs are not rendered by default.

442 changes: 137 additions & 305 deletions Keil/LoRaMote/ping-pong/Ping-Pong.uvopt
View file

Large diffs are not rendered by default.

104 changes: 52 additions & 52 deletions Keil/LoRaMote/ping-pong/Ping-Pong.uvproj
View file

Large diffs are not rendered by default.

527 changes: 157 additions & 370 deletions Keil/LoRaMote/rx-sensi/rx-sensi.uvopt
View file

Large diffs are not rendered by default.

184 changes: 52 additions & 132 deletions Keil/LoRaMote/rx-sensi/rx-sensi.uvproj
View file

Large diffs are not rendered by default.

212 changes: 64 additions & 148 deletions Keil/LoRaMote/tx-cw/tx-cw.uvopt
View file

Large diffs are not rendered by default.

52 changes: 26 additions & 26 deletions Keil/LoRaMote/tx-cw/tx-cw.uvproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@

<Targets>
<Target>
<TargetName>tx-cw-868</TargetName>
<TargetName>tx-cw-eu868</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
<pCCUsed>5060300::V5.06 update 3 (build 300)::ARMCC</pCCUsed>
<pCCUsed>5060422::V5.06 update 4 (build 422)::ARMCC</pCCUsed>
<TargetOption>
<TargetCommonOption>
<Device>STM32L151CB</Device>
Expand Down Expand Up @@ -45,14 +45,14 @@
<NotGenerated>0</NotGenerated>
<InvalidFlash>1</InvalidFlash>
</TargetStatus>
<OutputDirectory>.\obj\tx-cw-868\</OutputDirectory>
<OutputName>tx-cw</OutputName>
<OutputDirectory>.\obj\tx-cw-eu868\</OutputDirectory>
<OutputName>tx-cw-eu868</OutputName>
<CreateExecutable>1</CreateExecutable>
<CreateLib>0</CreateLib>
<CreateHexFile>1</CreateHexFile>
<DebugInformation>1</DebugInformation>
<BrowseInformation>1</BrowseInformation>
<ListingPath>.\lst\tx-cw-868\</ListingPath>
<ListingPath>.\lst\tx-cw-eu868\</ListingPath>
<HexFormatSelection>1</HexFormatSelection>
<Merge32K>0</Merge32K>
<CreateBatchFile>0</CreateBatchFile>
Expand Down Expand Up @@ -372,7 +372,7 @@
<v6Rtti>0</v6Rtti>
<VariousControls>
<MiscControls></MiscControls>
<Define>USE_HAL_DRIVER STM32L151xB USE_DEBUGGER USE_BAND_868</Define>
<Define>USE_HAL_DRIVER STM32L151xB USE_DEBUGGER REGION_EU868</Define>
<Undefine></Undefine>
<IncludePath>..\..\..\src;..\..\..\src\boards\LoRaMote;..\..\..\src\boards\LoRaMote\cmsis;..\..\..\src\boards\mcu\stm32;..\..\..\src\boards\mcu\stm32\cmsis;..\..\..\src\boards\mcu\stm32\STM32L1xx_HAL_Driver\inc;..\..\..\src\mac;..\..\..\src\peripherals;..\..\..\src\radio;..\..\..\src\system;..\..\..\src\system\crypto</IncludePath>
</VariousControls>
Expand Down Expand Up @@ -683,10 +683,10 @@
</Groups>
</Target>
<Target>
<TargetName>tx-cw-868-Bootloader</TargetName>
<TargetName>tx-cw-eu868-Bootloader</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
<pCCUsed>5060300::V5.06 update 3 (build 300)::ARMCC</pCCUsed>
<pCCUsed>5060422::V5.06 update 4 (build 422)::ARMCC</pCCUsed>
<TargetOption>
<TargetCommonOption>
<Device>STM32L151CB</Device>
Expand Down Expand Up @@ -721,14 +721,14 @@
<NotGenerated>0</NotGenerated>
<InvalidFlash>1</InvalidFlash>
</TargetStatus>
<OutputDirectory>.\obj\tx-cw-868-Bootloader\</OutputDirectory>
<OutputName>tx-cw</OutputName>
<OutputDirectory>.\obj\tx-cw-eu868-Bootloader\</OutputDirectory>
<OutputName>tx-cw-eu868</OutputName>
<CreateExecutable>1</CreateExecutable>
<CreateLib>0</CreateLib>
<CreateHexFile>1</CreateHexFile>
<DebugInformation>1</DebugInformation>
<BrowseInformation>1</BrowseInformation>
<ListingPath>.\lst\tx-cw-868-Bootloader\</ListingPath>
<ListingPath>.\lst\tx-cw-eu868-Bootloader\</ListingPath>
<HexFormatSelection>1</HexFormatSelection>
<Merge32K>0</Merge32K>
<CreateBatchFile>0</CreateBatchFile>
Expand Down Expand Up @@ -762,7 +762,7 @@
<nStopA1X>0</nStopA1X>
<nStopA2X>0</nStopA2X>
</AfterMake>
<SelectedForBatchBuild>0</SelectedForBatchBuild>
<SelectedForBatchBuild>1</SelectedForBatchBuild>
<SVCSIdString></SVCSIdString>
</TargetCommonOption>
<CommonProperty>
Expand Down Expand Up @@ -1048,7 +1048,7 @@
<v6Rtti>0</v6Rtti>
<VariousControls>
<MiscControls></MiscControls>
<Define>USE_HAL_DRIVER STM32L151xB USE_DEBUGGER USE_BAND_868 USE_BOOTLOADER</Define>
<Define>USE_HAL_DRIVER STM32L151xB USE_DEBUGGER REGION_EU868 USE_BOOTLOADER</Define>
<Undefine></Undefine>
<IncludePath>..\..\..\src;..\..\..\src\boards\LoRaMote;..\..\..\src\boards\LoRaMote\cmsis;..\..\..\src\boards\mcu\stm32;..\..\..\src\boards\mcu\stm32\cmsis;..\..\..\src\boards\mcu\stm32\STM32L1xx_HAL_Driver\inc;..\..\..\src\mac;..\..\..\src\peripherals;..\..\..\src\radio;..\..\..\src\system;..\..\..\src\system\crypto</IncludePath>
</VariousControls>
Expand Down Expand Up @@ -1359,10 +1359,10 @@
</Groups>
</Target>
<Target>
<TargetName>tx-cw-915</TargetName>
<TargetName>tx-cw-us915</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
<pCCUsed>5060300::V5.06 update 3 (build 300)::ARMCC</pCCUsed>
<pCCUsed>5060422::V5.06 update 4 (build 422)::ARMCC</pCCUsed>
<TargetOption>
<TargetCommonOption>
<Device>STM32L151CB</Device>
Expand Down Expand Up @@ -1397,14 +1397,14 @@
<NotGenerated>0</NotGenerated>
<InvalidFlash>1</InvalidFlash>
</TargetStatus>
<OutputDirectory>.\obj\tx-cw-915\</OutputDirectory>
<OutputName>tx-cw</OutputName>
<OutputDirectory>.\obj\tx-cw-us915\</OutputDirectory>
<OutputName>tx-cw-us915</OutputName>
<CreateExecutable>1</CreateExecutable>
<CreateLib>0</CreateLib>
<CreateHexFile>1</CreateHexFile>
<DebugInformation>1</DebugInformation>
<BrowseInformation>1</BrowseInformation>
<ListingPath>.\lst\tx-cw-915\</ListingPath>
<ListingPath>.\lst\tx-cw-us915\</ListingPath>
<HexFormatSelection>1</HexFormatSelection>
<Merge32K>0</Merge32K>
<CreateBatchFile>0</CreateBatchFile>
Expand Down Expand Up @@ -1724,7 +1724,7 @@
<v6Rtti>0</v6Rtti>
<VariousControls>
<MiscControls></MiscControls>
<Define>USE_HAL_DRIVER STM32L151xB USE_DEBUGGER USE_BAND_915</Define>
<Define>USE_HAL_DRIVER STM32L151xB USE_DEBUGGER REGION_US915</Define>
<Undefine></Undefine>
<IncludePath>..\..\..\src;..\..\..\src\boards\LoRaMote;..\..\..\src\boards\LoRaMote\cmsis;..\..\..\src\boards\mcu\stm32;..\..\..\src\boards\mcu\stm32\cmsis;..\..\..\src\boards\mcu\stm32\STM32L1xx_HAL_Driver\inc;..\..\..\src\mac;..\..\..\src\peripherals;..\..\..\src\radio;..\..\..\src\system;..\..\..\src\system\crypto</IncludePath>
</VariousControls>
Expand Down Expand Up @@ -2035,10 +2035,10 @@
</Groups>
</Target>
<Target>
<TargetName>tx-cw-915-Bootloader</TargetName>
<TargetName>tx-cw-us915-Bootloader</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
<pCCUsed>5060300::V5.06 update 3 (build 300)::ARMCC</pCCUsed>
<pCCUsed>5060422::V5.06 update 4 (build 422)::ARMCC</pCCUsed>
<TargetOption>
<TargetCommonOption>
<Device>STM32L151CB</Device>
Expand Down Expand Up @@ -2073,14 +2073,14 @@
<NotGenerated>0</NotGenerated>
<InvalidFlash>1</InvalidFlash>
</TargetStatus>
<OutputDirectory>.\obj\tx-cw-915-Bootloader\</OutputDirectory>
<OutputName>tx-cw</OutputName>
<OutputDirectory>.\obj\tx-cw-us915-Bootloader\</OutputDirectory>
<OutputName>tx-cw-us915</OutputName>
<CreateExecutable>1</CreateExecutable>
<CreateLib>0</CreateLib>
<CreateHexFile>1</CreateHexFile>
<DebugInformation>1</DebugInformation>
<BrowseInformation>1</BrowseInformation>
<ListingPath>.\lst\tx-cw-915-Bootloader\</ListingPath>
<ListingPath>.\lst\tx-cw-us915-Bootloader\</ListingPath>
<HexFormatSelection>1</HexFormatSelection>
<Merge32K>0</Merge32K>
<CreateBatchFile>0</CreateBatchFile>
Expand Down Expand Up @@ -2114,7 +2114,7 @@
<nStopA1X>0</nStopA1X>
<nStopA2X>0</nStopA2X>
</AfterMake>
<SelectedForBatchBuild>0</SelectedForBatchBuild>
<SelectedForBatchBuild>1</SelectedForBatchBuild>
<SVCSIdString></SVCSIdString>
</TargetCommonOption>
<CommonProperty>
Expand Down Expand Up @@ -2400,7 +2400,7 @@
<v6Rtti>0</v6Rtti>
<VariousControls>
<MiscControls></MiscControls>
<Define>USE_HAL_DRIVER STM32L151xB USE_DEBUGGER USE_BAND_915 USE_BOOTLOADER</Define>
<Define>USE_HAL_DRIVER STM32L151xB USE_DEBUGGER REGION_US915 USE_BOOTLOADER</Define>
<Undefine></Undefine>
<IncludePath>..\..\..\src;..\..\..\src\boards\LoRaMote;..\..\..\src\boards\LoRaMote\cmsis;..\..\..\src\boards\mcu\stm32;..\..\..\src\boards\mcu\stm32\cmsis;..\..\..\src\boards\mcu\stm32\STM32L1xx_HAL_Driver\inc;..\..\..\src\mac;..\..\..\src\peripherals;..\..\..\src\radio;..\..\..\src\system;..\..\..\src\system\crypto</IncludePath>
</VariousControls>
Expand Down
Loading

0 comments on commit f42be67

Please sign in to comment.