Merge pull request #522 from hello/integration

MP RC2
hello · Oct 14, 2016 · 7bc0590 · 7bc0590
2 parents cef61b0 + 0dc9564
commit 7bc0590
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ant/ant_driver.c b/ant/ant_driver.c
@@ -67,7 +67,7 @@ _configure_channel(uint8_t channel,const hlo_ant_channel_phy_t * phy,  const hlo
     ret += sd_ant_channel_id_set(channel, device->device_number, device->device_type, device->transmit_type);
     ret += sd_ant_channel_low_priority_rx_search_timeout_set(channel, 0xFF);
     ret += sd_ant_channel_rx_search_timeout_set(channel, 0);
-    ret += sd_ant_channel_radio_tx_power_set(channel, RADIO_TX_POWER_LVL_2, 0);
+    ret += sd_ant_channel_radio_tx_power_set(channel, RADIO_TX_POWER_LVL_3, 0);
     return ret;
 }
 static int

diff --git a/common/app_info.h b/common/app_info.h
@@ -3,10 +3,10 @@
  * A place to put all common defines
  */
 //make sure the FW_VERSION_STRING fits in MorpheusCommand.top_version (16 bytes)
-#define FW_VERSION_STRING "1.7.1"
+#define FW_VERSION_STRING "1.7.2"
 
 //pill only
-#define FIRMWARE_VERSION_8BIT (0x47)
+#define FIRMWARE_VERSION_8BIT (0x48)
 
 #define BLE_SIG_COMPANY_ID 1002