Skip to content

Commit 070be2b

Browse files
256dpi256dpi
authored
Merge pull request #59 from 256dpi/v2
V2
2 parents a05a696 + a834867 commit 070be2b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+2540
-6192
lines changed

‎.editorconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[Makefile]
2+
indent_style = tab
3+
indent_size = 4

‎.gitignore‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
11
.DS_Store
2-
build/
3-
node_modules/
4-
mqtt.zip
5-
yun/.idea
62
cmake-build-debug/

‎.travis.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
language: generic
22
env:
33
global:
4-
- IDE_VERSION=1.8.1
4+
- IDE_VERSION=1.8.3
55
matrix:
66
- EXAMPLE="AdafruitHuzzahESP8266" BOARD="esp8266:esp8266:huzzah:FlashSize=4M3M,CpuFrequency=80"
77
- EXAMPLE="AdafruitHuzzahESP8266_SSL" BOARD="esp8266:esp8266:huzzah:FlashSize=4M3M,CpuFrequency=80"
88
- EXAMPLE="ArduinoEthernetShield" BOARD="arduino:avr:uno"
99
- EXAMPLE="ArduinoWiFi101" BOARD="arduino:avr:uno"
1010
- EXAMPLE="ArduinoWiFi101_SSL" BOARD="arduino:avr:uno"
1111
- EXAMPLE="ArduinoWiFiShield" BOARD="arduino:avr:uno"
12-
- EXAMPLE="ArduinoYun_MQTTClient" BOARD="arduino:avr:yun"
13-
- EXAMPLE="ArduinoYun_YunMQTTClient" BOARD="arduino:avr:yun"
14-
- EXAMPLE="ArduinoYun_YunMQTTClient_SSL" BOARD="arduino:avr:yun"
12+
- EXAMPLE="ArduinoYun" BOARD="arduino:avr:yun"
13+
- EXAMPLE="ArduinoYun_SSL" BOARD="arduino:avr:yun"
1514
- EXAMPLE="ESP32DevelopmentBoard" BOARD="espressif:esp32:esp32:FlashFreq=80"
1615
- EXAMPLE="ESP32DevelopmentBoard_SSL" BOARD="espressif:esp32:esp32:FlashFreq=80"
1716
before_install:

‎CMakeLists.txt‎

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,35 @@
11
# Uncompilable CMake File to enable project editing with CLion IDE
22

33
cmake_minimum_required(VERSION 2.8.4)
4-
project(arduino_mqtt)
4+
project(arduino-mqtt)
55

6-
include_directories(/Applications/Arduino.app/Contents/Java/hardware/arduino/avr/cores/arduino/)
7-
include_directories(/Applications/Arduino.app/Contents/Java/libraries/Bridge/src)
6+
include_directories(
7+
/Applications/Arduino.app/Contents/Java/hardware/arduino/avr/cores/arduino/
8+
/Users/256dpi/Development/Arduino/libraries/Ethernet/src
9+
/Users/256dpi/Development/Arduino/libraries/WiFi101/src
10+
/Applications/Arduino.app/Contents/Java/libraries/Bridge/src
11+
/Users/256dpi/Library/Arduino15/packages/esp8266/hardware/esp8266/2.3.0/libraries/ESP8266WiFi/src
12+
/Users/256dpi/Development/Arduino/hardware/espressif/esp32/libraries/WiFi/src
13+
/Users/256dpi/Development/Arduino/hardware/espressif/esp32/libraries/WiFiClientSecure/src)
814

9-
add_definitions(-DYUN_MQTT_CLIENT_ENABLED)
15+
include_directories(src/)
1016

1117
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
1218

1319
set(SOURCE_FILES
14-
src/lib/FP.h
15-
src/lib/MQTTClient.h
16-
src/lib/MQTTConnect.h
17-
src/lib/MQTTConnectClient.c
18-
src/lib/MQTTDeserializePublish.c
19-
src/lib/MQTTPacket.c
20-
src/lib/MQTTPacket.h
21-
src/lib/MQTTPublish.h
22-
src/lib/MQTTSerializePublish.c
23-
src/lib/MQTTSubscribe.h
24-
src/lib/MQTTSubscribeClient.c
25-
src/lib/MQTTUnsubscribe.h
26-
src/lib/MQTTUnsubscribeClient.c
27-
src/MQTTClient.cpp
20+
examples/AdafruitHuzzahESP8266/AdafruitHuzzahESP8266.ino
21+
examples/AdafruitHuzzahESP8266_SSL/AdafruitHuzzahESP8266_SSL.ino
22+
examples/ArduinoEthernetShield/ArduinoEthernetShield.ino
23+
examples/ArduinoWiFi101/ArduinoWiFi101.ino
24+
examples/ArduinoWiFi101_SSL/ArduinoWiFi101_SSL.ino
25+
examples/ArduinoWiFiShield/ArduinoWiFiShield.ino
26+
examples/ArduinoYun/ArduinoYun.ino
27+
examples/ArduinoYun_SSL/ArduinoYun_SSL.ino
28+
examples/ESP32DevelopmentBoard/ESP32DevelopmentBoard.ino
29+
examples/ESP32DevelopmentBoard_SSL/ESP32DevelopmentBoard_SSL.ino
30+
src/lwmqtt
2831
src/MQTTClient.h
29-
src/MQTTTest.h
30-
src/Network.cpp
31-
src/Network.h
32-
src/Timer.cpp
33-
src/Timer.h
34-
src/YunMQTTClient.cpp
35-
src/YunMQTTClient.h)
32+
src/system.cpp
33+
src/system.h)
3634

37-
add_executable(arduino_mqtt ${SOURCE_FILES})
35+
add_executable(arduino-mqtt ${SOURCE_FILES})

‎DEVELOPING.md‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
# Developing
22

3-
- Clean code `clang-format -i src/*.cpp src/*.h`.
4-
- Commit changes.
5-
- Update version with `bump.sh 1.0.0 2.0.0`.
6-
- Generate zip with `gulp`.
3+
- Update version in `library.properties`.
74
- Create release on GitHub.
8-
- Upload `mqtt.zip`.

‎Gulpfile.js‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎Makefile‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
all: fmt
2+
3+
fmt:
4+
clang-format -i src/*.cpp src/*.h -style="{BasedOnStyle: Google, ColumnLimit: 120}"
5+
6+
update:
7+
rm -rf ./lwmqtt
8+
git clone https://github.com/256dpi/lwmqtt.git ./lwmqtt
9+
mkdir -p ./src/lwmqtt
10+
cp -r ./lwmqtt/src/*.c ./src/lwmqtt/
11+
cp -r ./lwmqtt/src/*.h ./src/lwmqtt/
12+
cp -r ./lwmqtt/include/*.h ./src/lwmqtt/
13+
rm -rf ./lwmqtt
14+
sed -i '' "s/<lwmqtt.h>/\"lwmqtt.h\"/g" ./src/lwmqtt/*

0 commit comments

Comments
 (0)