Skip to content
This repository has been archived by the owner on Sep 19, 2024. It is now read-only.

Commit

Permalink
### V 1.1.2 ###
Browse files Browse the repository at this point in the history
-	Add STM32WB SMPS (switched-mode power supply) configuration in application and bootloader
  • Loading branch information
bboulet committed Oct 23, 2020
1 parent d5f7413 commit 13c4e79
Show file tree
Hide file tree
Showing 39 changed files with 34,486 additions and 33,113 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ To build the host softwares, proceed as follow:

## 3. Changelog

### V 1.1.2 ###

- Add STM32WB SMPS (switched-mode power supply) configuration in application and bootloader

### V 1.1.1 ###

- Remove infinite loop in HardFault Handler / Error Handler / Hal mcu panic and replaced by hal_mcu_reset
Expand Down
Binary file modified bin/BLE_Ota.bin
Binary file not shown.
Binary file modified bin/lr1110_modem_tracker_sdk.bin
Binary file not shown.
6 changes: 3 additions & 3 deletions bin/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"url": "https://api.github.com/repos/Lora-net/radio_firmware_images/contents/lr1110/modem/lr1110_modem_1.0.7.h",
"hash": "e8244951e68f80b92a1f8f2bb852ca10"},
"tkr_app": {
"version": "1.01.01",
"version": "1.01.02",
"url": "https://api.github.com/repos/Lora-net/lora_edge_tracker_ref_design/contents/bin/lr1110_modem_tracker_sdk.bin",
"hash": "bf974547e39549044cee8ec92b6092ab"}
}
"hash": "48ca2d7733a4d954d7c0db54c2551579"}
}
1,994 changes: 999 additions & 995 deletions hex_merged/lr1110_modem_loramac_EU868.hex

Large diffs are not rendered by default.

1,990 changes: 997 additions & 993 deletions hex_merged/lr1110_modem_loramac_US915.hex

Large diffs are not rendered by default.

3,718 changes: 1,861 additions & 1,857 deletions hex_merged/lr1110_modem_tracker_EU868.hex

Large diffs are not rendered by default.

3,718 changes: 1,861 additions & 1,857 deletions hex_merged/lr1110_modem_tracker_US915.hex

Large diffs are not rendered by default.

1,598 changes: 801 additions & 797 deletions hex_merged/lr1110_modem_tracker_tx_continuous.hex

Large diffs are not rendered by default.

16,986 changes: 8,495 additions & 8,491 deletions hex_merged/lr1110_modem_tracker_update_modem_to_modem.hex

Large diffs are not rendered by default.

16,790 changes: 8,397 additions & 8,393 deletions hex_merged/lr1110_modem_tracker_update_modem_to_trx.hex

Large diffs are not rendered by default.

16,980 changes: 8,492 additions & 8,488 deletions hex_merged/lr1110_modem_tracker_update_trx_to_modem.hex

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions smtc_tracker_app/Inc/smtc_hal/smtc_hal_mcu.h
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,13 @@ uint16_t hal_mcu_get_vref_level( void );
*/
void hal_mcu_system_clock_forward_LSE( bool enable );

/*!
* \brief Activate the SMPS
*
* \param enable Enable or disable the SMPS
*/
void hal_mcu_smps_enable( bool enable );

/*!
* \brief Prints debug trace
*
Expand Down
68 changes: 64 additions & 4 deletions smtc_tracker_app/MDK-ARM/lr1110_modem_tracker_sdk.uvoptx
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
<Ww>
<count>0</count>
<WinNumber>1</WinNumber>
<ItemText>i</ItemText>
<ItemText>i,0x0A</ItemText>
</Ww>
<Ww>
<count>1</count>
Expand All @@ -170,6 +170,66 @@
<WinNumber>1</WinNumber>
<ItemText>internal_buffer</ItemText>
</Ww>
<Ww>
<count>4</count>
<WinNumber>1</WinNumber>
<ItemText>tracker_ctx.lorawan_pin</ItemText>
</Ww>
<Ww>
<count>5</count>
<WinNumber>1</WinNumber>
<ItemText>tracker_ctx.wifi_settings</ItemText>
</Ww>
<Ww>
<count>6</count>
<WinNumber>1</WinNumber>
<ItemText>tracker_ctx.wifi_settings</ItemText>
</Ww>
<Ww>
<count>7</count>
<WinNumber>1</WinNumber>
<ItemText>index_page,0x0A</ItemText>
</Ww>
<Ww>
<count>8</count>
<WinNumber>1</WinNumber>
<ItemText>index_page,0x0A</ItemText>
</Ww>
<Ww>
<count>9</count>
<WinNumber>1</WinNumber>
<ItemText>flash_user_start_addr</ItemText>
</Ww>
<Ww>
<count>10</count>
<WinNumber>1</WinNumber>
<ItemText>tracker_ctx</ItemText>
</Ww>
<Ww>
<count>11</count>
<WinNumber>1</WinNumber>
<ItemText>smps_coarse_engi_trim</ItemText>
</Ww>
<Ww>
<count>12</count>
<WinNumber>1</WinNumber>
<ItemText>smps_fine_engi_trim</ItemText>
</Ww>
<Ww>
<count>13</count>
<WinNumber>1</WinNumber>
<ItemText>smpsvos</ItemText>
</Ww>
<Ww>
<count>14</count>
<WinNumber>1</WinNumber>
<ItemText>OutputVoltageLevel</ItemText>
</Ww>
<Ww>
<count>15</count>
<WinNumber>1</WinNumber>
<ItemText>OutputVoltageLevelTrimmed</ItemText>
</Ww>
</WatchWindow1>
<WatchWindow2>
<Ww>
Expand Down Expand Up @@ -3799,7 +3859,7 @@

<Group>
<GroupName>Drivers/BSP/Components</GroupName>
<tvExp>0</tvExp>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
Expand Down Expand Up @@ -3899,7 +3959,7 @@

<Group>
<GroupName>Wi-Fi Scan</GroupName>
<tvExp>0</tvExp>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
Expand Down Expand Up @@ -3939,7 +3999,7 @@

<Group>
<GroupName>lr1110 modem drivers</GroupName>
<tvExp>0</tvExp>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
Expand Down
2 changes: 0 additions & 2 deletions smtc_tracker_app/README.md

This file was deleted.

2 changes: 1 addition & 1 deletion smtc_tracker_app/Src/apps/Tracker/main_tracker.h
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ extern "C" {
*/
#define TRACKER_MAJOR_APP_VERSION 1
#define TRACKER_MINOR_APP_VERSION 1
#define TRACKER_SUB_MINOR_APP_VERSION 1
#define TRACKER_SUB_MINOR_APP_VERSION 2

#define TRACKER_PCB_HW_NUMBER 595
#define TRACKER_MAJOR_PCB_HW_VERSION 1
Expand Down
4 changes: 2 additions & 2 deletions smtc_tracker_app/Src/radio/gnss/gnss_scan.c
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,8 @@ gnss_scan_result_t gnss_scan_execute( const void* context )

if( scan_type == AUTONOMOUS_MODE )
{
modem_response_code = lr1110_modem_gnss_scan_autonomous_md( context, gnss.settings.input_paramaters,
gnss.settings.nb_sat );
modem_response_code = lr1110_modem_gnss_scan_autonomous_md( context, gnss.settings.search_mode,
gnss.settings.input_paramaters, gnss.settings.nb_sat );
}
else
{
Expand Down
20 changes: 10 additions & 10 deletions smtc_tracker_app/Src/radio/lr1110_modem/src/lr1110_bootloader.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
* \file lr1110_bootloader.c
* @file lr1110_bootloader.c
*
* \brief Bootloader driver implementation for LR1110
* @brief Bootloader driver implementation for LR1110
*
* Revised BSD License
* Copyright Semtech Corporation 2020. All rights reserved.
Expand All @@ -20,8 +20,8 @@
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL SEMTECH S.A. BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* ARE DISCLAIMED. IN NO EVENT SHALL SEMTECH CORPORATION BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
Expand Down Expand Up @@ -103,30 +103,30 @@ uint32_t min( uint32_t a, uint32_t b )
}

/*!
* \brief Helper function to fill cbuffer with opcode and offset
* @brief Helper function to fill cbuffer with opcode and offset
*
* Typically used in write flash functions.
*
* \warning It is up to the caller to ensure the size of cbuffer is big enough to contain all information!
* @warning It is up to the caller to ensure the size of cbuffer is big enough to contain all information!
*/
static void lr1110_bootloader_fill_cbuffer_opcode_offset_flash( uint8_t* cbuffer, uint16_t opcode, uint32_t offset );

/*!
* \brief Helper function to fill cdata with data
* @brief Helper function to fill cdata with data
*
* Typically used in write flash functions.
*
* \warning It is up to the caller to ensure the size of cdata is big enough to contain all data!
* @warning It is up to the caller to ensure the size of cdata is big enough to contain all data!
*/
static void lr1110_bootloader_fill_cdata_flash( uint8_t* cdata, const uint32_t* data, uint8_t data_length );

/*!
* \brief Helper function to fill cbuffer and cdata with information to write flash
* @brief Helper function to fill cbuffer and cdata with information to write flash
*
* Typically used in write flash functions. Internally calls lr1110_bootloader_fill_cbuffer_opcode_offset_flash and
* lr1110_bootloader_fill_cdata_flash.
*
* \warning It is up to the caller to ensure the sizes of cbuffer and cdata are big enough to contain their respective
* @warning It is up to the caller to ensure the sizes of cbuffer and cdata are big enough to contain their respective
* information!
*/
static void lr1110_bootloader_fill_cbuffer_cdata_flash( uint8_t* cbuffer, uint8_t* cdata, uint16_t opcode,
Expand Down
Loading

0 comments on commit 13c4e79

Please sign in to comment.