Change to btstack_config headers

Add missing "static" to methods in server

Author: peterharperuk

pico_w/bt/standalone/btstack_config.h …_w/bt/standalone/btstack_config_common.hpico_w/bt/standalone/btstack_config.h renamed to pico_w/bt/standalone/btstack_config_common.h pico_w/bt/standalone/btstack_config.h renamed to pico_w/bt/standalone/btstack_config_common.h

@@ -1,5 +1,5 @@
-#ifndef _PICO_BTSTACK_BTSTACK_CONFIG_H
-#define _PICO_BTSTACK_BTSTACK_CONFIG_H
+#ifndef _PICO_BTSTACK_CONFIG_COMMON_H
+#define _PICO_BTSTACK_CONFIG_COMMON_H
 
 #ifndef ENABLE_BLE
 #error Please link to pico_btstack_ble

pico_w/bt/standalone/client/CMakeLists.txt

@@ -12,7 +12,8 @@ target_link_libraries(picow_ble_temp_reader
     hardware_adc
     )
 target_include_directories(picow_ble_temp_reader PRIVATE
-    ${CMAKE_CURRENT_LIST_DIR}/.. # For btstack config
+    ${CMAKE_CURRENT_LIST_DIR}
+    ${CMAKE_CURRENT_LIST_DIR}/.. # For our common btstack config
     )
 target_compile_definitions(picow_ble_temp_reader PRIVATE
     RUNNING_AS_CLIENT=1

pico_w/bt/standalone/client/btstack_config.h

@@ -0,0 +1,6 @@
+#ifndef _PICO_BTSTACK_CONFIG_H
+#define _PICO_BTSTACK_CONFIG_H
+
+#include "btstack_config_common.h"
+
+#endif

pico_w/bt/standalone/server/CMakeLists.txt

@@ -11,7 +11,8 @@ target_link_libraries(picow_ble_temp_sensor
     hardware_adc
     )
 target_include_directories(picow_ble_temp_sensor PRIVATE
-    ${CMAKE_CURRENT_LIST_DIR}/.. # For btstack config
+    ${CMAKE_CURRENT_LIST_DIR}
+    ${CMAKE_CURRENT_LIST_DIR}/.. # For our common btstack config
     )
 pico_btstack_make_gatt_header(picow_ble_temp_sensor PRIVATE "${CMAKE_CURRENT_LIST_DIR}/temp_sensor.gatt")
 

pico_w/bt/standalone/server/btstack_config.h

@@ -0,0 +1,6 @@
+#ifndef _PICO_BTSTACK_CONFIG_H
+#define _PICO_BTSTACK_CONFIG_H
+
+#include "btstack_config_common.h"
+
+#endif

pico_w/bt/standalone/server/server.c

@@ -33,8 +33,9 @@ static btstack_timer_source_t heartbeat;
 static btstack_packet_callback_registration_t hci_event_callback_registration;
 
 extern uint8_t const profile_data[];
+static void poll_temp(void);
 
-void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size) {
+static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size) {
     UNUSED(size);
     UNUSED(channel);
     bd_addr_t local_addr;
@@ -72,7 +73,7 @@ void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint
     }
 }
 
-uint16_t att_read_callback(hci_con_handle_t connection_handle, uint16_t att_handle, uint16_t offset, uint8_t * buffer, uint16_t buffer_size) {
+static uint16_t att_read_callback(hci_con_handle_t connection_handle, uint16_t att_handle, uint16_t offset, uint8_t * buffer, uint16_t buffer_size) {
     UNUSED(connection_handle);
 
     if (att_handle == ATT_CHARACTERISTIC_ORG_BLUETOOTH_CHARACTERISTIC_TEMPERATURE_01_VALUE_HANDLE){
@@ -81,7 +82,7 @@ uint16_t att_read_callback(hci_con_handle_t connection_handle, uint16_t att_hand
     return 0;
 }
 
-int att_write_callback(hci_con_handle_t connection_handle, uint16_t att_handle, uint16_t transaction_mode, uint16_t offset, uint8_t *buffer, uint16_t buffer_size) {
+static int att_write_callback(hci_con_handle_t connection_handle, uint16_t att_handle, uint16_t transaction_mode, uint16_t offset, uint8_t *buffer, uint16_t buffer_size) {
     UNUSED(transaction_mode);
     UNUSED(offset);
     UNUSED(buffer_size);
@@ -95,7 +96,7 @@ int att_write_callback(hci_con_handle_t connection_handle, uint16_t att_handle,
     return 0;
 }
 
-void poll_temp(void) {
+static void poll_temp(void) {
     adc_select_input(ADC_CHANNEL_TEMPSENSOR);
     uint32_t raw32 = adc_read();
     const uint32_t bits = 12;