Skip to content

Commit

Permalink
add devboard folder
Browse files Browse the repository at this point in the history
  • Loading branch information
lenvm committed Nov 6, 2023
1 parent 8a1d3c1 commit 606f49d
Show file tree
Hide file tree
Showing 33 changed files with 32 additions and 32 deletions.
6 changes: 3 additions & 3 deletions Software/Software.ino
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
#include <Arduino.h>
#include "HardwareSerial.h"
#include "USER_SETTINGS.h"
#include "config.h"
#include "src/devboard/config.h"
#include "src/lib/eModbus-eModbus/Logging.h"
#include "mbServerFCs.h"
#include "src/devboard/modbus/mbServerFCs.h"
#include "src/lib/eModbus-eModbus/ModbusServerRTU.h"
#include "ESP32CAN.h"
#include "src/devboard/can/ESP32CAN.h"
#include "src/lib/ThomasBarth-ESP32-CAN-Driver/CAN_config.h"
#include "src/lib/adafruit-Adafruit_NeoPixel/Adafruit_NeoPixel.h"
#include "src/battery/BATTERIES.h"
Expand Down
2 changes: 1 addition & 1 deletion Software/src/battery/BMW-I3-BATTERY.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "BMW-I3-BATTERY.h"
#include "../../ESP32CAN.h"
#include "../devboard/can/ESP32CAN.h"
#include "../lib/ThomasBarth-ESP32-CAN-Driver/CAN_config.h"

//TODO before using
Expand Down
2 changes: 1 addition & 1 deletion Software/src/battery/BMW-I3-BATTERY.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef BMW_I3_BATTERY_H
#define BMW_I3_BATTERY_H
#include <Arduino.h>
#include "../../ESP32CAN.h"
#include "../devboard/can/ESP32CAN.h"
#include "../../USER_SETTINGS.h"

#define ABSOLUTE_MAX_VOLTAGE 4040 // 404.4V,if battery voltage goes over this, charging is not possible (goes into forced discharge)
Expand Down
2 changes: 1 addition & 1 deletion Software/src/battery/CHADEMO-BATTERY.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "CHADEMO-BATTERY.h"
#include "../../ESP32CAN.h"
#include "../devboard/can/ESP32CAN.h"
#include "../lib/ThomasBarth-ESP32-CAN-Driver/CAN_config.h"

/* Do not change code below unless you are sure what you are doing */
Expand Down
2 changes: 1 addition & 1 deletion Software/src/battery/CHADEMO-BATTERY.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef CHADEMO_BATTERY_H
#define CHADEMO_BATTERY_H
#include <Arduino.h>
#include "../../ESP32CAN.h"
#include "../devboard/can/ESP32CAN.h"
#include "../../USER_SETTINGS.h"

#define ABSOLUTE_MAX_VOLTAGE 4040 // 404.4V,if battery voltage goes over this, charging is not possible (goes into forced discharge)
Expand Down
2 changes: 1 addition & 1 deletion Software/src/battery/IMIEV-CZERO-ION-BATTERY.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "IMIEV-CZERO-ION-BATTERY.h"
#include "../../ESP32CAN.h"
#include "../devboard/can/ESP32CAN.h"
#include "../lib/ThomasBarth-ESP32-CAN-Driver/CAN_config.h"

//Code still work in progress, TODO:
Expand Down
2 changes: 1 addition & 1 deletion Software/src/battery/IMIEV-CZERO-ION-BATTERY.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef IMIEV_CZERO_ION_BATTERY_H
#define IMIEV_CZERO_ION_BATTERY_H
#include <Arduino.h>
#include "../../ESP32CAN.h"
#include "../devboard/can/ESP32CAN.h"
#include "../../USER_SETTINGS.h"

#define ABSOLUTE_MAX_VOLTAGE 4040 // 404.4V,if battery voltage goes over this, charging is not possible (goes into forced discharge)
Expand Down
2 changes: 1 addition & 1 deletion Software/src/battery/KIA-HYUNDAI-64-BATTERY.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "KIA-HYUNDAI-64-BATTERY.h"
#include "../../ESP32CAN.h"
#include "../devboard/can/ESP32CAN.h"
#include "../lib/ThomasBarth-ESP32-CAN-Driver/CAN_config.h"

/* Do not change code below unless you are sure what you are doing */
Expand Down
2 changes: 1 addition & 1 deletion Software/src/battery/KIA-HYUNDAI-64-BATTERY.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef KIA_HYUNDAI_64_BATTERY_H
#define KIA_HYUNDAI_64_BATTERY_H
#include <Arduino.h>
#include "../../ESP32CAN.h"
#include "../devboard/can/ESP32CAN.h"
#include "../../USER_SETTINGS.h"

#define ABSOLUTE_MAX_VOLTAGE 4040 // 404.4V,if battery voltage goes over this, charging is not possible (goes into forced discharge)
Expand Down
2 changes: 1 addition & 1 deletion Software/src/battery/NISSAN-LEAF-BATTERY.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "NISSAN-LEAF-BATTERY.h"
#include "../../ESP32CAN.h"
#include "../devboard/can/ESP32CAN.h"
#include "../lib/ThomasBarth-ESP32-CAN-Driver/CAN_config.h"

/* Do not change code below unless you are sure what you are doing */
Expand Down
2 changes: 1 addition & 1 deletion Software/src/battery/NISSAN-LEAF-BATTERY.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef NISSAN_LEAF_BATTERY_H
#define NISSAN_LEAF_BATTERY_H
#include <Arduino.h>
#include "../../ESP32CAN.h"
#include "../devboard/can/ESP32CAN.h"
#include "../../USER_SETTINGS.h"

#define ABSOLUTE_MAX_VOLTAGE 4040 // 404.4V,if battery voltage goes over this, charging is not possible (goes into forced discharge)
Expand Down
2 changes: 1 addition & 1 deletion Software/src/battery/RENAULT-ZOE-BATTERY.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "RENAULT-ZOE-BATTERY.h"
#include "../../ESP32CAN.h"
#include "../devboard/can/ESP32CAN.h"
#include "../lib/ThomasBarth-ESP32-CAN-Driver/CAN_config.h"

/* Do not change code below unless you are sure what you are doing */
Expand Down
2 changes: 1 addition & 1 deletion Software/src/battery/RENAULT-ZOE-BATTERY.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef RENAULT_ZOE_BATTERY_H
#define RENAULT_ZOE_BATTERY_H
#include <Arduino.h>
#include "../../ESP32CAN.h"
#include "../devboard/can/ESP32CAN.h"
#include "../../USER_SETTINGS.h"

#define ABSOLUTE_MAX_VOLTAGE 4040 // 404.4V,if battery voltage goes over this, charging is not possible (goes into forced discharge)
Expand Down
2 changes: 1 addition & 1 deletion Software/src/battery/TESLA-MODEL-3-BATTERY.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "TESLA-MODEL-3-BATTERY.h"
#include "../../ESP32CAN.h"
#include "../devboard/can/ESP32CAN.h"
#include "../lib/ThomasBarth-ESP32-CAN-Driver/CAN_config.h"

/* Do not change code below unless you are sure what you are doing */
Expand Down
2 changes: 1 addition & 1 deletion Software/src/battery/TESLA-MODEL-3-BATTERY.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef TESLA_MODEL_3_BATTERY_H
#define TESLA_MODEL_3_BATTERY_H
#include <Arduino.h>
#include "../../ESP32CAN.h"
#include "../devboard/can/ESP32CAN.h"
#include "../../USER_SETTINGS.h"

#define ABSOLUTE_MAX_VOLTAGE 4030 // 403.0V,if battery voltage goes over this, charging is not possible (goes into forced discharge)
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions Software/ESP32CAN.h → Software/src/devboard/can/ESP32CAN.h
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#ifndef ESP32CAN_H
#define ESP32CAN_H

#include "src/lib/ThomasBarth-ESP32-CAN-Driver/CAN_config.h"
#include "src/lib/ThomasBarth-ESP32-CAN-Driver/CAN.h"
#include "../../lib/ThomasBarth-ESP32-CAN-Driver/CAN_config.h"
#include "../../lib/ThomasBarth-ESP32-CAN-Driver/CAN.h"
extern uint8_t LEDcolor;

class ESP32CAN
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "mbServerFCs.h"
#include "src/lib/eModbus-eModbus/Logging.h"
#include "../../lib/eModbus-eModbus/Logging.h"

//modbus register memory - declared in main.cpp

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "src/lib/eModbus-eModbus/ModbusServerRTU.h"
#include "../../lib/eModbus-eModbus/ModbusServerRTU.h"

#define MBTCP_ID 21 // modbus TCP server ID
#define MBPV_MAX 30000
Expand Down
2 changes: 1 addition & 1 deletion Software/src/inverter/BYD-CAN.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "BYD-CAN.h"
#include "../../ESP32CAN.h"
#include "../devboard/can/ESP32CAN.h"
#include "../lib/ThomasBarth-ESP32-CAN-Driver/CAN_config.h"

/* Do not change code below unless you are sure what you are doing */
Expand Down
2 changes: 1 addition & 1 deletion Software/src/inverter/BYD-CAN.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef BYD_CAN_H
#define BYD_CAN_H
#include <Arduino.h>
#include "../../ESP32CAN.h"
#include "../devboard/can/ESP32CAN.h"
#include "../../USER_SETTINGS.h"

extern uint16_t SOC;
Expand Down
2 changes: 1 addition & 1 deletion Software/src/inverter/PYLON-CAN.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "PYLON-CAN.h"
#include "../../ESP32CAN.h"
#include "../devboard/can/ESP32CAN.h"
#include "../lib/ThomasBarth-ESP32-CAN-Driver/CAN_config.h"

#define SEND_0 //If defined, the messages will have ID ending with 0 (useful for some inverters)
Expand Down
2 changes: 1 addition & 1 deletion Software/src/inverter/PYLON-CAN.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef PYLON_CAN_H
#define PYLON_CAN_H
#include <Arduino.h>
#include "../../ESP32CAN.h"
#include "../devboard/can/ESP32CAN.h"
#include "../../USER_SETTINGS.h"

extern uint16_t SOC;
Expand Down
2 changes: 1 addition & 1 deletion Software/src/inverter/SMA-CAN.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "SMA-CAN.h"
#include "../../ESP32CAN.h"
#include "../devboard/can/ESP32CAN.h"
#include "../lib/ThomasBarth-ESP32-CAN-Driver/CAN_config.h"

//TODO, change CAN sending routine once confirmed that 500ms interval is OK for this battery type
Expand Down
2 changes: 1 addition & 1 deletion Software/src/inverter/SMA-CAN.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef SMA_CAN_H
#define SMA_CAN_H
#include <Arduino.h>
#include "../../ESP32CAN.h"
#include "../devboard/can/ESP32CAN.h"
#include "../../USER_SETTINGS.h"

extern uint16_t SOC; //SOC%, 0-100.00 (0-10000)
Expand Down
2 changes: 1 addition & 1 deletion Software/src/inverter/SOFAR-CAN.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "SOFAR-CAN.h"
#include "../../ESP32CAN.h"
#include "../devboard/can/ESP32CAN.h"
#include "../lib/ThomasBarth-ESP32-CAN-Driver/CAN_config.h"

/* This implementation of the SOFAR can protocol is halfway done. What's missing is implementing the inverter replies, all the CAN messages are listed, but the can sending is missing. */
Expand Down
2 changes: 1 addition & 1 deletion Software/src/inverter/SOFAR-CAN.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef SOFAR_CAN_H
#define SOFAR_CAN_H
#include <Arduino.h>
#include "../../ESP32CAN.h"
#include "../devboard/can/ESP32CAN.h"
#include "../../USER_SETTINGS.h"

// These parameters need to be mapped for the inverter
Expand Down
6 changes: 3 additions & 3 deletions Software/src/inverter/SOLAX-CAN.h
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#ifndef SOLAX_CAN_H
#define SOLAX_CAN_H
#include <Arduino.h>
#include "../../ESP32CAN.h"
#include "../../config.h"
#include "../devboard/can/ESP32CAN.h"
#include "../devboard/config.h"
#include "../../USER_SETTINGS.h"

#include "../../src/lib/pierremolinaro-acan2515/ACAN2515.h"
#include "../lib/pierremolinaro-acan2515/ACAN2515.h"
extern ACAN2515 can;

extern uint16_t SOC;
Expand Down

0 comments on commit 606f49d

Please sign in to comment.