[GitHub] [mynewt-nimble] apache-mynewt-bot removed a comment on pull request #796: Apps: central added
apache-mynewt-bot removed a comment on pull request #796:
URL: https://github.com/apache/mynewt-nimble/pull/796#issuecomment-630037842
## Style check summary
No suggestions at this time!
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [mynewt-nimble] apache-mynewt-bot commented on pull request #796: Apps: central added
apache-mynewt-bot commented on pull request #796:
URL: https://github.com/apache/mynewt-nimble/pull/796#issuecomment-641734748
## Style check summary
No suggestions at this time!
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [mynewt-nimble] KKopyscinski commented on a change in pull request #796: Apps: central added
KKopyscinski commented on a change in pull request #796: URL: https://github.com/apache/mynewt-nimble/pull/796#discussion_r437865315 ## File path: apps/central/src/main.c ## @@ -0,0 +1,213 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +#include "sysinit/sysinit.h" +#include "os/os.h" +#include "console/console.h" +#include "host/ble_hs.h" +#include "host/util/util.h" +#include "console/console.h" +#include "log/log.h" + +static uint8_t g_own_addr_type; +static uint32_t delay_ms = 2000; Review comment: I agree with both - it's fixed now This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [mynewt-nimble] apache-mynewt-bot commented on pull request #830: nimble/l2cap: Couple of fixes to ecoc
apache-mynewt-bot commented on pull request #830:
URL: https://github.com/apache/mynewt-nimble/pull/830#issuecomment-641497823
## Style check summary
No suggestions at this time!
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [mynewt-nimble] rymanluk commented on a change in pull request #796: Apps: central added
rymanluk commented on a change in pull request #796: URL: https://github.com/apache/mynewt-nimble/pull/796#discussion_r437590586 ## File path: apps/central/src/main.c ## @@ -0,0 +1,213 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +#include "sysinit/sysinit.h" +#include "os/os.h" +#include "console/console.h" +#include "host/ble_hs.h" +#include "host/util/util.h" +#include "console/console.h" +#include "log/log.h" + +static uint8_t g_own_addr_type; +static uint32_t delay_ms = 2000; Review comment: this delay is also not needed here - you ca put is as value where it is used This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [mynewt-nimble] rymanluk commented on a change in pull request #796: Apps: central added
rymanluk commented on a change in pull request #796: URL: https://github.com/apache/mynewt-nimble/pull/796#discussion_r437589869 ## File path: apps/central/src/main.c ## @@ -0,0 +1,213 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +#include "sysinit/sysinit.h" +#include "os/os.h" +#include "console/console.h" +#include "host/ble_hs.h" +#include "host/util/util.h" +#include "console/console.h" +#include "log/log.h" + +static uint8_t g_own_addr_type; +static uint32_t delay_ms = 2000; +static os_time_t ticks; Review comment: this is not needed anymore. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [mynewt-nimble] rymanluk opened a new pull request #830: nimble/l2cap: Couple of fixes to ecoc
rymanluk opened a new pull request #830: URL: https://github.com/apache/mynewt-nimble/pull/830 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [mynewt-core] apache-mynewt-bot commented on pull request #2310: tinyusb: Add hardware initialization for DA1469x
apache-mynewt-bot commented on pull request #2310:
URL: https://github.com/apache/mynewt-core/pull/2310#issuecomment-641404048
## Style check summary
No suggestions at this time!
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [mynewt-nimble] apache-mynewt-bot commented on pull request #825: porting: Update targets and updating script
apache-mynewt-bot commented on pull request #825: URL: https://github.com/apache/mynewt-nimble/pull/825#issuecomment-640545624 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [mynewt-nimble] haukepetersen commented on pull request #828: npl/riot: change dflt value for BLE_ACL_BUF_COUNT
haukepetersen commented on pull request #828: URL: https://github.com/apache/mynewt-nimble/pull/828#issuecomment-640819986 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [mynewt-core] andrzej-kaczmarek commented on a change in pull request #2309: hw/mcu/dialog: Add system clock choice
andrzej-kaczmarek commented on a change in pull request #2309: URL: https://github.com/apache/mynewt-core/pull/2309#discussion_r437348431 ## File path: hw/mcu/dialog/da1469x/syscfg.yml ## @@ -392,3 +403,4 @@ syscfg.restrictions: - "!SPI_1_MASTER || (SPI_1_MASTER_PIN_SCK && SPI_1_MASTER_PIN_MOSI && SPI_1_MASTER_PIN_MISO)" - "!SPI_0_SLAVE || (SPI_0_SLAVE_PIN_SCK && SPI_0_SLAVE_PIN_MOSI && SPI_0_SLAVE_PIN_MISO && SPI_0_SLAVE_PIN_SS)" - "!SPI_1_SLAVE || (SPI_1_SLAVE_PIN_SCK && SPI_1_SLAVE_PIN_MOSI && SPI_1_SLAVE_PIN_MISO && SPI_1_SLAVE_PIN_SS)" +- "PLL_ON || MCU_SYSCLK_SOURCE != PLL96" Review comment: should be `MCU_PLL_ON` although I'd change that name to `MCU_PLL_ENABLE` (like `MCU_DCDC_ENABLE`) This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [mynewt-core] kasjer merged pull request #2308: hw/drivers/i2s: Fix no client crash
kasjer merged pull request #2308: URL: https://github.com/apache/mynewt-core/pull/2308 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [mynewt-nimble] michal-narajowski commented on pull request #825: porting: Update targets and updating script
michal-narajowski commented on pull request #825: URL: https://github.com/apache/mynewt-nimble/pull/825#issuecomment-640545203 @haukepetersen I updated the script and generated files. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [mynewt-nimble] apache-mynewt-bot commented on pull request #828: npl/riot: change dflt value for BLE_ACL_BUF_COUNT
apache-mynewt-bot commented on pull request #828: URL: https://github.com/apache/mynewt-nimble/pull/828#issuecomment-640820345 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [mynewt-core] utzig merged pull request #2302: stm32: fix invalid uart access
utzig merged pull request #2302: URL: https://github.com/apache/mynewt-core/pull/2302 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [mynewt-core] apache-mynewt-bot commented on pull request #2309: hw/mcu/dialog: Add system clock choice
apache-mynewt-bot commented on pull request #2309: URL: https://github.com/apache/mynewt-core/pull/2309#issuecomment-641166921 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [mynewt-nimble] apache-mynewt-bot removed a comment on pull request #825: porting: Update targets and updating script
apache-mynewt-bot removed a comment on pull request #825: URL: https://github.com/apache/mynewt-nimble/pull/825#issuecomment-635249332 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [mynewt-newtmgr] ccollins476ad commented on pull request #162: Optimize DFU
ccollins476ad commented on pull request #162: URL: https://github.com/apache/mynewt-newtmgr/pull/162#issuecomment-640961098 Sorry for the delay. It looks good to me (not sure why I thought you would need to look at sequence numbers). I just have one last request: could you please make `IMAGE_UPLOAD_MAX_WS` configurable via a command line option? The only reason I ask is that I worry that this optimized DFU method might cause problems on some setups that we aren't anticipating (e.g., lower mbuf count). In such cases, it would be good if the user could set the max window size to 1. I'll be much more prompt next time! This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [mynewt-core] kasjer opened a new pull request #2309: hw/mcu/dialog: Add system clock choice
kasjer opened a new pull request #2309: URL: https://github.com/apache/mynewt-core/pull/2309 System clock was always set to XTAL32M. Now it can be also RC32M and PLL96 PLL96 can be turned on even if it is not used for system clock, this is needed if USB is to be used. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [mynewt-nimble] apache-mynewt-bot removed a comment on pull request #828: npl/riot: change dflt value for BLE_ACL_BUF_COUNT
apache-mynewt-bot removed a comment on pull request #828: URL: https://github.com/apache/mynewt-nimble/pull/828#issuecomment-640512724 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [mynewt-nimble] haukepetersen commented on pull request #825: porting: Update targets and updating script
haukepetersen commented on pull request #825: URL: https://github.com/apache/mynewt-nimble/pull/825#issuecomment-640821005 Works like a charm, the change in #828 now only triggers that one change in the generated syscfg.h file, perfect :-) Before merging, you might want to move the latest change from the 2nd into the 1st commit, should be easier to track. This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [mynewt-core] kasjer opened a new pull request #2310: tinyusb: Add hardware initialization for DA1469x
kasjer opened a new pull request #2310: URL: https://github.com/apache/mynewt-core/pull/2310 This provides code for hardware initialization: GPIO and clock. This may be merged after TinyUSB part is merged. https://github.com/hathach/tinyusb/pull/427 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [mynewt-core] kasjer merged pull request #2309: hw/mcu/dialog: Add system clock choice
kasjer merged pull request #2309: URL: https://github.com/apache/mynewt-core/pull/2309 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [mynewt-nimble] michal-narajowski merged pull request #825: porting: Update targets and updating script
michal-narajowski merged pull request #825: URL: https://github.com/apache/mynewt-nimble/pull/825 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [mynewt-core] apache-mynewt-bot removed a comment on pull request #2309: hw/mcu/dialog: Add system clock choice
apache-mynewt-bot removed a comment on pull request #2309: URL: https://github.com/apache/mynewt-core/pull/2309#issuecomment-641166921 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[mynewt-core] branch master updated: hw/mcu/dialog: Add system clock choice
This is an automated email from the ASF dual-hosted git repository.
jerzy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
The following commit(s) were added to refs/heads/master by this push:
new d9332d6 hw/mcu/dialog: Add system clock choice
d9332d6 is described below
commit d9332d6929c748e6832f9220e785daea5d830413
Author: Jerzy Kasenberg
AuthorDate: Tue Jun 9 10:13:03 2020 +0200
hw/mcu/dialog: Add system clock choice
System clock was always set to XTAL32M.
Now it can also be PLL96.
PLL96 can be turned on even if it is not used for system clock,
this is needed if USB is to be used.
---
hw/mcu/dialog/da1469x/include/mcu/da1469x_clock.h | 45 +
hw/mcu/dialog/da1469x/src/da1469x_clock.c | 48 ++-
hw/mcu/dialog/da1469x/src/da1469x_sleep.c | 11 +-
hw/mcu/dialog/da1469x/src/hal_system.c| 11 +-
hw/mcu/dialog/da1469x/syscfg.yml | 15 +++
5 files changed, 127 insertions(+), 3 deletions(-)
diff --git a/hw/mcu/dialog/da1469x/include/mcu/da1469x_clock.h
b/hw/mcu/dialog/da1469x/include/mcu/da1469x_clock.h
index c76c7a0..b25eda4 100644
--- a/hw/mcu/dialog/da1469x/include/mcu/da1469x_clock.h
+++ b/hw/mcu/dialog/da1469x/include/mcu/da1469x_clock.h
@@ -38,6 +38,11 @@ void da1469x_clock_sys_xtal32m_init(void);
void da1469x_clock_sys_xtal32m_enable(void);
/**
+ * Wait for XTAL32M to settle
+ */
+void da1469x_clock_sys_xtal32m_wait_to_settle(void);
+
+/**
* Switch sys_clk to XTAL32M
*
* Caller shall ensure that XTAL32M is already settled.
@@ -125,6 +130,46 @@ da1469x_clock_amba_disable(uint32_t mask)
__HAL_ENABLE_INTERRUPTS(primask);
}
+/**
+ * Enable PLL96
+ */
+static inline void
+da1469x_clock_sys_pll_enable(void)
+{
+CRG_XTAL->PLL_SYS_CTRL1_REG |= CRG_XTAL_PLL_SYS_CTRL1_REG_PLL_EN_Msk |
+
CRG_XTAL_PLL_SYS_CTRL1_REG_LDO_PLL_ENABLE_Msk;
+}
+
+/**
+ * Disable PLL96
+ *
+ * If PLL was used as SYS_CLOCK switches to XTAL32M.
+ */
+void da1469x_clock_sys_pll_disable(void);
+
+/**
+ * Checks whether PLL96 is locked and can be use as system clock or USB clock
+ *
+ * @return 0 if PLL is off, non-0 it its running
+ */
+static inline int
+da1469x_clock_is_pll_locked(void)
+{
+return 0 != (CRG_XTAL->PLL_SYS_STATUS_REG &
CRG_XTAL_PLL_SYS_STATUS_REG_PLL_LOCK_FINE_Msk);
+}
+
+/**
+ * Waits for PLL96 to lock.
+ */
+void da1469x_clock_pll_wait_to_lock(void);
+
+/**
+ * Switches system clock to PLL96
+ *
+ * Caller shall ensure that PLL is already locked.
+ */
+void da1469x_clock_sys_pll_switch(void);
+
#ifdef __cplusplus
}
#endif
diff --git a/hw/mcu/dialog/da1469x/src/da1469x_clock.c
b/hw/mcu/dialog/da1469x/src/da1469x_clock.c
index 5812044..0b33e12 100644
--- a/hw/mcu/dialog/da1469x/src/da1469x_clock.c
+++ b/hw/mcu/dialog/da1469x/src/da1469x_clock.c
@@ -25,6 +25,7 @@
#include "mcu/da1469x_hal.h"
#include "mcu/da1469x_pd.h"
#include "mcu/da1469x_pdc.h"
+#include "mcu/da1469x_clock.h"
static uint32_t g_mcu_clock_rcx_freq;
@@ -81,7 +82,7 @@ da1469x_clock_sys_xtal32m_switch(void)
}
void
-da1469x_clock_sys_xtal32m_switch_safe(void)
+da1469x_clock_sys_xtal32m_wait_to_settle(void)
{
uint32_t primask;
@@ -98,6 +99,12 @@ da1469x_clock_sys_xtal32m_switch_safe(void)
}
__HAL_ENABLE_INTERRUPTS(primask);
+}
+
+void
+da1469x_clock_sys_xtal32m_switch_safe(void)
+{
+da1469x_clock_sys_xtal32m_wait_to_settle();
da1469x_clock_sys_xtal32m_switch();
}
@@ -178,3 +185,42 @@ da1469x_clock_lp_rcx_disable(void)
{
CRG_TOP->CLK_RCX_REG &= ~CRG_TOP_CLK_RCX_REG_RCX_ENABLE_Msk;
}
+
+void
+da1469x_clock_pll_disable(void)
+{
+while (CRG_TOP->CLK_CTRL_REG & CRG_TOP_CLK_CTRL_REG_RUNNING_AT_PLL96M_Msk)
{
+CRG_TOP->CLK_SWITCH2XTAL_REG =
CRG_TOP_CLK_SWITCH2XTAL_REG_SWITCH2XTAL_Msk;
+}
+
+CRG_XTAL->PLL_SYS_CTRL1_REG &= ~CRG_XTAL_PLL_SYS_CTRL1_REG_PLL_EN_Msk;
+}
+
+void
+da1469x_clock_pll_wait_to_lock(void)
+{
+uint32_t primask;
+
+__HAL_DISABLE_INTERRUPTS(primask);
+
+NVIC_ClearPendingIRQ(PLL_LOCK_IRQn);
+
+if (!da1469x_clock_is_pll_locked()) {
+NVIC_EnableIRQ(PLL_LOCK_IRQn);
+while (!NVIC_GetPendingIRQ(PLL_LOCK_IRQn)) {
+__WFI();
+}
+NVIC_DisableIRQ(PLL_LOCK_IRQn);
+}
+
+__HAL_ENABLE_INTERRUPTS(primask);
+}
+
+void
+da1469x_clock_sys_pll_switch(void)
+{
+/* CLK_SEL_Msk == 3 means PLL */
+CRG_TOP->CLK_CTRL_REG |= CRG_TOP_CLK_CTRL_REG_SYS_CLK_SEL_Msk;
+
+while (!(CRG_TOP->CLK_CTRL_REG &
CRG_TOP_CLK_CTRL_REG_RUNNING_AT_PLL96M_Msk));
+}
diff --git a/hw/mcu/dialog/da1469x/src/da1469x_sleep.c
b/hw/mcu/dialog/da1469x/src/da1469x_sleep.c
index a476e83..8d084e5 100644
--- a/hw/mcu/dialog/da1469x/src/da1469x_sleep.c
+++ b/hw/mcu/dialog/da1469x/src/da1469x_sleep.c
@@ -97,8 +97,17 @@ da1469x_sleep(os_time_t ticks)
g_mcu_wait_for_jtag_until = os_time_get() + os_time_ms_t
[mynewt-nimble] 01/02: porting: Update targets and updating script
This is an automated email from the ASF dual-hosted git repository.
naraj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit c1597ec775eac659e43af58bad33972d404cb97f
Author: Michał Narajowski
AuthorDate: Thu May 28 11:58:56 2020 +0200
porting: Update targets and updating script
We need to update pkg names to represent at path to the targets.
Also update the update_generated_files.sh script to
refer to the targets using a path. This is required
after recent change to Newt.
---
porting/targets/linux/pkg.yml | 2 +-
porting/targets/linux_blemesh/pkg.yml | 2 +-
porting/targets/porting_default/pkg.yml | 2 +-
porting/targets/riot/pkg.yml| 2 +-
porting/update_generated_files.sh | 9 +++--
5 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/porting/targets/linux/pkg.yml b/porting/targets/linux/pkg.yml
index f1159d4..c819a83 100644
--- a/porting/targets/linux/pkg.yml
+++ b/porting/targets/linux/pkg.yml
@@ -16,7 +16,7 @@
# under the License.
#
-pkg.name: "targets/linux"
+pkg.name: "porting/targets/linux"
pkg.type: "target"
pkg.description: This target is used to generate syscfg.h file and other
artifacts for linux example app.
pkg.author:
diff --git a/porting/targets/linux_blemesh/pkg.yml
b/porting/targets/linux_blemesh/pkg.yml
index c314933..3cbe09a 100644
--- a/porting/targets/linux_blemesh/pkg.yml
+++ b/porting/targets/linux_blemesh/pkg.yml
@@ -16,7 +16,7 @@
# under the License.
#
-pkg.name: "targets/linux_blemesh"
+pkg.name: "porting/targets/linux_blemesh"
pkg.type: "target"
pkg.description: This target is used to generate syscfg.h file and other
artifacts for linux_blemesh example app.
pkg.author:
diff --git a/porting/targets/porting_default/pkg.yml
b/porting/targets/porting_default/pkg.yml
index f7319c2..44a34ba 100644
--- a/porting/targets/porting_default/pkg.yml
+++ b/porting/targets/porting_default/pkg.yml
@@ -16,7 +16,7 @@
# under the License.
#
-pkg.name: "targets/porting_default"
+pkg.name: "porting/targets/porting_default"
pkg.type: "target"
pkg.description: This target is used to generate syscfg.h file and other
artifacts for default Nimble port includes.
pkg.author:
diff --git a/porting/targets/riot/pkg.yml b/porting/targets/riot/pkg.yml
index b6610c3..7d1a324 100644
--- a/porting/targets/riot/pkg.yml
+++ b/porting/targets/riot/pkg.yml
@@ -16,7 +16,7 @@
# under the License.
#
-pkg.name: "targets/riot"
+pkg.name: "porting/targets/riot"
pkg.type: "target"
pkg.description: This target is used to generate syscfg.h file and other
artifacts for RIOT Nimble port.
pkg.author:
diff --git a/porting/update_generated_files.sh
b/porting/update_generated_files.sh
index c01..7ede02c 100755
--- a/porting/update_generated_files.sh
+++ b/porting/update_generated_files.sh
@@ -31,6 +31,11 @@ declare -A targets=(
for target in "${!targets[@]}"; do
echo "Updating target $target"
-newt build "$target" > /dev/null 2>&1
-cp "bin/@apache-mynewt-nimble/targets/${target}/generated/include"
"${targets[$target]}" -r
+newt build "@apache-mynewt-nimble/porting/targets/$target" > /dev/null 2>&1
+cp "bin/@apache-mynewt-nimble/porting/targets/${target}/generated/include"
"${targets[$target]}" -r
+# Remove repo version and hash MYNEWT_VALS as it doesn't make much sense
to commit them and they
+# defeat the purpose of this script.
+find "${targets[$target]}/include" -type f -name 'syscfg.h' -exec sed -i
'/MYNEWT_VAL_REPO_*/,/#endif/d' {} \;
+find "${targets[$target]}/include" -type f -name 'syscfg.h' -exec sed -i
'/\/\*\*\* Repository/,/\*\//d' {} \;
+find "${targets[$target]}/include" -type f -name 'syscfg.h' -exec sed -i
'$!N;/^\n$/{$q;D;};P;D;' {} \;
done
[mynewt-nimble] 02/02: porting: Update generated configuration files
This is an automated email from the ASF dual-hosted git repository. naraj pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git commit f434b3f0e2a1f150769ff1636f120abeb8eb2002 Author: Michał Narajowski AuthorDate: Tue Jun 9 09:11:05 2020 +0200 porting: Update generated configuration files --- porting/examples/linux/include/logcfg/logcfg.h | 2 +- porting/examples/linux/include/syscfg/syscfg.h | 22 -- porting/examples/linux/include/sysflash/sysflash.h | 2 +- .../examples/linux_blemesh/include/logcfg/logcfg.h | 2 +- .../examples/linux_blemesh/include/syscfg/syscfg.h | 64 .../linux_blemesh/include/sysflash/sysflash.h | 2 +- porting/nimble/include/logcfg/logcfg.h | 2 +- porting/nimble/include/syscfg/syscfg.h | 12 ++- porting/nimble/include/sysflash/sysflash.h | 2 +- porting/npl/riot/include/logcfg/logcfg.h | 2 +- porting/npl/riot/include/syscfg/syscfg.h | 86 -- porting/npl/riot/include/sysflash/sysflash.h | 2 +- 12 files changed, 129 insertions(+), 71 deletions(-) diff --git a/porting/examples/linux/include/logcfg/logcfg.h b/porting/examples/linux/include/logcfg/logcfg.h index e21a3ae..837cdea 100644 --- a/porting/examples/linux/include/logcfg/logcfg.h +++ b/porting/examples/linux/include/logcfg/logcfg.h @@ -1,5 +1,5 @@ /** - * This file was generated by Apache newt version: 1.8.0-dev + * This file was generated by Apache newt version: 1.9.0-dev */ #ifndef H_MYNEWT_LOGCFG_ diff --git a/porting/examples/linux/include/syscfg/syscfg.h b/porting/examples/linux/include/syscfg/syscfg.h index 7e9bfca..99939f2 100644 --- a/porting/examples/linux/include/syscfg/syscfg.h +++ b/porting/examples/linux/include/syscfg/syscfg.h @@ -1,5 +1,5 @@ /** - * This file was generated by Apache newt version: 1.8.0-dev + * This file was generated by Apache newt version: 1.9.0-dev */ #ifndef H_MYNEWT_SYSCFG_ @@ -15,8 +15,6 @@ #define MYNEWT_VAL(_name) MYNEWT_VAL_ ## _name #define MYNEWT_VAL_CHOICE(_name, _val) MYNEWT_VAL_ ## _name ## __ ## _val - - /*** @apache-mynewt-core/crypto/tinycrypt */ #ifndef MYNEWT_VAL_TINYCRYPT_SYSINIT_STAGE #define MYNEWT_VAL_TINYCRYPT_SYSINIT_STAGE (200) @@ -297,7 +295,7 @@ #define MYNEWT_VAL_LOG_FCB_SLOT1 (0) #endif -/* Overridden by @apache-mynewt-nimble/targets/linux (defined by @apache-mynewt-core/sys/log/stub) */ +/* Overridden by @apache-mynewt-nimble/porting/targets/linux (defined by @apache-mynewt-core/sys/log/stub) */ #ifndef MYNEWT_VAL_LOG_LEVEL #define MYNEWT_VAL_LOG_LEVEL (0) #endif @@ -368,6 +366,14 @@ #define MYNEWT_VAL_BLE_EXT_ADV_MAX_SIZE (31) #endif +#ifndef MYNEWT_VAL_BLE_ISO +#define MYNEWT_VAL_BLE_ISO (0) +#endif + +#ifndef MYNEWT_VAL_BLE_ISO_TEST +#define MYNEWT_VAL_BLE_ISO_TEST (0) +#endif + #ifndef MYNEWT_VAL_BLE_MAX_CONNECTIONS #define MYNEWT_VAL_BLE_MAX_CONNECTIONS (1) #endif @@ -945,12 +951,12 @@ #define MYNEWT_VAL_BLE_SOCK_LINUX_DEV (0) #endif -/* Overridden by @apache-mynewt-nimble/targets/linux (defined by @apache-mynewt-nimble/nimble/transport/socket) */ +/* Overridden by @apache-mynewt-nimble/porting/targets/linux (defined by @apache-mynewt-nimble/nimble/transport/socket) */ #ifndef MYNEWT_VAL_BLE_SOCK_STACK_SIZE #define MYNEWT_VAL_BLE_SOCK_STACK_SIZE (1028) #endif -/* Overridden by @apache-mynewt-nimble/targets/linux (defined by @apache-mynewt-nimble/nimble/transport/socket) */ +/* Overridden by @apache-mynewt-nimble/porting/targets/linux (defined by @apache-mynewt-nimble/nimble/transport/socket) */ #ifndef MYNEWT_VAL_BLE_SOCK_TASK_PRIO #define MYNEWT_VAL_BLE_SOCK_TASK_PRIO (3) #endif @@ -959,12 +965,12 @@ #define MYNEWT_VAL_BLE_SOCK_TCP_PORT (14433) #endif -/* Overridden by @apache-mynewt-nimble/targets/linux (defined by @apache-mynewt-nimble/nimble/transport/socket) */ +/* Overridden by @apache-mynewt-nimble/porting/targets/linux (defined by @apache-mynewt-nimble/nimble/transport/socket) */ #ifndef MYNEWT_VAL_BLE_SOCK_USE_LINUX_BLUE #define MYNEWT_VAL_BLE_SOCK_USE_LINUX_BLUE (1) #endif -/* Overridden by @apache-mynewt-nimble/targets/linux (defined by @apache-mynewt-nimble/nimble/transport/socket) */ +/* Overridden by @apache-mynewt-nimble/porting/targets/linux (defined by @apache-mynewt-nimble/nimble/transport/socket) */ #ifndef MYNEWT_VAL_BLE_SOCK_USE_TCP #define MYNEWT_VAL_BLE_SOCK_USE_TCP (0) #endif diff --git a/porting/examples/linux/include/sysflash/sysflash.h b/porting/examples/linux/include/sysflash/sysflash.h index 413cb26..ab1341b 100644 --- a/porting/examples/linux/include/sysflash/sysflash.h +++ b/porting/examples/linux/include/sysflash/sysflash.h @@ -1,5 +1,5 @@ /** - * This file was generated by Apache newt version: 1.8.0-dev + * This file was generated by Apache newt version: 1.9.0-dev */ #ifndef H_MYNEWT_SYSFLASH_ diff --git a/porting/examples/linux_blemesh/include/logc
[mynewt-nimble] branch master updated (f8a3966 -> f434b3f)
This is an automated email from the ASF dual-hosted git repository. naraj pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git. from f8a3966 nimble/ll: Fix controller to host flow new c1597ec porting: Update targets and updating script new f434b3f porting: Update generated configuration files The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: porting/examples/linux/include/logcfg/logcfg.h | 2 +- porting/examples/linux/include/syscfg/syscfg.h | 22 -- porting/examples/linux/include/sysflash/sysflash.h | 2 +- .../examples/linux_blemesh/include/logcfg/logcfg.h | 2 +- .../examples/linux_blemesh/include/syscfg/syscfg.h | 64 .../linux_blemesh/include/sysflash/sysflash.h | 2 +- porting/nimble/include/logcfg/logcfg.h | 2 +- porting/nimble/include/syscfg/syscfg.h | 12 ++- porting/nimble/include/sysflash/sysflash.h | 2 +- porting/npl/riot/include/logcfg/logcfg.h | 2 +- porting/npl/riot/include/syscfg/syscfg.h | 86 -- porting/npl/riot/include/sysflash/sysflash.h | 2 +- porting/targets/linux/pkg.yml | 2 +- porting/targets/linux_blemesh/pkg.yml | 2 +- porting/targets/porting_default/pkg.yml| 2 +- porting/targets/riot/pkg.yml | 2 +- porting/update_generated_files.sh | 9 ++- 17 files changed, 140 insertions(+), 77 deletions(-)
