# HG changeset patch # User ideenmodellierer # Date 1574799477 -3600 # Node ID eb7696e0510fbf67916b1faad5dacc9c0be358d9 # Parent 717f335cc5c9b5d42644db7ecb9da23926533141 Added start of module configuration after eache modul power on Added button evaluation to support request for bluetooth signal stragth diff -r 717f335cc5c9 -r eb7696e0510f Discovery/Src/base.c --- a/Discovery/Src/base.c Tue Nov 26 21:16:36 2019 +0100 +++ b/Discovery/Src/base.c Tue Nov 26 21:17:57 2019 +0100 @@ -362,6 +362,7 @@ MX_GPIO_Init(); // MX_SmallCPU_NO_Reset_Helper(); //161116 hw + MX_Bluetooth_PowerOff(); /* disable module, needed in case of e.g. a reset event to make sure module is configured from scratch */ MX_SPI_Init(); MX_UART_Init(); SDRAM_Config(); @@ -386,12 +387,7 @@ // new 170508: bluetooth on at start settingsGetPointer()->bluetoothActive = 1; MX_Bluetooth_PowerOn(); - - // Haase Geburtstag: - // settingsGetPointer()->serialHigh = (3012 / 256); - // settingsGetPointer()->serialLow = (3012 & 0xFF); - - // settingsGetPointer()->showDebugInfo = 1; + tComm_StartBlueModConfig(); /* if( (hardwareDataGetPointer()->primarySerial == 20+18) @@ -483,7 +479,7 @@ } deco_loop(); TriggerButtonAction(); - if(DoDisplayRefresh) + if(DoDisplayRefresh) /* set every 100ms by timer interrupt */ { DoDisplayRefresh = 0; RefreshDisplay(); @@ -1017,10 +1013,14 @@ get_globalStateList(&status); if(status.base == BaseComm) /* main loop is not serviced in comm mode => react immediately */ { - if (action == ACTION_BUTTON_BACK) { - settingsGetPointer()->bluetoothActive = 0; - MX_Bluetooth_PowerOff(); - tComm_exit(); + switch(action) + { + case ACTION_BUTTON_BACK: tComm_exit(); + break; + case ACTION_BUTTON_NEXT: tComm_RequestBluetoothStrength(); + break; + default: + break; } } else