Skip to content

Commit

Permalink
Anjay-esp32-client 24.02
Browse files Browse the repository at this point in the history
Improvements:
- Cleaned up include headers

Bugfixes:
- Removed inappropriate mutexes in mpu6886 driver
  • Loading branch information
Kucmasz committed Feb 8, 2024
1 parent 83e5b99 commit ae2bdc9
Show file tree
Hide file tree
Showing 41 changed files with 283 additions and 246 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## 24.02 (February 8th, 2024)

### Improvements
- Cleaned up include headers

### Bugfixes
- Removed inappropriate mutexes in mpu6886 driver

## 23.11 (November 21st, 2023)

### Improvements
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2021-2023 AVSystem <[email protected]>
# Copyright 2021-2024 AVSystem <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2021-2023 AVSystem <[email protected]>
# Copyright 2021-2024 AVSystem <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion components/anjay-esp-idf
2 changes: 1 addition & 1 deletion main/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2021-2023 AVSystem <[email protected]>
# Copyright 2021-2024 AVSystem <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion main/Kconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2021-2023 AVSystem <[email protected]>
# Copyright 2021-2024 AVSystem <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
12 changes: 6 additions & 6 deletions main/axp192.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2021-2023 AVSystem <[email protected]>
* Copyright 2021-2024 AVSystem <[email protected]>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -19,7 +19,7 @@
*
* Copyright (c) 2020 nopnop2002
* - https://github.com/nopnop2002/esp-idf-m5stickC-Plus
* Copyright (c) 2021-2023 AVSystem
* Copyright (c) 2021-2024 AVSystem
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand All @@ -44,13 +44,13 @@
* AXP192 Datasheet:
* http://www.x-powers.com/en.php/Info/down/id/50
*/
#include <stdint.h>

#include <driver/i2c.h>

#include "axp192.h"
#include "driver/i2c.h"
#include "esp_log.h"
#include "i2c_wrapper.h"
#include "sdkconfig.h"
#include <stdint.h>
#include <string.h>

#if CONFIG_ANJAY_CLIENT_BOARD_M5STICKC_PLUS

Expand Down
7 changes: 4 additions & 3 deletions main/axp192.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2021-2023 AVSystem <[email protected]>
* Copyright 2021-2024 AVSystem <[email protected]>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -19,7 +19,7 @@
*
* Copyright (c) 2020 nopnop2002
* - https://github.com/nopnop2002/esp-idf-m5stickC-Plus
* Copyright (c) 2021-2023 AVSystem
* Copyright (c) 2021-2024 AVSystem
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand All @@ -46,9 +46,10 @@
* AXP192 Datasheet:
* http://www.x-powers.com/en.php/Info/down/id/50
*/
#include "sdkconfig.h"
#include <stdint.h>

#include "sdkconfig.h"

#if CONFIG_ANJAY_CLIENT_BOARD_M5STICKC_PLUS

int AXP192_PowerOn(void);
Expand Down
9 changes: 5 additions & 4 deletions main/bmpfile.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2021-2023 AVSystem <[email protected]>
* Copyright 2021-2024 AVSystem <[email protected]>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -19,7 +19,7 @@
*
* Copyright (c) 2020 nopnop2002
* - https://github.com/nopnop2002/esp-idf-m5stickC-Plus
* Copyright (c) 2021-2023 AVSystem
* Copyright (c) 2021-2024 AVSystem
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand All @@ -42,10 +42,11 @@
#ifndef _BMPFILE_H_
#define _BMPFILE_H_

#include "sdkconfig.h"
#include <stdint.h>

#if CONFIG_ANJAY_CLIENT_LCD
#include "sdkconfig.h"

#ifdef CONFIG_ANJAY_CLIENT_LCD

# pragma pack(push, 1)
typedef struct {
Expand Down
17 changes: 13 additions & 4 deletions main/cellular_anjay_impl/cellular_event_loop.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2021-2023 AVSystem <[email protected]>
* Copyright 2021-2024 AVSystem <[email protected]>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -14,11 +14,20 @@
* limitations under the License.
*/

#include "cellular_event_loop.h"
#include "cellular_anjay_impl/net_impl.h"
#include <avsystem/commons/avs_log.h>
#include <stdatomic.h>

#include <freertos/FreeRTOS.h>
#include <freertos/task.h>

#include <avsystem/commons/avs_list.h>
#include <avsystem/commons/avs_log.h>
#include <avsystem/commons/avs_socket.h>

#include <anjay/anjay.h>

#include "cellular_event_loop.h"
#include "net_impl.h"

#define CELLULAR_EVENT_LOOP_MAX_WAIT_TIME 100

static volatile atomic_bool event_loop_status;
Expand Down
2 changes: 1 addition & 1 deletion main/cellular_anjay_impl/cellular_event_loop.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2021-2023 AVSystem <[email protected]>
* Copyright 2021-2024 AVSystem <[email protected]>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
20 changes: 16 additions & 4 deletions main/cellular_anjay_impl/net_impl.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2021-2023 AVSystem <[email protected]>
* Copyright 2021-2024 AVSystem <[email protected]>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -13,18 +13,30 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include <inttypes.h>
#include <netdb.h>
#include <unistd.h>
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
#include <string.h>

#include <sys/socket.h>
#include <sys/types.h>

#include "cellular_setup.h"
#include "main.h"
#include <freertos/FreeRTOS.h>
#include <freertos/event_groups.h>

#include <avsystem/commons/avs_errno.h>
#include <avsystem/commons/avs_log.h>
#include <avsystem/commons/avs_socket_v_table.h>
#include <avsystem/commons/avs_time.h>
#include <avsystem/commons/avs_utils.h>

#include <cellular_common.h>
#include <cellular_setup.h>
#include <sockets_wrapper.h>

#include "net_impl.h"

#define QIRD_COMMA_COUNT 2U
Expand Down
8 changes: 5 additions & 3 deletions main/cellular_anjay_impl/net_impl.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2021-2023 AVSystem <[email protected]>
* Copyright 2021-2024 AVSystem <[email protected]>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -16,11 +16,13 @@
#ifndef NET_IMPL_H
#define NET_IMPL_H

#include <stdbool.h>
#include <stdint.h>

#include <avsystem/commons/avs_errno.h>
#include <avsystem/commons/avs_socket.h>

#include "cellular_common.h"
#include "sockets_wrapper.h"
#include <cellular_common.h>

extern CellularHandle_t CellularHandle;
extern uint8_t CellularSocketPdnContextId;
Expand Down
2 changes: 1 addition & 1 deletion main/component.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2021-2023 AVSystem <[email protected]>
# Copyright 2021-2024 AVSystem <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
28 changes: 17 additions & 11 deletions main/connect.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2021-2023 AVSystem <[email protected]>
* Copyright 2021-2024 AVSystem <[email protected]>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -23,19 +23,25 @@
CONDITIONS OF ANY KIND, either express or implied.
*/

#include "driver/gpio.h"
#include "esp_event.h"
#include "esp_netif.h"
#include "esp_wifi_default.h"
#include "freertos/FreeRTOS.h"
#include "freertos/event_groups.h"
#include "freertos/task.h"
#include "lwip/err.h"
#include "lwip/sys.h"
#include "sdkconfig.h"
#include <stdbool.h>
#include <stdint.h>
#include <string.h>

#include <freertos/FreeRTOS.h>
#include <freertos/semphr.h>

#include <esp_err.h>
#include <esp_event.h>
#include <esp_log.h>
#include <esp_netif.h>
#include <esp_netif_ip_addr.h>
#include <esp_netif_types.h>
#include <esp_wifi.h>
#include <esp_wifi_default.h>
#include <esp_wifi_types.h>

#include "connect.h"
#include "sdkconfig.h"

static wifi_config_t wifi_config;

Expand Down
6 changes: 3 additions & 3 deletions main/connect.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2021-2023 AVSystem <[email protected]>
* Copyright 2021-2024 AVSystem <[email protected]>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -17,8 +17,8 @@
#ifndef _CONNECT_H_
#define _CONNECT_H_

#include "esp_log.h"
#include "esp_wifi.h"
#include <esp_err.h>
#include <esp_wifi.h>

void wifi_initialize(void);
esp_err_t wifi_connect(wifi_config_t *conf);
Expand Down
2 changes: 1 addition & 1 deletion main/default_config.h.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2021-2023 AVSystem <[email protected]>
* Copyright 2021-2024 AVSystem <[email protected]>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Loading

0 comments on commit ae2bdc9

Please sign in to comment.