adding a mode with NFC reader on I2C and a relais on pin 35

.github/workflows/cont_integration.yml

@@ -0,0 +1,24 @@
+name: PlatformIO CI
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cache/pip
+            ~/.platformio/.cache
+          key: ${{ runner.os }}-pio
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+      - name: Install PlatformIO Core
+        run: pip install --upgrade platformio
+
+      - name: Build PlatformIO Project
+        run: pio run

platformio.ini

@@ -44,6 +44,7 @@ build_flags =
 	-D TAP_I2C_BUS=1
 	-D NFC_TIMEOUT=1000
 	-D TAP_SERVO_PIN=21
+	-D TAP_RELAY_PIN=35
 	-D TAP_I2C_SERVO_PIN=4
 	-D TAP_I2C_RELAY_PIN=4
 	-D TAP_I2C_TAP_ADDRESS=21
@@ -64,6 +65,7 @@ build_flags =
 	-D TAP_I2C_BUS=1
 	-D NFC_TIMEOUT=1000
 	-D TAP_SERVO_PIN=21
+	-D TAP_RELAY_PIN=35
 	-D TAP_I2C_SERVO_PIN=4
 	-D TAP_I2C_RELAY_PIN=4
 	-D TAP_I2C_TAP_ADDRESS=21
@@ -84,6 +86,7 @@ build_flags =
 	-D TAP_I2C_BUS=1
 	-D NFC_TIMEOUT=1000
 	-D TAP_SERVO_PIN=21
+	-D TAP_RELAY_PIN=35
 	-D TAP_I2C_SERVO_PIN=4
 	-D BB_FGCOLOR=0xFFFFFF
 	-D BB_BGCOLOR=0x4E4D4D
@@ -105,6 +108,7 @@ build_flags =
 	-D BB_NAME=\"BitcoinTaps.com\"
 	-D NFC_TIMEOUT=1000
 	-D TAP_SERVO_PIN=21
+	-D TAP_RELAY_PIN=35
 	-D TAP_I2C_SERVO_PIN=4
 	-D TAP_I2C_RELAY_PIN=4
 	-D TAP_I2C_TAP_ADDRESS=21
@@ -125,6 +129,7 @@ build_flags =
 	-D BB_BGCOLOR=0x4E4D4D
 	-D BB_NAME=\"BitcoinTaps.com\"
 	-D TAP_SERVO_PIN=21
+	-D TAP_RELAY_PIN=35
 	-D TAP_I2C_SERVO_PIN=4
 	-D TAP_I2C_RELAY_PIN=4
 	-D TAP_I2C_TAP_ADDRESS=21
@@ -141,6 +146,7 @@ build_flags =
 	-D TAP_I2C_BUS=1
 	-D NFC_TIMEOUT=1000
 	-D TAP_SERVO_PIN=21
+	-D TAP_RELAY_PIN=35
 	-D TAP_I2C_SERVO_PIN=4
 	-D TAP_I2C_RELAY_PIN=4
 	-D TAP_I2C_TAP_ADDRESS=21

src/main.cpp

@@ -325,6 +325,7 @@ void tapOpen(int i) {
       sensact->writeServo(i);
       break;
     case CONTROL_MODE_RELAY_TIME:
+    case CONTROL_MODE_RELAY_TIME_NFC:
       sensact->relayHigh();
       break;
     case CONTROL_MODE_I2C_SERVO_TICKS:
@@ -350,6 +351,7 @@ void tapClose(int i) {
       sensact->writeServo(i);
       break;
     case CONTROL_MODE_RELAY_TIME:
+    case CONTROL_MODE_RELAY_TIME_NFC:
       sensact->relayLow();
       break;
     case CONTROL_MODE_I2C_SERVO_TICKS:
@@ -979,6 +981,12 @@ void setup()
     case CONTROL_MODE_RELAY_TIME:
       sensact->initRelay(TAP_SERVO_PIN);
       break;
+    case CONTROL_MODE_RELAY_TIME_NFC:
+      sensact->initRelay(TAP_RELAY_PIN);
+      sensact->initI2C(TAP_I2C_SDA, TAP_I2C_SCL,TAP_I2C_BUS);
+      sensact->initNFC();
+      delay(1000);
+      break;
     case CONTROL_MODE_I2C_SERVO_TIME:
       sensact->initI2C(TAP_I2C_SDA, TAP_I2C_SCL,TAP_I2C_BUS);    
       sensact->initI2CExtender(TAP_I2C_TAP_ADDRESS);

src/tapconfig.h

@@ -14,6 +14,7 @@
 #define CONTROL_MODE_I2C_RELAY_TIME 4
 #define CONTROL_MODE_I2C_SERVO_TICKS 5
 #define CONTROL_MODE_I2C_RELAY_TICKS 6
+#define CONTROL_MODE_RELAY_TIME_NFC 7
 
 class TapConfig {
     private:
@@ -60,4 +61,4 @@ class TapConfig {
         void setControlMode(int i);
 };
 
-#endif
+#endif

src/ui.c

@@ -1344,7 +1344,7 @@ void ui_ScreenConfig_screen_init(void)
 
     // Drop Down for switching mode
     ui_DropdownConfigControlMode = lv_dropdown_create(ui_ScreenConfig);
-    lv_dropdown_set_options(ui_DropdownConfigControlMode, "None\nServo, Time\nRelay, Time\nI2C Servo, Time\nI2C Relay, Time\nI2C Servo, Ticks\nI2C Relay, Ticks");
+    lv_dropdown_set_options(ui_DropdownConfigControlMode, "None\nServo, Time\nRelay, Time\nRelay, Time, NFC\nI2C Servo, Time\nI2C Relay, Time\nI2C Servo, Ticks\nI2C Relay, Ticks");
     lv_obj_set_width(ui_DropdownConfigControlMode, 170);
     lv_obj_set_height(ui_DropdownConfigControlMode, LV_SIZE_CONTENT);    /// 1
     lv_obj_set_x(ui_DropdownConfigControlMode, -10);

src/ui_events.cpp

@@ -107,6 +107,8 @@ void ButtonConfigDoneClicked(lv_event_t * e)
     	tapConfig.setControlMode(CONTROL_MODE_SERVO_TIME);
   	} else if ( strncasecmp(buf,"Relay, Time",11) == 0 ) {
     	tapConfig.setControlMode(CONTROL_MODE_RELAY_TIME);
+  	} else if ( strncasecmp(buf,"Relay, Time, NFC",16) == 0 ) {
+    	tapConfig.setControlMode(CONTROL_MODE_RELAY_TIME_NFC);
   	} else if ( strncasecmp(buf,"I2C Servo, Time",15) == 0 ) {
     	tapConfig.setControlMode(CONTROL_MODE_I2C_SERVO_TIME);
   	} else if ( strncasecmp(buf,"I2C Relay, Time",15) == 0 ) {