Skip to content

Commit ae2bdc9

Browse files
KucmaszKucmasz
committed
Anjay-esp32-client 24.02
Improvements: - Cleaned up include headers Bugfixes: - Removed inappropriate mutexes in mpu6886 driver
1 parent 83e5b99 commit ae2bdc9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+283
-246
lines changed

‎CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Changelog
22

3+
## 24.02 (February 8th, 2024)
4+
5+
### Improvements
6+
- Cleaned up include headers
7+
8+
### Bugfixes
9+
- Removed inappropriate mutexes in mpu6886 driver
10+
311
## 23.11 (November 21st, 2023)
412

513
### Improvements

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2021-2023 AVSystem <[email protected]>
1+
# Copyright 2021-2024 AVSystem <[email protected]>
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2021-2023 AVSystem <[email protected]>
1+
# Copyright 2021-2024 AVSystem <[email protected]>
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎components/anjay-esp-idf

‎main/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2021-2023 AVSystem <[email protected]>
1+
# Copyright 2021-2024 AVSystem <[email protected]>
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎main/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2021-2023 AVSystem <[email protected]>
1+
# Copyright 2021-2024 AVSystem <[email protected]>
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎main/axp192.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021-2023 AVSystem <[email protected]>
2+
* Copyright 2021-2024 AVSystem <[email protected]>
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
1919
*
2020
* Copyright (c) 2020 nopnop2002
2121
* - https://github.com/nopnop2002/esp-idf-m5stickC-Plus
22-
* Copyright (c) 2021-2023 AVSystem
22+
* Copyright (c) 2021-2024 AVSystem
2323
*
2424
* Permission is hereby granted, free of charge, to any person obtaining a copy
2525
* of this software and associated documentation files (the "Software"), to deal
@@ -44,13 +44,13 @@
4444
* AXP192 Datasheet:
4545
* http://www.x-powers.com/en.php/Info/down/id/50
4646
*/
47+
#include <stdint.h>
48+
49+
#include <driver/i2c.h>
50+
4751
#include "axp192.h"
48-
#include "driver/i2c.h"
49-
#include "esp_log.h"
5052
#include "i2c_wrapper.h"
5153
#include "sdkconfig.h"
52-
#include <stdint.h>
53-
#include <string.h>
5454

5555
#if CONFIG_ANJAY_CLIENT_BOARD_M5STICKC_PLUS
5656

‎main/axp192.h

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021-2023 AVSystem <[email protected]>
2+
* Copyright 2021-2024 AVSystem <[email protected]>
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
1919
*
2020
* Copyright (c) 2020 nopnop2002
2121
* - https://github.com/nopnop2002/esp-idf-m5stickC-Plus
22-
* Copyright (c) 2021-2023 AVSystem
22+
* Copyright (c) 2021-2024 AVSystem
2323
*
2424
* Permission is hereby granted, free of charge, to any person obtaining a copy
2525
* of this software and associated documentation files (the "Software"), to deal
@@ -46,9 +46,10 @@
4646
* AXP192 Datasheet:
4747
* http://www.x-powers.com/en.php/Info/down/id/50
4848
*/
49-
#include "sdkconfig.h"
5049
#include <stdint.h>
5150

51+
#include "sdkconfig.h"
52+
5253
#if CONFIG_ANJAY_CLIENT_BOARD_M5STICKC_PLUS
5354

5455
int AXP192_PowerOn(void);

‎main/bmpfile.h

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021-2023 AVSystem <[email protected]>
2+
* Copyright 2021-2024 AVSystem <[email protected]>
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
1919
*
2020
* Copyright (c) 2020 nopnop2002
2121
* - https://github.com/nopnop2002/esp-idf-m5stickC-Plus
22-
* Copyright (c) 2021-2023 AVSystem
22+
* Copyright (c) 2021-2024 AVSystem
2323
*
2424
* Permission is hereby granted, free of charge, to any person obtaining a copy
2525
* of this software and associated documentation files (the "Software"), to deal
@@ -42,10 +42,11 @@
4242
#ifndef _BMPFILE_H_
4343
#define _BMPFILE_H_
4444

45-
#include "sdkconfig.h"
4645
#include <stdint.h>
4746

48-
#if CONFIG_ANJAY_CLIENT_LCD
47+
#include "sdkconfig.h"
48+
49+
#ifdef CONFIG_ANJAY_CLIENT_LCD
4950

5051
# pragma pack(push, 1)
5152
typedef struct {

‎main/cellular_anjay_impl/cellular_event_loop.c

+13-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021-2023 AVSystem <[email protected]>
2+
* Copyright 2021-2024 AVSystem <[email protected]>
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -14,11 +14,20 @@
1414
* limitations under the License.
1515
*/
1616

17-
#include "cellular_event_loop.h"
18-
#include "cellular_anjay_impl/net_impl.h"
19-
#include <avsystem/commons/avs_log.h>
2017
#include <stdatomic.h>
2118

19+
#include <freertos/FreeRTOS.h>
20+
#include <freertos/task.h>
21+
22+
#include <avsystem/commons/avs_list.h>
23+
#include <avsystem/commons/avs_log.h>
24+
#include <avsystem/commons/avs_socket.h>
25+
26+
#include <anjay/anjay.h>
27+
28+
#include "cellular_event_loop.h"
29+
#include "net_impl.h"
30+
2231
#define CELLULAR_EVENT_LOOP_MAX_WAIT_TIME 100
2332

2433
static volatile atomic_bool event_loop_status;

‎main/cellular_anjay_impl/cellular_event_loop.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021-2023 AVSystem <[email protected]>
2+
* Copyright 2021-2024 AVSystem <[email protected]>
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎main/cellular_anjay_impl/net_impl.c

+16-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021-2023 AVSystem <[email protected]>
2+
* Copyright 2021-2024 AVSystem <[email protected]>
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -13,18 +13,30 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
17+
#include <inttypes.h>
1618
#include <netdb.h>
17-
#include <unistd.h>
19+
#include <stdbool.h>
20+
#include <stddef.h>
21+
#include <stdint.h>
22+
#include <string.h>
1823

1924
#include <sys/socket.h>
2025
#include <sys/types.h>
2126

22-
#include "cellular_setup.h"
23-
#include "main.h"
27+
#include <freertos/FreeRTOS.h>
28+
#include <freertos/event_groups.h>
29+
30+
#include <avsystem/commons/avs_errno.h>
2431
#include <avsystem/commons/avs_log.h>
2532
#include <avsystem/commons/avs_socket_v_table.h>
33+
#include <avsystem/commons/avs_time.h>
2634
#include <avsystem/commons/avs_utils.h>
2735

36+
#include <cellular_common.h>
37+
#include <cellular_setup.h>
38+
#include <sockets_wrapper.h>
39+
2840
#include "net_impl.h"
2941

3042
#define QIRD_COMMA_COUNT 2U

‎main/cellular_anjay_impl/net_impl.h

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021-2023 AVSystem <[email protected]>
2+
* Copyright 2021-2024 AVSystem <[email protected]>
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,11 +16,13 @@
1616
#ifndef NET_IMPL_H
1717
#define NET_IMPL_H
1818

19+
#include <stdbool.h>
20+
#include <stdint.h>
21+
1922
#include <avsystem/commons/avs_errno.h>
2023
#include <avsystem/commons/avs_socket.h>
2124

22-
#include "cellular_common.h"
23-
#include "sockets_wrapper.h"
25+
#include <cellular_common.h>
2426

2527
extern CellularHandle_t CellularHandle;
2628
extern uint8_t CellularSocketPdnContextId;

‎main/component.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2021-2023 AVSystem <[email protected]>
1+
# Copyright 2021-2024 AVSystem <[email protected]>
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎main/connect.c

+17-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021-2023 AVSystem <[email protected]>
2+
* Copyright 2021-2024 AVSystem <[email protected]>
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -23,19 +23,25 @@
2323
CONDITIONS OF ANY KIND, either express or implied.
2424
*/
2525

26-
#include "driver/gpio.h"
27-
#include "esp_event.h"
28-
#include "esp_netif.h"
29-
#include "esp_wifi_default.h"
30-
#include "freertos/FreeRTOS.h"
31-
#include "freertos/event_groups.h"
32-
#include "freertos/task.h"
33-
#include "lwip/err.h"
34-
#include "lwip/sys.h"
35-
#include "sdkconfig.h"
26+
#include <stdbool.h>
27+
#include <stdint.h>
3628
#include <string.h>
3729

30+
#include <freertos/FreeRTOS.h>
31+
#include <freertos/semphr.h>
32+
33+
#include <esp_err.h>
34+
#include <esp_event.h>
35+
#include <esp_log.h>
36+
#include <esp_netif.h>
37+
#include <esp_netif_ip_addr.h>
38+
#include <esp_netif_types.h>
39+
#include <esp_wifi.h>
40+
#include <esp_wifi_default.h>
41+
#include <esp_wifi_types.h>
42+
3843
#include "connect.h"
44+
#include "sdkconfig.h"
3945

4046
static wifi_config_t wifi_config;
4147

‎main/connect.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021-2023 AVSystem <[email protected]>
2+
* Copyright 2021-2024 AVSystem <[email protected]>
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@
1717
#ifndef _CONNECT_H_
1818
#define _CONNECT_H_
1919

20-
#include "esp_log.h"
21-
#include "esp_wifi.h"
20+
#include <esp_err.h>
21+
#include <esp_wifi.h>
2222

2323
void wifi_initialize(void);
2424
esp_err_t wifi_connect(wifi_config_t *conf);

‎main/default_config.h.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021-2023 AVSystem <[email protected]>
2+
* Copyright 2021-2024 AVSystem <[email protected]>
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)