Merge pull request #2469 from particle-iot/fix/p2-servo-tone

[tests] Fix broken tone and servo tests for p2 platform, also EEPROM_03 for all.

Author: technobly

user/tests/wiring/no_fixture/eeprom.cpp

@@ -73,17 +73,18 @@ test(EEPROM_02_ReadWriteSucceedsForAllAddressWithInRange) {
 
 test(EEPROM_03_ReadWriteFailsForAnyAddressOutOfRange) {
     int EEPROM_SIZE = EEPROM.length();
-    uint16_t address = 0;
-    uint8_t base = (uint8_t)rand();
+    int EEPROM_INC = 10;
+    uint16_t address = EEPROM_SIZE;
+    uint8_t base = rand() % (255 - EEPROM_INC - 1); // do not allow data to equal 255, which is what EEPROM.read(invalid_address) returns
     uint8_t data = base;
 
     // when
-    for(address=EEPROM_SIZE, data=base; address < EEPROM_SIZE+10; address++, data++)
+    for(address=EEPROM_SIZE, data=base; address < EEPROM_SIZE + EEPROM_INC; address++, data++)
     {
         EEPROM.write(address, data);
     }
     // then
-    for(address=EEPROM_SIZE, data=base; address < EEPROM_SIZE+10; address++, data++)
+    for(address=EEPROM_SIZE, data=base; address < EEPROM_SIZE + EEPROM_INC; address++, data++)
     {
         assertNotEqual(EEPROM.read(address), data);
     }

user/tests/wiring/no_fixture_long_running/servo.cpp

@@ -28,10 +28,10 @@
 #include "unit-test/unit-test.h"
 
 #if HAL_PLATFORM_GEN == 3
-#if PLATFORM_ID == PLATFORM_ESOMX
-static const pin_t pin = D0, pin2 = D1;
+#if PLATFORM_ID == PLATFORM_P2 || PLATFORM_ID == PLATFORM_ESOMX
+static const hal_pin_t pin = D1, pin2 = D8;
 #else
-static const pin_t pin = A0, pin2 = A1;
+static const hal_pin_t pin = A0, pin2 = A1;
 #endif
 #else
 #error "Unsupported platform"
@@ -40,9 +40,9 @@ static const pin_t pin = A0, pin2 = A1;
 test(SERVO_01_CannotAttachWhenPinSelectedIsNotTimerChannel) {
 #if HAL_PLATFORM_NRF52840
 # if PLATFORM_ID == PLATFORM_TRACKER
-    pin_t pin = BTN;
+    hal_pin_t pin = BTN;
 #elif PLATFORM_ID == PLATFORM_ESOMX
-    pin_t pin = A0;
+    hal_pin_t pin = A0;
 # else
     hal_pin_t pin = D0;
 # endif

user/tests/wiring/no_fixture_long_running/tone.cpp

@@ -27,18 +27,20 @@
 #include "tone_hal.h"
 #include "unit-test/unit-test.h"
 
-#if PLATFORM_ID == PLATFORM_ESOMX
-static const pin_t pin = D1;//pin under test
+#if PLATFORM_ID == PLATFORM_P2
+static const hal_pin_t pin = D1;//pin under test
+#elif PLATFORM_ID == PLATFORM_ESOMX
+static const hal_pin_t pin = A3;//pin under test
 #else
-static const pin_t pin = A1;//pin under test
+static const hal_pin_t pin = A1;//pin under test
 #endif
 
 test(TONE_01_NoGenerateWhenPinSelectedIsNotTimerChannel) {
 #if HAL_PLATFORM_NRF52840
 # if PLATFORM_ID == PLATFORM_TRACKER
-    pin_t pin = BTN;
+    hal_pin_t pin = BTN;
 # elif PLATFORM_ID == PLATFORM_ESOMX
-    pin_t pin = A0;
+    hal_pin_t pin = A0;
 # else
     hal_pin_t pin = D0;
 # endif