Skip to content

Commit 0ee1b85

Browse files
committed
Merge branch 'master' into development
Conflicts: libraries/MySensors/MyGateway.cpp libraries/MySensors/MyGateway.h libraries/MySensors/MyMessage.h libraries/MySensors/examples/LightLuxSensor/LightLuxSensor.ino
2 parents 79c4cee + 8c2e835 commit 0ee1b85

File tree

30 files changed

+2565
-737
lines changed

30 files changed

+2565
-737
lines changed

hardware/MySensors/avr/boards.txt

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -30,28 +30,3 @@ MysensorsMicro.menu.cpu.8Mhz.build.f_cpu=8000000L
3030

3131
MysensorsMicro.menu.cpu.1Mhz=Atmega328 1Mhz
3232
MysensorsMicro.menu.cpu.1Mhz.build.f_cpu=1000000L
33-
34-
35-
########################################
36-
## Gateway settings
37-
38-
MysensorsGW.name=Sensebender Gateway
39-
MysensorsGW.build.core=arduino:arduino
40-
MysensorsGW.build.variant=GW
41-
MysensorsGW.build.board=AVR_1284
42-
MysensorsGW.build.mcu=atmega1284p
43-
MysensorsGW.build.f_cpu=20000000L
44-
45-
MysensorsGW.upload.tool=arduino:avrdude
46-
MysensorsGW.upload.protocol=arduino
47-
MysensorsGW.upload.maximum_size=123720
48-
MysensorsGW.upload.maximum_data_size=16384
49-
MysensorsGW.upload.speed=115200
50-
51-
MysensorsGW.bootloader.tool=arduino:avrdude
52-
MysensorsGW.bootloader.unlock_bits=0x3F
53-
MysensorsGW.bootloader.lock_bits=0x0F
54-
MysensorsGW.bootloader.low_fuses=0xE2
55-
MysensorsGW.bootloader.high_fuses=0xD2
56-
MysensorsGW.bootloader.extended_fuses=0xFE
57-
MysensorsGW.bootloader.file=DualOptiboot/optiboot_atmega1284.hex

hardware/MySensors/avr/platform.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# For more info:
66
# https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
77

8-
name=MySensors Boards
8+
name=MySensors AVR based boards
99
version=1.6.0
1010

1111
# AVR compile variables

0 commit comments

Comments
 (0)