Skip to content

Commit

Permalink
Merge branch 'feature/c5_support' into 'master'
Browse files Browse the repository at this point in the history 
feature/c5_support Added C5 support as Hosted Slave

See merge request app-frameworks/esp_hosted!507
  • Loading branch information
@mantriyogesh
mantriyogesh committed Sep 19, 2024
2 parents ce00ca5 + 488a063 commit 9f809ff
Show file tree
Hide file tree
Showing 22 changed files with 363 additions and 68 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ Following table summarizes this entire discussion.
</tr>
<tr>
<td>Chipsets supported</td>
<td>ESP32, <span>ESP32-C2/C3/C6/S2/S3</span></td>
<td>ESP32, <span>ESP32-C2/C3/C5/C6/S2/S3</span></td>
<td>ESP32, <span>ESP32-C2/C3/C6/S2/S3</span></td>
</tr>
</table>
Expand Down
5 changes: 2 additions & 3 deletions esp_hosted_fg/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,8 @@ ESP-Hosted-FG solution provides following WLAN and BT/BLE features to the host:

ESP-Hosted-FG solution is supported on following ESP boards:

| Supported Targets | ESP32 | ESP32-S2 | ESP32-S3 | ESP32-C2 | ESP32-C3 | ESP32-C6 |
| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- |

| Supported Targets | ESP32 | ESP32-S2 | ESP32-S3 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 |
| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |

### 1.3 Supported Hosts

Expand Down
114 changes: 96 additions & 18 deletions esp_hosted_fg/common/esp_hosted_config.pb-c.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2795,7 +2795,7 @@ const ProtobufCMessageDescriptor ctrl_msg__req__get_apconfig__descriptor =
(ProtobufCMessageInit) ctrl_msg__req__get_apconfig__init,
NULL,NULL,NULL /* reserved[123] */
};
static const ProtobufCFieldDescriptor ctrl_msg__resp__get_apconfig__field_descriptors[6] =
static const ProtobufCFieldDescriptor ctrl_msg__resp__get_apconfig__field_descriptors[7] =
{
{
"ssid",
Expand Down Expand Up @@ -2869,8 +2869,21 @@ static const ProtobufCFieldDescriptor ctrl_msg__resp__get_apconfig__field_descri
0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"band_mode",
7,
PROTOBUF_C_LABEL_NONE,
PROTOBUF_C_TYPE_INT32,
0, /* quantifier_offset */
offsetof(CtrlMsgRespGetAPConfig, band_mode),
NULL,
NULL,
0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
};
static const unsigned ctrl_msg__resp__get_apconfig__field_indices_by_name[] = {
6, /* field[6] = band_mode */
1, /* field[1] = bssid */
3, /* field[3] = chnl */
5, /* field[5] = resp */
Expand All @@ -2881,7 +2894,7 @@ static const unsigned ctrl_msg__resp__get_apconfig__field_indices_by_name[] = {
static const ProtobufCIntRange ctrl_msg__resp__get_apconfig__number_ranges[1 + 1] =
{
{ 1, 0 },
{ 0, 6 }
{ 0, 7 }
};
const ProtobufCMessageDescriptor ctrl_msg__resp__get_apconfig__descriptor =
{
Expand All @@ -2891,14 +2904,14 @@ const ProtobufCMessageDescriptor ctrl_msg__resp__get_apconfig__descriptor =
"CtrlMsgRespGetAPConfig",
"",
sizeof(CtrlMsgRespGetAPConfig),
6,
7,
ctrl_msg__resp__get_apconfig__field_descriptors,
ctrl_msg__resp__get_apconfig__field_indices_by_name,
1, ctrl_msg__resp__get_apconfig__number_ranges,
(ProtobufCMessageInit) ctrl_msg__resp__get_apconfig__init,
NULL,NULL,NULL /* reserved[123] */
};
static const ProtobufCFieldDescriptor ctrl_msg__req__connect_ap__field_descriptors[5] =
static const ProtobufCFieldDescriptor ctrl_msg__req__connect_ap__field_descriptors[6] =
{
{
"ssid",
Expand Down Expand Up @@ -2960,8 +2973,21 @@ static const ProtobufCFieldDescriptor ctrl_msg__req__connect_ap__field_descripto
0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"band_mode",
6,
PROTOBUF_C_LABEL_NONE,
PROTOBUF_C_TYPE_INT32,
0, /* quantifier_offset */
offsetof(CtrlMsgReqConnectAP, band_mode),
NULL,
NULL,
0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
};
static const unsigned ctrl_msg__req__connect_ap__field_indices_by_name[] = {
5, /* field[5] = band_mode */
2, /* field[2] = bssid */
3, /* field[3] = is_wpa3_supported */
4, /* field[4] = listen_interval */
Expand All @@ -2971,7 +2997,7 @@ static const unsigned ctrl_msg__req__connect_ap__field_indices_by_name[] = {
static const ProtobufCIntRange ctrl_msg__req__connect_ap__number_ranges[1 + 1] =
{
{ 1, 0 },
{ 0, 5 }
{ 0, 6 }
};
const ProtobufCMessageDescriptor ctrl_msg__req__connect_ap__descriptor =
{
Expand All @@ -2981,14 +3007,14 @@ const ProtobufCMessageDescriptor ctrl_msg__req__connect_ap__descriptor =
"CtrlMsgReqConnectAP",
"",
sizeof(CtrlMsgReqConnectAP),
5,
6,
ctrl_msg__req__connect_ap__field_descriptors,
ctrl_msg__req__connect_ap__field_indices_by_name,
1, ctrl_msg__req__connect_ap__number_ranges,
(ProtobufCMessageInit) ctrl_msg__req__connect_ap__init,
NULL,NULL,NULL /* reserved[123] */
};
static const ProtobufCFieldDescriptor ctrl_msg__resp__connect_ap__field_descriptors[2] =
static const ProtobufCFieldDescriptor ctrl_msg__resp__connect_ap__field_descriptors[3] =
{
{
"resp",
Expand All @@ -3014,15 +3040,28 @@ static const ProtobufCFieldDescriptor ctrl_msg__resp__connect_ap__field_descript
0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"band_mode",
3,
PROTOBUF_C_LABEL_NONE,
PROTOBUF_C_TYPE_INT32,
0, /* quantifier_offset */
offsetof(CtrlMsgRespConnectAP, band_mode),
NULL,
NULL,
0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
};
static const unsigned ctrl_msg__resp__connect_ap__field_indices_by_name[] = {
2, /* field[2] = band_mode */
1, /* field[1] = mac */
0, /* field[0] = resp */
};
static const ProtobufCIntRange ctrl_msg__resp__connect_ap__number_ranges[1 + 1] =
{
{ 1, 0 },
{ 0, 2 }
{ 0, 3 }
};
const ProtobufCMessageDescriptor ctrl_msg__resp__connect_ap__descriptor =
{
Expand All @@ -3032,7 +3071,7 @@ const ProtobufCMessageDescriptor ctrl_msg__resp__connect_ap__descriptor =
"CtrlMsgRespConnectAP",
"",
sizeof(CtrlMsgRespConnectAP),
2,
3,
ctrl_msg__resp__connect_ap__field_descriptors,
ctrl_msg__resp__connect_ap__field_indices_by_name,
1, ctrl_msg__resp__connect_ap__number_ranges,
Expand All @@ -3057,7 +3096,7 @@ const ProtobufCMessageDescriptor ctrl_msg__req__get_soft_apconfig__descriptor =
(ProtobufCMessageInit) ctrl_msg__req__get_soft_apconfig__init,
NULL,NULL,NULL /* reserved[123] */
};
static const ProtobufCFieldDescriptor ctrl_msg__resp__get_soft_apconfig__field_descriptors[8] =
static const ProtobufCFieldDescriptor ctrl_msg__resp__get_soft_apconfig__field_descriptors[9] =
{
{
"ssid",
Expand Down Expand Up @@ -3155,8 +3194,21 @@ static const ProtobufCFieldDescriptor ctrl_msg__resp__get_soft_apconfig__field_d
0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"band_mode",
9,
PROTOBUF_C_LABEL_NONE,
PROTOBUF_C_TYPE_INT32,
0, /* quantifier_offset */
offsetof(CtrlMsgRespGetSoftAPConfig, band_mode),
NULL,
NULL,
0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
};
static const unsigned ctrl_msg__resp__get_soft_apconfig__field_indices_by_name[] = {
8, /* field[8] = band_mode */
6, /* field[6] = bw */
2, /* field[2] = chnl */
4, /* field[4] = max_conn */
Expand All @@ -3169,7 +3221,7 @@ static const unsigned ctrl_msg__resp__get_soft_apconfig__field_indices_by_name[]
static const ProtobufCIntRange ctrl_msg__resp__get_soft_apconfig__number_ranges[1 + 1] =
{
{ 1, 0 },
{ 0, 8 }
{ 0, 9 }
};
const ProtobufCMessageDescriptor ctrl_msg__resp__get_soft_apconfig__descriptor =
{
Expand All @@ -3179,14 +3231,14 @@ const ProtobufCMessageDescriptor ctrl_msg__resp__get_soft_apconfig__descriptor =
"CtrlMsgRespGetSoftAPConfig",
"",
sizeof(CtrlMsgRespGetSoftAPConfig),
8,
9,
ctrl_msg__resp__get_soft_apconfig__field_descriptors,
ctrl_msg__resp__get_soft_apconfig__field_indices_by_name,
1, ctrl_msg__resp__get_soft_apconfig__number_ranges,
(ProtobufCMessageInit) ctrl_msg__resp__get_soft_apconfig__init,
NULL,NULL,NULL /* reserved[123] */
};
static const ProtobufCFieldDescriptor ctrl_msg__req__start_soft_ap__field_descriptors[7] =
static const ProtobufCFieldDescriptor ctrl_msg__req__start_soft_ap__field_descriptors[8] =
{
{
"ssid",
Expand Down Expand Up @@ -3272,8 +3324,21 @@ static const ProtobufCFieldDescriptor ctrl_msg__req__start_soft_ap__field_descri
0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"band_mode",
8,
PROTOBUF_C_LABEL_NONE,
PROTOBUF_C_TYPE_INT32,
0, /* quantifier_offset */
offsetof(CtrlMsgReqStartSoftAP, band_mode),
NULL,
NULL,
0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
};
static const unsigned ctrl_msg__req__start_soft_ap__field_indices_by_name[] = {
7, /* field[7] = band_mode */
6, /* field[6] = bw */
2, /* field[2] = chnl */
4, /* field[4] = max_conn */
Expand All @@ -3285,7 +3350,7 @@ static const unsigned ctrl_msg__req__start_soft_ap__field_indices_by_name[] = {
static const ProtobufCIntRange ctrl_msg__req__start_soft_ap__number_ranges[1 + 1] =
{
{ 1, 0 },
{ 0, 7 }
{ 0, 8 }
};
const ProtobufCMessageDescriptor ctrl_msg__req__start_soft_ap__descriptor =
{
Expand All @@ -3295,14 +3360,14 @@ const ProtobufCMessageDescriptor ctrl_msg__req__start_soft_ap__descriptor =
"CtrlMsgReqStartSoftAP",
"",
sizeof(CtrlMsgReqStartSoftAP),
7,
8,
ctrl_msg__req__start_soft_ap__field_descriptors,
ctrl_msg__req__start_soft_ap__field_indices_by_name,
1, ctrl_msg__req__start_soft_ap__number_ranges,
(ProtobufCMessageInit) ctrl_msg__req__start_soft_ap__init,
NULL,NULL,NULL /* reserved[123] */
};
static const ProtobufCFieldDescriptor ctrl_msg__resp__start_soft_ap__field_descriptors[2] =
static const ProtobufCFieldDescriptor ctrl_msg__resp__start_soft_ap__field_descriptors[3] =
{
{
"resp",
Expand All @@ -3328,15 +3393,28 @@ static const ProtobufCFieldDescriptor ctrl_msg__resp__start_soft_ap__field_descr
0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"band_mode",
3,
PROTOBUF_C_LABEL_NONE,
PROTOBUF_C_TYPE_INT32,
0, /* quantifier_offset */
offsetof(CtrlMsgRespStartSoftAP, band_mode),
NULL,
NULL,
0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
};
static const unsigned ctrl_msg__resp__start_soft_ap__field_indices_by_name[] = {
2, /* field[2] = band_mode */
1, /* field[1] = mac */
0, /* field[0] = resp */
};
static const ProtobufCIntRange ctrl_msg__resp__start_soft_ap__number_ranges[1 + 1] =
{
{ 1, 0 },
{ 0, 2 }
{ 0, 3 }
};
const ProtobufCMessageDescriptor ctrl_msg__resp__start_soft_ap__descriptor =
{
Expand All @@ -3346,7 +3424,7 @@ const ProtobufCMessageDescriptor ctrl_msg__resp__start_soft_ap__descriptor =
"CtrlMsgRespStartSoftAP",
"",
sizeof(CtrlMsgRespStartSoftAP),
2,
3,
ctrl_msg__resp__start_soft_ap__field_descriptors,
ctrl_msg__resp__start_soft_ap__field_indices_by_name,
1, ctrl_msg__resp__start_soft_ap__number_ranges,
Expand Down
18 changes: 12 additions & 6 deletions esp_hosted_fg/common/include/esp_hosted_config.pb-c.h
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 9f809ff

Please sign in to comment.