reverte spp counter to working version

This commit is contained in:
matthias.ringwald@gmail.com 2013-03-12 13:43:36 +00:00
parent 131c519aa9
commit 4bc29fdd24

View File

@ -33,66 +33,48 @@
#define HEARTBEAT_PERIOD_MS 1000
static uint8_t rfcomm_channel_nr = 1;
static uint16_t rfcomm_channel_id = 0;
static uint8_t spp_service_buffer[100];
static timer_source_t heartbeat;
static int real_counter = 0;
static int counter_to_send = 0;
enum STATE {INIT, W4_CONNECTION, W4_CHANNEL_COMPLETE, ACTIVE} ;
enum STATE state = INIT;
static void tryToSend(void){
if (!rfcomm_channel_id) return;
if (real_counter < counter_to_send) return;
char lineBuffer[30];
sprintf(lineBuffer, "BTstack counter %04u\n\r", counter_to_send);
printf(lineBuffer);
int err = rfcomm_send_internal(rfcomm_channel_id, (uint8_t*) lineBuffer, strlen(lineBuffer));
switch (err){
case 0:
counter_to_send++;
break;
case BTSTACK_ACL_BUFFERS_FULL:
break;
default:
printf("rfcomm_send_internal() -> err %d\n\r", err);
break;
}
}
static uint16_t rfcomm_channel_id;
static uint8_t spp_service_buffer[150];
// Bluetooth logic
static void packet_handler (void *context, uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){
static void packet_handler (void * connection, uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){
bd_addr_t event_addr;
uint8_t rfcomm_channel_nr;
uint16_t mtu;
uint8_t event = packet[0];
// printf("packet_handler: packettype: 0x%02x, packet[0]: 0x%02x, state %u\n", packet_type, packet[0], state);
switch (packet_type) {
case HCI_EVENT_PACKET:
switch (packet[0]) {
case BTSTACK_EVENT_STATE:
// bt stack activated, get started - set local name
if (packet[2] == HCI_STATE_WORKING) {
hci_send_cmd(&hci_write_local_name, "BTstack SPP Counter");
}
break;
case HCI_EVENT_COMMAND_COMPLETE:
if (COMMAND_COMPLETE_EVENT(packet, hci_read_bd_addr)){
bt_flip_addr(event_addr, &packet[6]);
printf("BD-ADDR: %s\n\r", bd_addr_to_str(event_addr));
break;
}
if (COMMAND_COMPLETE_EVENT(packet, hci_write_local_name)){
hci_discoverable_control(1);
break;
}
break;
// handle events, ignore data
if (packet_type != HCI_EVENT_PACKET) return;
switch(state){
case INIT:
if (event != BTSTACK_EVENT_STATE) break;
printf("INIT: bt stack activated, get started, hci.state=%u \r\n", packet[2]);
// bt stack activated, get started - set local name
if (packet[2] == HCI_STATE_WORKING) {
printf("INIT: set local name - BTstack SPP Counter\r\n");
hci_send_cmd(&hci_write_local_name, "BTstack SPP Counter");
state = W4_CONNECTION;
}
break;
case W4_CONNECTION:
switch (event) {
case HCI_EVENT_LINK_KEY_REQUEST:
// deny link key request
printf("Link key request\n\r");
bt_flip_addr(event_addr, &packet[2]);
hci_send_cmd(&hci_link_key_request_negative_reply, &event_addr);
break;
case HCI_EVENT_PIN_CODE_REQUEST:
// inform about pin code request
printf("W4_CONNECTION: Pin code request - using '0000'\n\r");
printf("Pin code request - using '0000'\n\r");
bt_flip_addr(event_addr, &packet[2]);
hci_send_cmd(&hci_pin_code_request_reply, &event_addr, 4, "0000");
break;
@ -102,43 +84,30 @@ static void packet_handler (void *context, uint8_t packet_type, uint16_t channel
bt_flip_addr(event_addr, &packet[2]);
rfcomm_channel_nr = packet[8];
rfcomm_channel_id = READ_BT_16(packet, 9);
printf("W4_CONNECTION: RFCOMM channel %u requested for %s\n\r", rfcomm_channel_nr, bd_addr_to_str(event_addr));
printf("RFCOMM channel %u requested for %s\n\r", rfcomm_channel_nr, bd_addr_to_str(event_addr));
rfcomm_accept_connection_internal(rfcomm_channel_id);
state = W4_CHANNEL_COMPLETE;
break;
default:
break;
}
case W4_CHANNEL_COMPLETE:
if ( event != RFCOMM_EVENT_OPEN_CHANNEL_COMPLETE ) break;
// data: event(8), len(8), status (8), address (48), server channel(8), rfcomm_cid(16), max frame size(16)
if (packet[2]) {
printf("W4_CHANNEL_COMPLETE: RFCOMM channel open failed, status %u\n\r", packet[2]);
break;
}
rfcomm_channel_id = READ_BT_16(packet, 12);
mtu = READ_BT_16(packet, 14);
printf("\n\rW4_CHANNEL_COMPLETE: RFCOMM channel open succeeded. New RFCOMM Channel ID %u, max frame size %u\n\r", rfcomm_channel_id, mtu);
state = ACTIVE;
break;
case ACTIVE:
switch(event){
case DAEMON_EVENT_HCI_PACKET_SENT:
case RFCOMM_EVENT_CREDITS:
tryToSend();
case RFCOMM_EVENT_OPEN_CHANNEL_COMPLETE:
// data: event(8), len(8), status (8), address (48), server channel(8), rfcomm_cid(16), max frame size(16)
if (packet[2]) {
printf("RFCOMM channel open failed, status %u\n\r", packet[2]);
} else {
rfcomm_channel_id = READ_BT_16(packet, 12);
mtu = READ_BT_16(packet, 14);
printf("\n\rRFCOMM channel open succeeded. New RFCOMM Channel ID %u, max frame size %u\n\r", rfcomm_channel_id, mtu);
}
break;
case RFCOMM_EVENT_CHANNEL_CLOSED:
rfcomm_channel_id = 0;
state = W4_CONNECTION;
break;
default:
break;
}
break;
default:
break;
}
@ -149,15 +118,27 @@ static void run_loop_register_timer(timer_source_t *timer, uint16_t period){
run_loop_add_timer(timer);
}
static void heartbeat_handler(timer_source_t *ts){
static void timer_handler(timer_source_t *ts){
if (rfcomm_channel_id){
static int counter = 0;
char lineBuffer[30];
sprintf(lineBuffer, "BTstack counter %04u\n\r", ++counter);
printf(lineBuffer);
int err = rfcomm_send_internal(rfcomm_channel_id, (uint8_t*) lineBuffer, strlen(lineBuffer));
if (err) {
printf("rfcomm_send_internal -> error %d", err);
}
}
// re-register timer
real_counter++;
run_loop_register_timer(ts, HEARTBEAT_PERIOD_MS);
}
static void timer_setup(){
// set one-shot timer
heartbeat.process = &heartbeat_handler;
timer_source_t heartbeat;
heartbeat.process = &timer_handler;
run_loop_register_timer(&heartbeat, HEARTBEAT_PERIOD_MS);
}
@ -177,6 +158,9 @@ static void hw_setup(){
// init LEDs
LED_PORT_OUT |= LED_1 | LED_2;
LED_PORT_DIR |= LED_1 | LED_2;
// ready - enable irq used in h4 task
__enable_interrupt();
}
static void btstack_setup(){
@ -218,17 +202,12 @@ int main(void){
hw_setup();
btstack_setup();
timer_setup();
// ready - enable irq used in h4 task
__enable_interrupt();
printf("Run...\n\r");
// turn on!
hci_power_control(HCI_POWER_ON);
// make discoverable
hci_discoverable_control(1);
// go!
run_loop_execute();