Merge branch 'master' of mjesec.ffzg.hr:/git/Arduino

diff --git a/.gitmodules b/.gitmodules
index fab343b..f1028c4 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -55,3 +55,6 @@
 [submodule "libraries/Adafruit-ST7735-Library"]
        path = libraries/Adafruit-ST7735-Library
        url = https://github.com/adafruit/Adafruit-ST7735-Library
+[submodule "libraries/Adafruit_ILI9340"]
+       path = libraries/Adafruit_ILI9340
+       url = https://github.com/adafruit/Adafruit_ILI9340

diff --git a/hardware/Arduino_STM32 b/hardware/Arduino_STM32
index 501da92..b8d1cd4 160000 (submodule)
--- a/hardware/Arduino_STM32
+++ b/hardware/Arduino_STM32
@@ -1 +1 @@
-Subproject commit 501da92986e3885ac4c51fb05e4f84e342bed7ea
+Subproject commit b8d1cd472a4de1ef9a0ef6ef520b45d2e6c28620

diff --git a/libraries/Adafruit_ILI9340 b/libraries/Adafruit_ILI9340
new file mode 160000 (submodule)
index 0000000..faed46f
--- /dev/null
+++ b/libraries/Adafruit_ILI9340
@@ -0,0 +1 @@
+Subproject commit faed46f765ca4cc3786fbee478b0d35e08474377

diff --git a/rpi_promini/rpi_promini.ino b/rpi_promini/rpi_promini.ino
index d1395e4..73d3092 100644 (file)
--- a/rpi_promini/rpi_promini.ino
+++ b/rpi_promini/rpi_promini.ino
@@ -86,6 +86,7 @@ void setup() {
   Serial.begin(9600);
   mySwitch.enableReceive(0);  // Receiver on inerrupt 0 => that is pin #2  
   mySwitch.enableTransmit(10); // with sender wired in receiving doesn't work, pin #10
+  mySwitch.setRepeatTransmit(repeat); // or change to be different for 433 and 315 MHz
 
   // DS18B20
   sensors.begin();