changes
This commit is contained in:
@ -17,6 +17,9 @@
|
|||||||
//Path to a program.
|
//Path to a program.
|
||||||
AR_AVRDUDE:FILEPATH=/usr/bin/avrdude
|
AR_AVRDUDE:FILEPATH=/usr/bin/avrdude
|
||||||
|
|
||||||
|
//Path to a program.
|
||||||
|
AR_AVRSIZE:FILEPATH=/usr/bin/avr-size
|
||||||
|
|
||||||
//Path to a program.
|
//Path to a program.
|
||||||
CMAKE_AR:FILEPATH=/bin/ar
|
CMAKE_AR:FILEPATH=/bin/ar
|
||||||
|
|
||||||
@ -233,9 +236,9 @@ CMAKE_CACHEFILE_DIR:INTERNAL=/home/philipp/Programming/RGBcontroller
|
|||||||
//Major version of cmake used to create the current loaded cache
|
//Major version of cmake used to create the current loaded cache
|
||||||
CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3
|
CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3
|
||||||
//Minor version of cmake used to create the current loaded cache
|
//Minor version of cmake used to create the current loaded cache
|
||||||
CMAKE_CACHE_MINOR_VERSION:INTERNAL=11
|
CMAKE_CACHE_MINOR_VERSION:INTERNAL=12
|
||||||
//Patch version of cmake used to create the current loaded cache
|
//Patch version of cmake used to create the current loaded cache
|
||||||
CMAKE_CACHE_PATCH_VERSION:INTERNAL=4
|
CMAKE_CACHE_PATCH_VERSION:INTERNAL=2
|
||||||
//ADVANCED property for variable: CMAKE_COLOR_MAKEFILE
|
//ADVANCED property for variable: CMAKE_COLOR_MAKEFILE
|
||||||
CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1
|
CMAKE_COLOR_MAKEFILE-ADVANCED:INTERNAL=1
|
||||||
//Path to CMake executable.
|
//Path to CMake executable.
|
||||||
@ -334,7 +337,7 @@ CMAKE_PLATFORM_INFO_INITIALIZED:INTERNAL=1
|
|||||||
//ADVANCED property for variable: CMAKE_RANLIB
|
//ADVANCED property for variable: CMAKE_RANLIB
|
||||||
CMAKE_RANLIB-ADVANCED:INTERNAL=1
|
CMAKE_RANLIB-ADVANCED:INTERNAL=1
|
||||||
//Path to CMake installation.
|
//Path to CMake installation.
|
||||||
CMAKE_ROOT:INTERNAL=/usr/share/cmake-3.11
|
CMAKE_ROOT:INTERNAL=/usr/share/cmake-3.12
|
||||||
//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS
|
//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS
|
||||||
CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1
|
CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1
|
||||||
//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG
|
//ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG
|
||||||
|
@ -43,13 +43,17 @@ add_executable(${PROJECT_NAME} ${ARDUINO_CORE_SRC} ${SRC_FILES})
|
|||||||
|
|
||||||
find_program(AR_AVRDUDE NAMES avrdude PATHS /usr/bin NO_DEFAULT_PATH)
|
find_program(AR_AVRDUDE NAMES avrdude PATHS /usr/bin NO_DEFAULT_PATH)
|
||||||
|
|
||||||
|
find_program(AR_AVRSIZE NAMES avr-size PATHS /usr/bin NO_DEFAULT_PATH)
|
||||||
|
|
||||||
add_custom_target(download
|
add_custom_target(download
|
||||||
COMMAND ${CMAKE_OBJCOPY} -j .text -j .data -O ihex ${PROJECT_NAME} ${PROJECT_NAME}.hex
|
COMMAND ${CMAKE_OBJCOPY} -j .text -j .data -O ihex ${PROJECT_NAME} ${PROJECT_NAME}.hex
|
||||||
|
COMMAND ${AR_AVRSIZE} -C ${PROJECT_NAME}
|
||||||
COMMAND ${AR_AVRDUDE} -v -p ${MCU} -c ${PROGRAMMER} -P /dev/ttyUSB0 -b 57600 -D -U flash:w:${PROJECT_NAME}.hex
|
COMMAND ${AR_AVRDUDE} -v -p ${MCU} -c ${PROGRAMMER} -P /dev/ttyUSB0 -b 57600 -D -U flash:w:${PROJECT_NAME}.hex
|
||||||
DEPENDS ${PROJECT_NAME}
|
DEPENDS ${PROJECT_NAME}
|
||||||
)
|
)
|
||||||
|
|
||||||
add_custom_target(export
|
add_custom_target(export
|
||||||
COMMAND ${CMAKE_OBJCOPY} -j .text -j .data -O ihex ${PROJECT_NAME} ${PROJECT_NAME}.hex
|
COMMAND ${CMAKE_OBJCOPY} -j .text -j .data -O ihex ${PROJECT_NAME} ${PROJECT_NAME}.hex
|
||||||
|
COMMAND ${AR_AVRSIZE} -C ${PROJECT_NAME}
|
||||||
DEPENDS ${PROJECT_NAME}
|
DEPENDS ${PROJECT_NAME}
|
||||||
)
|
)
|
||||||
|
3
main.cpp
3
main.cpp
@ -9,7 +9,7 @@
|
|||||||
#include "rgbled.h"
|
#include "rgbled.h"
|
||||||
#include "eeprom.h"
|
#include "eeprom.h"
|
||||||
|
|
||||||
#define MAX_RELAYS 16
|
#define MAX_RELAYS 32
|
||||||
#define COMMAND_BUFFER_SIZE 32
|
#define COMMAND_BUFFER_SIZE 32
|
||||||
#define SNPRINTF_BUFFER_SIZE 64
|
#define SNPRINTF_BUFFER_SIZE 64
|
||||||
|
|
||||||
@ -249,6 +249,7 @@ void serialDispatch(Serial* serial , WirelessRelayStore* relays, RgbLed* rgbled,
|
|||||||
else if(length > 2 && strncmp(buffer, "aux", 3) == 0)
|
else if(length > 2 && strncmp(buffer, "aux", 3) == 0)
|
||||||
{
|
{
|
||||||
auxDispatch(auxPwm, buffer+4, serial);
|
auxDispatch(auxPwm, buffer+4, serial);
|
||||||
|
if(relays->printState == true) writeState(relays, auxPwm, serial);
|
||||||
}
|
}
|
||||||
else if(length > 4 && strncmp(buffer, "state", 5) == 0)
|
else if(length > 4 && strncmp(buffer, "state", 5) == 0)
|
||||||
{
|
{
|
||||||
|
BIN
rgbcontroller
BIN
rgbcontroller
Binary file not shown.
1341
rgbcontroller.hex
1341
rgbcontroller.hex
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user