Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

fix: do not halt on error if not debugging #60

Merged
merged 1 commit into from
May 23, 2024
Merged

fix: do not halt on error if not debugging #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions templates/extenders/debug_log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,13 @@ func NewDebugUARTLog(config DebugConfig) generator.Extender {
appconfig.CONFIG_UART_LINE_CTRL.Required(appconfig.Yes),
appconfig.CONFIG_PRINTK.Required(appconfig.Yes),

appconfig.NewValue("CONFIG_ZBOSS_HALT_ON_ASSERT").Default(appconfig.Yes),
appconfig.NewValue("CONFIG_RESET_ON_FATAL_ERROR").Default(appconfig.No),
appconfig.NewValue("CONFIG_DEBUG_OPTIMIZATIONS").Default(appconfig.Yes),
appconfig.NewValue("CONFIG_DEBUG_THREAD_INFO").Default(appconfig.Yes),
// appconfig.NewValue("CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE").Default(`2048`),
// appconfig.NewValue("CONFIG_HEAP_MEM_POOL_SIZE").Default(`2048`),

// ZBHome Debug enable
appconfig.NewValue("CONFIG_ZBHOME_DEBUG_ENABLE").Required(appconfig.Yes),

Expand Down
4 changes: 0 additions & 4 deletions types/appconfig/appconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,6 @@ func NewDefaultAppConfig(opts DefaultAppConfigOptions) (*AppConfig, error) {
CONFIG_NET_IPV6,
CONFIG_NET_IP_ADDR_CHECK,
CONFIG_NET_UDP,
CONFIG_ZBOSS_HALT_ON_ASSERT,
CONFIG_RESET_ON_FATAL_ERROR,
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE,
CONFIG_HEAP_MEM_POOL_SIZE,
CONFIG_CONSOLE,
CONFIG_USB_DEVICE_STACK,
)
Expand Down
10 changes: 1 addition & 9 deletions types/appconfig/known.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,7 @@ var (
CONFIG_NET_UDP = NewValue("CONFIG_NET_UDP").Default(No)

// Sensors
CONFIG_DHT = NewValue("CONFIG_DHT").Default(Yes)

// Debug
CONFIG_ZBOSS_HALT_ON_ASSERT = NewValue("CONFIG_ZBOSS_HALT_ON_ASSERT").Default(Yes)
CONFIG_RESET_ON_FATAL_ERROR = NewValue("CONFIG_RESET_ON_FATAL_ERROR").Default(No)
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE = NewValue("CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE").Default(`2048`)
CONFIG_HEAP_MEM_POOL_SIZE = NewValue("CONFIG_HEAP_MEM_POOL_SIZE").Default(`2048`)
CONFIG_DEBUG_OPTIMIZATIONS = NewValue("CONFIG_DEBUG_OPTIMIZATIONS").Default(No)
CONFIG_DEBUG_THREAD_INFO = NewValue("CONFIG_DEBUG_THREAD_INFO").Default(No)
CONFIG_DHT = NewValue("CONFIG_DHT").Default(Yes)
)

const (
Expand Down