From 755ff98ec9c8f02c9f2d757dc4caa6bd897d37a5 Mon Sep 17 00:00:00 2001 From: CTSchorsch Date: Wed, 31 Mar 2021 14:10:27 +0200 Subject: [PATCH] fix spaces, delete lines and default config --- applications/app.c | 5 +++-- commands.c | 2 +- conf_general.h | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/applications/app.c b/applications/app.c index 73861e31..b72eae83 100644 --- a/applications/app.c +++ b/applications/app.c @@ -89,8 +89,8 @@ void app_set_configuration(app_configuration *conf) { case APP_PPM_UART: hw_stop_i2c(); - app_ppm_start(); - app_uartcomm_start(UART_PORT_COMM_HEADER); + app_ppm_start(); + app_uartcomm_start(UART_PORT_COMM_HEADER); break; case APP_ADC_UART: @@ -129,6 +129,7 @@ void app_set_configuration(app_configuration *conf) { case APP_CUSTOM: #ifdef APP_CUSTOM_TO_USE + hw_stop_i2c(); app_custom_start(); #endif break; diff --git a/commands.c b/commands.c index 7fd8086b..9c0d4d1a 100644 --- a/commands.c +++ b/commands.c @@ -85,7 +85,7 @@ void commands_init(void) { chMtxObjectInit(&print_mutex); chMtxObjectInit(&send_buffer_mutex); chMtxObjectInit(&terminal_mutex); - chThdCreateStatic(blocking_thread_wa, sizeof(blocking_thread_wa), NORMALPRIO, blocking_thread, NULL); + chThdCreateStatic(blocking_thread_wa, sizeof(blocking_thread_wa), NORMALPRIO, blocking_thread, NULL); isInitialized = true; } diff --git a/conf_general.h b/conf_general.h index b4c7ca0e..627e0f2c 100644 --- a/conf_general.h +++ b/conf_general.h @@ -196,7 +196,7 @@ /* * Select default user motor configuration */ -#include "mcconf_default.h" +//#include "mcconf_default.h" //#include "mcconf_china_60kv.h" /* @@ -216,7 +216,7 @@ // CAN-plotter //#define APP_CUSTOM_TO_USE "app_plot_can.c" -#define APPCONF_APP_TO_USE APP_NONE +//#define APPCONF_APP_TO_USE APP_NONE //#define APPCONF_CAN_BAUD_RATE CAN_BAUD_75K #include "hw.h"