WIP: New BLE
This commit is contained in:
parent
4fe072f2d3
commit
a9212c5a3a
12 changed files with 191 additions and 56 deletions
|
@ -147,7 +147,7 @@ void BLE_UpdateInstigationPacket(uint32_t Game_Length_in_ms, uint32_t Time_Remai
|
|||
}
|
||||
}
|
||||
|
||||
void BLE_UpdateStatusPacket()
|
||||
void BLE_UpdateStatusPacket(uint8_t current_state)
|
||||
{
|
||||
static uint8_t EventNumber = 0;
|
||||
|
||||
|
@ -190,7 +190,7 @@ void BLE_UpdateStatusPacket()
|
|||
Advertising_Data.data[23] = (Team_Color >> 8) & 0xFF; // Secondary Color
|
||||
Advertising_Data.data[24] = (Team_Color >> 16) & 0xFF; // Secondary Color
|
||||
Advertising_Data.data[25] = (Team_Color >> 24) & 0xFF; // Secondary Color
|
||||
Advertising_Data.data[26] = 0xFF;
|
||||
Advertising_Data.data[26] = current_state;
|
||||
Advertising_Data.data[27] = 0xFF;
|
||||
Advertising_Data.data[28] = 0xFF;
|
||||
Advertising_Data.data[29] = 0xFF;
|
||||
|
@ -237,12 +237,12 @@ void BLE_UpdateTagPacket(int16_t damage, color_t color, uint8_t target_BD_ADDR[B
|
|||
Advertising_Data.data[17] = (color >> 8) & 0xFF;
|
||||
Advertising_Data.data[18] = (color >> 16) & 0xFF;
|
||||
Advertising_Data.data[19] = (color >> 24) & 0xFF;
|
||||
Advertising_Data.data[20] = target_BD_ADDR[0],
|
||||
Advertising_Data.data[21] = target_BD_ADDR[1],
|
||||
Advertising_Data.data[22] = target_BD_ADDR[2],
|
||||
Advertising_Data.data[23] = target_BD_ADDR[3],
|
||||
Advertising_Data.data[24] = target_BD_ADDR[4],
|
||||
Advertising_Data.data[25] = target_BD_ADDR[5],
|
||||
Advertising_Data.data[20] = target_BD_ADDR[0];
|
||||
Advertising_Data.data[21] = target_BD_ADDR[1];
|
||||
Advertising_Data.data[22] = target_BD_ADDR[2];
|
||||
Advertising_Data.data[23] = target_BD_ADDR[3];
|
||||
Advertising_Data.data[24] = target_BD_ADDR[4];
|
||||
Advertising_Data.data[25] = target_BD_ADDR[5];
|
||||
Advertising_Data.data[26] = 0xFF;
|
||||
Advertising_Data.data[27] = 0xFF;
|
||||
Advertising_Data.data[28] = 0xFF;
|
||||
|
@ -257,6 +257,74 @@ void BLE_UpdateTagPacket(int16_t damage, color_t color, uint8_t target_BD_ADDR[B
|
|||
}
|
||||
}
|
||||
|
||||
void BLE_UpdateHelloPacket()
|
||||
{
|
||||
static uint8_t EventNumber = 0;
|
||||
|
||||
uint32_t device_type32;
|
||||
uint16_t device_type = BLE_DEVICE_TYPE_UNKNOWN;
|
||||
if (SETTINGS_get_uint32_t(SYSTEMK_SETTING_DEVICE_TYPE, &device_type32) == SYSTEMK_RESULT_SUCCESS)
|
||||
{
|
||||
device_type = (uint16_t)device_type32;
|
||||
}
|
||||
|
||||
uint8_t team_ID;
|
||||
(void) SETTINGS_get_uint8_t(SYSTEMK_SETTING_TEAMID, &team_ID);
|
||||
|
||||
char device_name[SYSTEMK_MAX_CHARS_IN_DEVICE_NAME + 1];
|
||||
SystemKResult_T result = SETTINGS_get_device_name(&device_name[0]);
|
||||
if (result != SYSTEMK_RESULT_SUCCESS)
|
||||
{
|
||||
strcpy(device_name, "Anonymous");
|
||||
}
|
||||
size_t len = strlen(device_name);
|
||||
if (len < sizeof(device_name)) {
|
||||
memset(device_name + len, 0x00, sizeof(device_name) - len);
|
||||
}
|
||||
|
||||
Advertising_Data.length = BLE_KTAG_PACKET_TOTAL_SIZE;
|
||||
|
||||
// Manufacturer Specific Data
|
||||
Advertising_Data.data[0] = 0x1E;
|
||||
Advertising_Data.data[1] = 0xFF;
|
||||
Advertising_Data.data[2] = 0xFF;
|
||||
Advertising_Data.data[3] = 0xFF;
|
||||
Advertising_Data.data[4] = 'K';
|
||||
Advertising_Data.data[5] = 'T';
|
||||
Advertising_Data.data[6] = 'a';
|
||||
Advertising_Data.data[7] = 'g';
|
||||
Advertising_Data.data[8] = BLE_PACKET_TYPE_HELLO;
|
||||
Advertising_Data.data[9] = EventNumber++;
|
||||
Advertising_Data.data[10] = SYSTEMK_MAJOR_VERSION;
|
||||
Advertising_Data.data[11] = SYSTEMK_MINOR_VERSION;
|
||||
Advertising_Data.data[12] = (device_type >> 0) & 0xFF;
|
||||
Advertising_Data.data[13] = (device_type >> 8) & 0xFF;
|
||||
Advertising_Data.data[14] = team_ID;
|
||||
Advertising_Data.data[15] = device_name[0];
|
||||
Advertising_Data.data[16] = device_name[1];
|
||||
Advertising_Data.data[17] = device_name[2];
|
||||
Advertising_Data.data[18] = device_name[3];
|
||||
Advertising_Data.data[19] = device_name[4];
|
||||
Advertising_Data.data[20] = device_name[5];
|
||||
Advertising_Data.data[21] = device_name[6];
|
||||
Advertising_Data.data[22] = device_name[7];
|
||||
Advertising_Data.data[23] = device_name[8];
|
||||
Advertising_Data.data[24] = device_name[9];
|
||||
Advertising_Data.data[25] = device_name[10];
|
||||
Advertising_Data.data[26] = device_name[11];
|
||||
Advertising_Data.data[27] = device_name[12];
|
||||
Advertising_Data.data[28] = device_name[13];
|
||||
Advertising_Data.data[29] = device_name[14];
|
||||
Advertising_Data.data[30] = device_name[15];
|
||||
|
||||
result = BLE_SetAdvertisingData(&Advertising_Data);
|
||||
|
||||
if (result != SYSTEMK_RESULT_SUCCESS)
|
||||
{
|
||||
KLOG_ERROR(KLOG_TAG, "Error updating hello packet!");
|
||||
}
|
||||
}
|
||||
|
||||
bool BLE_IsBLEPacketForMe(const uint8_t BD_ADDR[6])
|
||||
{
|
||||
bool for_me = false;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue