yetangitu/Battery-Emulator
1
0
Fork 0
mirror of https://github.com/dalathegreat/Battery-Emulator.git synced 2025-10-05 02:39:57 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove USER_SETTINGS for good

Browse source
This commit is contained in:
Daniel Öster 2025-09-02 21:18:15 +03:00
parent da560e1629
commit 53d40cbe51
18 changed files with 21 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Software/src/devboard/hal/hal.cpp
View file

@ -1,7 +1,5 @@
#include "hal.h"
#include "../../../USER_SETTINGS.h"
#include <Arduino.h>
Esp32Hal* esp32hal = nullptr;

1
Software/src/devboard/mqtt/mqtt.cpp
View file

@ -4,7 +4,6 @@
#include <freertos/FreeRTOS.h>
#include <src/communication/nvm/comm_nvm.h>
#include <list>
#include "../../../USER_SETTINGS.h"
#include "../../battery/BATTERIES.h"
#include "../../communication/contactorcontrol/comm_contactorcontrol.h"
#include "../../datalayer/datalayer.h"

1
Software/src/devboard/utils/events.cpp
View file

@ -1,6 +1,5 @@
#include "events.h"
#include <Arduino.h>
#include "../../../USER_SETTINGS.h"
#include "../../datalayer/datalayer.h"
#include "../../devboard/hal/hal.h"
#include "../../devboard/utils/logging.h"

1
Software/src/devboard/utils/logging.cpp
View file

@ -1,5 +1,4 @@
#include "logging.h"
#include "../../../USER_SETTINGS.h"
#include "../../datalayer/datalayer.h"
#include "../sdcard/sdcard.h"

2
Software/src/devboard/utils/logging.h
View file

@ -2,8 +2,8 @@
#define __LOGGING_H__
#include <inttypes.h>
#include "../../../USER_SETTINGS.h"
#include "../../datalayer/datalayer.h"
#include "Print.h"
#include "types.h"
#ifndef UNIT_TEST

1
Software/src/devboard/utils/time_meas.h
View file

@ -1,7 +1,6 @@
#ifndef TIME_MEAS_H_
#define TIME_MEAS_H_
#include "USER_SETTINGS.h"
#include "esp_timer.h"
/** Start time measurement in microseconds

1
Software/src/devboard/webserver/settings_html.h
View file

@ -7,7 +7,6 @@
extern std::string ssid;
extern std::string password;
#include "../../../USER_SETTINGS.h" // Needed for WiFi ssid and password
#include "../../communication/nvm/comm_nvm.h"
/**

7
Software/src/devboard/wifi/wifi.cpp
View file

@ -2,7 +2,6 @@
#include <ESPmDNS.h>
#include "../utils/events.h"
#include "../utils/logging.h"
#include "USER_SETTINGS.h"
bool wifi_enabled = true;
bool wifiap_enabled = true;
@ -15,6 +14,12 @@ std::string password;
std::string ssidAP;
std::string passwordAP;
// Set your Static IP address. Only used incase Static address option is set
//TODO: Make configurable via webserver
IPAddress local_IP(192, 168, 10, 150);
IPAddress gateway(192, 168, 10, 1);
IPAddress subnet(255, 255, 255, 0);
// Configuration Parameters
static const uint16_t WIFI_CHECK_INTERVAL = 2000; // 1 seconds normal check interval when last connected
static const uint16_t STEP_WIFI_CHECK_INTERVAL = 2000; // 3 seconds wait step increase in checks for normal reconnects

1
Software/src/inverter/BYD-CAN.h
View file

@ -1,7 +1,6 @@
#ifndef BYD_CAN_H
#define BYD_CAN_H
#include "../../USER_SETTINGS.h"
#include "../datalayer/datalayer.h"
#include "CanInverterProtocol.h"

4
Software/src/inverter/CanInverterProtocol.h
View file

@ -1,14 +1,12 @@
#ifndef CANINVERTER_PROTOCOL_H
#define CANINVERTER_PROTOCOL_H
#include "../../USER_SETTINGS.h"
#include "InverterProtocol.h"
#include "../communication/Transmitter.h"
#include "../communication/can/CanReceiver.h"
#include "../communication/can/comm_can.h"
#include "../devboard/safety/safety.h"
#include "../devboard/utils/types.h"
#include "InverterProtocol.h"
class CanInverterProtocol : public InverterProtocol, Transmitter, CanReceiver {
public:

2
Software/src/inverter/INVERTERS.h
View file

@ -4,8 +4,6 @@
#include "InverterProtocol.h"
extern InverterProtocol* inverter;
#include "../../USER_SETTINGS.h"
#include "AFORE-CAN.h"
#include "BYD-CAN.h"
#include "BYD-MODBUS.h"