Skip to content

Commit b71cbc3

Browse files
feat(fw): minino compiles with zigbee and thread
1 parent 8db19a3 commit b71cbc3

File tree

17 files changed

+66
-63
lines changed

17 files changed

+66
-63
lines changed

firmware/components/ieee802154/driver/esp_ieee802154_dev.c

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1092,19 +1092,23 @@ static esp_err_t ieee802154_sleep_init(void) {
10921092
esp_err_t err = ESP_OK;
10931093
#if SOC_PM_MODEM_RETENTION_BY_REGDMA && CONFIG_FREERTOS_USE_TICKLESS_IDLE
10941094
sleep_retention_module_init_param_t init_param = {
1095-
.cbs = {
1096-
.create = {
1097-
.handle = ieee802154_sleep_retention_init,
1098-
.arg = NULL,
1099-
},
1100-
},
1101-
.attribute = 0, // Si no usas atributos
1102-
.depends = {
1103-
.bitmap = {
1104-
BIT(SLEEP_RETENTION_MODULE_BT_BB) |
1105-
BIT(SLEEP_RETENTION_MODULE_CLOCK_MODEM),
1106-
},
1107-
},
1095+
.cbs =
1096+
{
1097+
.create =
1098+
{
1099+
.handle = ieee802154_sleep_retention_init,
1100+
.arg = NULL,
1101+
},
1102+
},
1103+
.attribute = 0, // Si no usas atributos
1104+
.depends =
1105+
{
1106+
.bitmap =
1107+
{
1108+
BIT(SLEEP_RETENTION_MODULE_BT_BB) |
1109+
BIT(SLEEP_RETENTION_MODULE_CLOCK_MODEM),
1110+
},
1111+
},
11081112
};
11091113

11101114
err = sleep_retention_module_init(SLEEP_RETENTION_MODULE_802154_MAC,

firmware/components/ieee_sniffer/ieee_sniffer.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ int8_t ieee_sniffer_get_rssi() {
4545
return esp_ieee802154_get_recent_rssi();
4646
}
4747

48-
void ieee_sniffer_set_channel(int channel) {
48+
void ieee_sniffer_set_channel(uint8_t channel) {
4949
current_channel = channel;
5050
if (channel < IEEE_SNIFFER_CHANNEL_MIN) {
5151
current_channel = IEEE_SNIFFER_CHANNEL_MAX;
@@ -105,7 +105,7 @@ static void ieee_sniffer_configure() {
105105
ESP_ERROR_CHECK(esp_ieee802154_receive());
106106
}
107107

108-
void ieee_sniffer_begin(void) {
108+
void ieee_sniffer_begin(void* args) {
109109
running = true;
110110
ieee_sniffer_configure();
111111
while (running) {
@@ -146,7 +146,7 @@ static void debug_handler_task(void* pvParameters) {
146146
uint8_t packet[257];
147147
while (xQueueReceive(packet_rx_queue, packet, portMAX_DELAY) == pdTRUE) {
148148
if (packet_callback) {
149-
packet_callback(&packet[1], packet[0]);
149+
packet_callback(&packet[1], packet[0]);
150150
}
151151
// debug_print_packet(&packet[1], packet[0]);
152152
}

firmware/components/ieee_sniffer/ieee_sniffer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ void ieee_sniffer_register_cb(ieee_sniffer_cb_t callback);
6666
/**
6767
* @brief Begin the IEEE sniffer
6868
*/
69-
void ieee_sniffer_begin(void);
69+
void ieee_sniffer_begin(void* args);
7070

7171
/**
7272
* @brief Stop the IEEE sniffer
@@ -78,7 +78,7 @@ void ieee_sniffer_stop(void);
7878
*
7979
* @param channel The channel to set
8080
*/
81-
void ieee_sniffer_set_channel(int channel);
81+
void ieee_sniffer_set_channel(uint8_t channel);
8282

8383
uint8_t ieee_sniffer_get_channel();
8484
int8_t ieee_sniffer_get_rssi();

firmware/components/thread_broadcast/include/thread_broadcast.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#define PORT 12345
77

8-
typedef void (*on_msg_recieve_cb_t)(otMessage*, const otMessageInfo*);
8+
typedef void (*on_msg_recieve_cb_t)(char* msg);
99

1010
void thread_broadcast_init();
1111
void thread_broadcast_deinit();

firmware/components/thread_broadcast/thread_broadcast.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ void on_udp_recieve(void* aContext,
2424
printf("MSG\n");
2525
printf("%s\n", str);
2626
if (on_msg_recieve_cb != NULL) {
27-
on_msg_recieve_cb(aMessage, aMessageInfo);
27+
on_msg_recieve_cb(str);
2828
}
2929
free(str);
3030
free(data);

firmware/main/apps/ble/hid_device/hid_module.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#include "hid_module.h"
2-
#include "hid_screens.h"
32
#include "ble_hidd_main.h"
43
#include "esp_log.h"
54
#include "esp_mac.h"
65
#include "general_submenu.h"
6+
#include "hid_screens.h"
77
#include "menus_module.h"
88

99
static uint16_t current_item = 0;

firmware/main/apps/ble/hid_device/hid_screens.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#include <stdint.h>
33
#include <string.h>
44
#include "animations_task.h"
5-
#include "freertos/FreeRTOS.h"
65
#include "bitmaps_general.h"
6+
#include "freertos/FreeRTOS.h"
77
#include "led_events.h"
88
#include "oled_screen.h"
99

firmware/main/apps/ble/spam/spam_module.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#include "spam_module.h"
22
#include "animations_task.h"
3-
#include "spam_screens.h"
43
#include "bt_spam.h"
54
#include "esp_log.h"
65
#include "led_events.h"
76
#include "menus_module.h"
87
#include "oled_screen.h"
8+
#include "spam_screens.h"
99

1010
static void ble_module_state_machine(uint8_t button_name, uint8_t button_event);
1111

firmware/main/apps/ble/trackers/trackers_module.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include "trackers_module.h"
2-
#include "trackers_screens.h"
32
#include "esp_log.h"
43
#include "menus_module.h"
54
#include "trackers_scanner.h"
5+
#include "trackers_screens.h"
66

77
static uint16_t current_item = 0;
88
static uint16_t trackers_count = 0;

firmware/main/apps/ble/trackers/trackers_screens.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#include <stdint.h>
33
#include <string.h>
44
#include "animations_task.h"
5-
#include "freertos/FreeRTOS.h"
65
#include "bitmaps_general.h"
6+
#include "freertos/FreeRTOS.h"
77
#include "general_screens.h"
88
#include "led_events.h"
99
#include "oled_screen.h"

0 commit comments

Comments
 (0)