Fix circular and redundant imports + last freertos

This commit is contained in:
Willy-JL
2023-11-12 12:15:17 +00:00
parent 67db9ff25d
commit 1c1b855fd1
9 changed files with 11 additions and 24 deletions

View File

@@ -1,3 +1,5 @@
#pragma once
#include "brainfuck_i.h" #include "brainfuck_i.h"
void initWorker(BFApp* application); void initWorker(BFApp* application);

View File

@@ -3,9 +3,6 @@
#include "flizzer_tracker.h" #include "flizzer_tracker.h"
#include "flizzer_tracker_hal.h" #include "flizzer_tracker_hal.h"
extern bool audio_modes_values[];
extern char* audio_modes_text[];
FlizzerTrackerApp* init_tracker( FlizzerTrackerApp* init_tracker(
uint32_t sample_rate, uint32_t sample_rate,
uint8_t rate, uint8_t rate,

View File

@@ -18,8 +18,6 @@
extern bool audio_modes_values[]; extern bool audio_modes_values[];
extern char* audio_modes_text[]; extern char* audio_modes_text[];
void return_from_keyboard_callback(void* ctx);
void overwrite_file_widget_yes_input_callback(GuiButtonType result, InputType type, void* ctx); void overwrite_file_widget_yes_input_callback(GuiButtonType result, InputType type, void* ctx);
void overwrite_file_widget_no_input_callback(GuiButtonType result, InputType type, void* ctx); void overwrite_file_widget_no_input_callback(GuiButtonType result, InputType type, void* ctx);

View File

@@ -1,3 +1,5 @@
#pragma once
#include "tracker_engine_defs.h" #include "tracker_engine_defs.h"
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>

View File

@@ -74,17 +74,16 @@ typedef struct {
int32_t t_fine; int32_t t_fine;
} BME680_instance; } BME680_instance;
extern const SensorType BMP280;
extern const SensorType BME680; extern const SensorType BME680;
/** /**
* @brief Выделение памяти и установка начальных значений датчика BMP280 * @brief Выделение памяти и установка начальных значений датчика BMP680
* @param sensor Указатель на создаваемый датчик * @param sensor Указатель на создаваемый датчик
* @return Истина при успехе * @return Истина при успехе
*/ */
bool unitemp_BME680_alloc(Sensor* sensor, char* args); bool unitemp_BME680_alloc(Sensor* sensor, char* args);
/** /**
* @brief Инициализации датчика BMP280 * @brief Инициализации датчика BMP680
* @param sensor Указатель на датчик * @param sensor Указатель на датчик
* @return Истина если инициализация упспешная * @return Истина если инициализация упспешная
*/ */

View File

@@ -56,8 +56,8 @@ bool unitemp_BMP180_I2C_alloc(Sensor* sensor, char* args) {
i2c_sensor->minI2CAdr = 0x77 << 1; i2c_sensor->minI2CAdr = 0x77 << 1;
i2c_sensor->maxI2CAdr = 0x77 << 1; i2c_sensor->maxI2CAdr = 0x77 << 1;
BMP180_instance* bmx280_instance = malloc(sizeof(BMP180_instance)); BMP180_instance* bmx180_instance = malloc(sizeof(BMP180_instance));
i2c_sensor->sensorInstance = bmx280_instance; i2c_sensor->sensorInstance = bmx180_instance;
return true; return true;
} }

View File

@@ -30,12 +30,6 @@ typedef union {
float value; float value;
} ByteToFl; } ByteToFl;
bool unitemp_SCD30_alloc(Sensor* sensor, char* args);
bool unitemp_SCD30_init(Sensor* sensor);
bool unitemp_SCD30_deinit(Sensor* sensor);
UnitempStatus unitemp_SCD30_update(Sensor* sensor);
bool unitemp_SCD30_free(Sensor* sensor);
const SensorType SCD30 = { const SensorType SCD30 = {
.typename = "SCD30", .typename = "SCD30",
.interface = &I2C, .interface = &I2C,

View File

@@ -19,17 +19,11 @@
// Some information may be seen on https://github.com/sparkfun/SparkFun_SCD30_Arduino_Library // Some information may be seen on https://github.com/sparkfun/SparkFun_SCD30_Arduino_Library
#include "SCD30.h" #include "SCD40.h"
#include "../interfaces/I2CSensor.h" #include "../interfaces/I2CSensor.h"
#include "../interfaces/endianness.h" #include "../interfaces/endianness.h"
//#include <3rdparty/everest/include/everest/kremlin/c_endianness.h> //#include <3rdparty/everest/include/everest/kremlin/c_endianness.h>
bool unitemp_SCD40_alloc(Sensor* sensor, char* args);
bool unitemp_SCD40_init(Sensor* sensor);
bool unitemp_SCD40_deinit(Sensor* sensor);
UnitempStatus unitemp_SCD40_update(Sensor* sensor);
bool unitemp_SCD40_free(Sensor* sensor);
const SensorType SCD40 = { const SensorType SCD40 = {
.typename = "SCD40", .typename = "SCD40",
.interface = &I2C, .interface = &I2C,
@@ -185,7 +179,7 @@ static bool getSettingValue(Sensor* sensor, uint16_t registerAddress, uint16_t*
return loadWord(bytes, val); return loadWord(bytes, val);
} }
// Get 18 bytes from SCD30 // Get 18 bytes from SCD40
// Updates global variables with floats // Updates global variables with floats
// Returns true if success // Returns true if success
static bool readMeasurement(Sensor* sensor) { static bool readMeasurement(Sensor* sensor) {

View File

@@ -1,6 +1,7 @@
#include "wifi_deauther_app_i.h" #include "wifi_deauther_app_i.h"
#include "wifi_deauther_uart.h" #include "wifi_deauther_uart.h"
#include <FreeRTOS.h>
#include <stream_buffer.h> #include <stream_buffer.h>
#define BAUDRATE (115200) #define BAUDRATE (115200)