Skip to content

Commit

Permalink
Merge pull request #7 from goev/pr/5
Browse files Browse the repository at this point in the history
Pr/5
  • Loading branch information
goev committed Nov 27, 2017
2 parents 7f64af0 + 1deee8d commit b387b07
Show file tree
Hide file tree
Showing 1,256 changed files with 516,707 additions and 1,524 deletions.
Binary file added .DS_Store
Binary file not shown.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -50,3 +50,4 @@ modules.order
Module.symvers
Mkfile.old
dkms.conf
.metadata/
11 changes: 11 additions & 0 deletions .project
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>Open-Vehicle-Monitoring-System-3</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>
Binary file added vehicle/.DS_Store
Binary file not shown.
2 changes: 1 addition & 1 deletion vehicle/OVMS.V3/components/can/can.cpp
Expand Up @@ -33,7 +33,7 @@
; https://github.com/ThomasBarth/ESP32-CAN-Driver
*/

#include "esp_log.h"
#include "ovms_log.h"
static const char *TAG = "can";

#include "can.h"
Expand Down
20 changes: 20 additions & 0 deletions vehicle/OVMS.V3/components/console_ssh/component.mk
@@ -0,0 +1,20 @@
#
# Main component makefile.
#
# This Makefile can be left empty. By default, it will take the sources in the
# src/ directory, compile them and link them into lib(subdirectory_name).a
# in the build directory. This behaviour is entirely configurable,
# please read the ESP-IDF documents if you need to do this.
#

ifdef CONFIG_OVMS_SC_GPL_MONGOOSE
ifdef CONFIG_OVMS_SC_GPL_WOLF
ifdef CONFIG_OVMS_COMP_SSH
COMPONENT_ADD_INCLUDEDIRS:=src
COMPONENT_EXTRA_INCLUDES := ${IDF_PATH}/components/freertos/include/freertos
COMPONENT_SRCDIRS:=src
COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive
CXXFLAGS += -DWOLFSSL_USER_SETTINGS
endif
endif
endif

0 comments on commit b387b07

Please sign in to comment.