Update test sketches (#1243)

tekka007 · web-flow · commit 935a3bc67707 · 2018-12-31T12:51:21.000+01:00
diff --git a/tests/Arduino/sketches/hard_signing_no_whitelisting_full_debug/hard_signing_no_whitelisting_full_debug.ino b/tests/Arduino/sketches/hard_signing_no_whitelisting_full_debug/hard_signing_no_whitelisting_full_debug.ino
@@ -18,8 +18,6 @@
  *
  *******************************
  */
-#include <stdint.h>
-#include <pins_arduino.h>
 #define MY_DEBUG
 #define MY_DEBUG_VERBOSE_SIGNING
 #define MY_RADIO_RF24
diff --git a/tests/Arduino/sketches/hard_signing_whitelisting_full_debug/hard_signing_whitelisting_full_debug.ino b/tests/Arduino/sketches/hard_signing_whitelisting_full_debug/hard_signing_whitelisting_full_debug.ino
@@ -18,8 +18,6 @@
  *
  *******************************
  */
-#include <stdint.h>
-#include <pins_arduino.h>
 #define MY_DEBUG
 #define MY_DEBUG_VERBOSE_SIGNING
 #define MY_RADIO_RF24
diff --git a/tests/Arduino/sketches/hard_signing_whitelisting_full_debug_nodelock/hard_signing_whitelisting_full_debug_nodelock.ino b/tests/Arduino/sketches/hard_signing_whitelisting_full_debug_nodelock/hard_signing_whitelisting_full_debug_nodelock.ino
@@ -18,8 +18,6 @@
  *
  *******************************
  */
-#include <stdint.h>
-#include <pins_arduino.h>
 #define MY_DEBUG
 #define MY_DEBUG_VERBOSE_SIGNING
 #define MY_RADIO_RF24
diff --git a/tests/Arduino/sketches/hard_signing_whitelisting_full_debug_rf24_rsa/hard_signing_whitelisting_full_debug_rf24_rsa.ino b/tests/Arduino/sketches/hard_signing_whitelisting_full_debug_rf24_rsa/hard_signing_whitelisting_full_debug_rf24_rsa.ino
@@ -18,11 +18,10 @@
  *
  *******************************
  */
-#include <stdint.h>
-#include <pins_arduino.h>
 #define MY_DEBUG
 #define MY_DEBUG_VERBOSE_SIGNING
 #define MY_RADIO_RF24
+#define MY_RF24_ENABLE_ENCRYPTION
 //#define MY_SIGNING_SOFT
 #define MY_SIGNING_ATSHA204
 #define MY_SIGNING_NODE_WHITELISTING {{.nodeId = GATEWAY_ADDRESS,.serial = {0x09,0x08,0x07,0x06,0x05,0x04,0x03,0x02,0x01}}}
@@ -33,6 +32,5 @@
 #ifndef MY_SIGNING_ATSHA204_PIN
 #define MY_SIGNING_ATSHA204_PIN 17
 #endif
-#define MY_RF24_ENABLE_ENCRYPTION
 
 #include <MySensors.h>
diff --git a/tests/Arduino/sketches/hard_signing_whitelisting_full_debug_rfm69_rsa/hard_signing_whitelisting_full_debug_rfm69_rsa.ino b/tests/Arduino/sketches/hard_signing_whitelisting_full_debug_rfm69_rsa/hard_signing_whitelisting_full_debug_rfm69_rsa.ino
@@ -18,11 +18,10 @@
  *
  *******************************
  */
-#include <stdint.h>
-#include <pins_arduino.h>
 #define MY_DEBUG
 #define MY_DEBUG_VERBOSE_SIGNING
 #define MY_RADIO_RFM69
+#define MY_RFM69_ENABLE_ENCRYPTION
 //#define MY_SIGNING_SOFT
 #define MY_SIGNING_ATSHA204
 #define MY_SIGNING_NODE_WHITELISTING {{.nodeId = GATEWAY_ADDRESS,.serial = {0x09,0x08,0x07,0x06,0x05,0x04,0x03,0x02,0x01}}}
@@ -33,6 +32,5 @@
 #ifndef MY_SIGNING_ATSHA204_PIN
 #define MY_SIGNING_ATSHA204_PIN 17
 #endif
-#define MY_RFM69_ENABLE_ENCRYPTION
 
 #include <MySensors.h>
diff --git a/tests/Arduino/sketches/hard_signing_whitelisting_full_debug_rfm95_rsa/hard_signing_whitelisting_full_debug_rfm95_rsa.ino b/tests/Arduino/sketches/hard_signing_whitelisting_full_debug_rfm95_rsa/hard_signing_whitelisting_full_debug_rfm95_rsa.ino
@@ -18,11 +18,10 @@
  *
  *******************************
  */
-#include <stdint.h>
-#include <pins_arduino.h>
 #define MY_DEBUG
 #define MY_DEBUG_VERBOSE_SIGNING
 #define MY_RADIO_RFM95
+#define MY_RFM95_ENABLE_ENCRYPTION
 //#define MY_SIGNING_SOFT
 #define MY_SIGNING_ATSHA204
 #define MY_SIGNING_NODE_WHITELISTING {{.nodeId = GATEWAY_ADDRESS,.serial = {0x09,0x08,0x07,0x06,0x05,0x04,0x03,0x02,0x01}}}
@@ -33,6 +32,5 @@
 #ifndef MY_SIGNING_ATSHA204_PIN
 #define MY_SIGNING_ATSHA204_PIN 17
 #endif
-#define MY_RFM95_ENABLE_ENCRYPTION
 
 #include <MySensors.h>
diff --git a/tests/Arduino/sketches/new_rfm69_driver/new_rfm69_driver.ino b/tests/Arduino/sketches/new_rfm69_driver/new_rfm69_driver.ino
@@ -18,7 +18,9 @@
  *
  *******************************
  */
+#define MY_DEBUG
 #define MY_RADIO_RFM69
 #define MY_RFM69_NEW_DRIVER
+#define MY_RFM69_ENABLE_ENCRYPTION
 #define MY_DEBUG_VERBOSE_RFM69
 #include <MySensors.h>
diff --git a/tests/Arduino/sketches/ota_firmware_update_rf24/ota_firmware_update_rf24.ino b/tests/Arduino/sketches/ota_firmware_update_rf24/ota_firmware_update_rf24.ino
@@ -18,8 +18,6 @@
  *
  *******************************
  */
-#include <stdint.h>
-#include <pins_arduino.h>
 #define MY_DEBUG
 #define MY_RADIO_RF24
 #define MY_OTA_FIRMWARE_FEATURE
diff --git a/tests/Arduino/sketches/serial_gw_no_transport_hard_signing_whitelisting_full_debug/serial_gw_no_transport_hard_signing_whitelisting_full_debug.ino b/tests/Arduino/sketches/serial_gw_no_transport_hard_signing_whitelisting_full_debug/serial_gw_no_transport_hard_signing_whitelisting_full_debug.ino
@@ -18,8 +18,6 @@
  *
  *******************************
  */
-#include <stdint.h>
-#include <pins_arduino.h>
 #define MY_DEBUG
 #define MY_GATEWAY_SERIAL
 #define MY_DEBUG_VERBOSE_SIGNING
diff --git a/tests/Arduino/sketches/serial_gw_no_transport_soft_signing_whitelisting_full_debug/serial_gw_no_transport_soft_signing_whitelisting_full_debug.ino b/tests/Arduino/sketches/serial_gw_no_transport_soft_signing_whitelisting_full_debug/serial_gw_no_transport_soft_signing_whitelisting_full_debug.ino
@@ -18,8 +18,6 @@
  *
  *******************************
  */
-#include <stdint.h>
-#include <pins_arduino.h>
 #define MY_DEBUG
 #define MY_GATEWAY_SERIAL
 #define MY_DEBUG_VERBOSE_SIGNING
diff --git a/tests/Arduino/sketches/soft_signing_no_whitelisting_full_debug/soft_signing_no_whitelisting_full_debug.ino b/tests/Arduino/sketches/soft_signing_no_whitelisting_full_debug/soft_signing_no_whitelisting_full_debug.ino
@@ -18,8 +18,6 @@
  *
  *******************************
  */
-#include <stdint.h>
-#include <pins_arduino.h>
 #define MY_DEBUG
 #define MY_DEBUG_VERBOSE_SIGNING
 #define MY_RADIO_RF24
diff --git a/tests/Arduino/sketches/soft_signing_whitelisting_full_debug/soft_signing_whitelisting_full_debug.ino b/tests/Arduino/sketches/soft_signing_whitelisting_full_debug/soft_signing_whitelisting_full_debug.ino
@@ -18,8 +18,6 @@
  *
  *******************************
  */
-#include <stdint.h>
-#include <pins_arduino.h>
 #define MY_DEBUG
 #define MY_DEBUG_VERBOSE_SIGNING
 #define MY_RADIO_RF24

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,6 @@`
`18`	`18`	`*`
`19`	`19`	`*******************************`
`20`	`20`	`*/`
`21`		`-#include <stdint.h>`
`22`		`-#include <pins_arduino.h>`
`23`	`21`	`#define MY_DEBUG`
`24`	`22`	`#define MY_DEBUG_VERBOSE_SIGNING`
`25`	`23`	`#define MY_RADIO_RF24`