fix build for other platforms.

include/config.h

@@ -30,7 +30,7 @@
 #define BACK_TO_IDLE_TIMEOUT (5UL * 60UL * 1000UL)
 
 // in seconds
-#define MAX_TANK_FILL_TIME (70)
+#define MAX_TANK_FILL_TIME (80)
 #define AUTO_PUMP_RUNTIME 4
 #define AUTO_STIRR_RUNTIME 60
 #define MAX_AUTO_PLANT_RUNTIME (35 * 60)

include/config_pins.h

@@ -52,10 +52,15 @@
  * AVR Controller
  */
 
+#define I2C_GPIO_EXPANDER_COUNT 0
+//#define I2C_GPIO_EXPANDER_ADDR 0x20, 0x21
+
 // out 1, out 2, out 3, out 4, in
 #define VALVE_COUNT 5
 #define VALVE_PINS 10, 11, 12, 14, 15
 
+#define KICKSTART_PINS -1, -1, -1, -1
+
 // a, b, c
 #define PUMP_COUNT 3
 #define PUMP_PINS 16, 17, 18
@@ -65,7 +70,9 @@
 #define SWITCH_PINS 19, 20
 
 // stirrer
-#define AUX_COUNT 1
+#define STIRRER_COUNT 1
+#define LOCK_COUNT 0
+#define AUX_COUNT (STIRRER_COUNT + LOCK_COUNT)
 #define AUX_PINS 21
 
 #endif // FUNCTION_CONTROL

platformio.ini

@@ -15,18 +15,19 @@ default_envs = esp8266_main, esp32_main, arduino_ui, arduino_test, leonardo_main
 platform = espressif8266
 board = esp01_1m
 framework = arduino
-build_flags = -D PLATFORM_ESP -D FUNCTION_CONTROL
+build_flags = -D PLATFORM_ESP -D FUNCTION_CONTROL -D TWI_GPIO
 lib_deps =
     Wire
     https://github.com/Links2004/arduinoWebSockets
     https://github.com/rlogiacco/CircularBuffer
     https://github.com/tobiasschuerg/InfluxDB-Client-for-Arduino.git
+    https://github.com/RobTillaart/PCF8574
 
 [env:esp32_main]
 platform = espressif32
 board = esp32dev
 framework = arduino
-build_flags = -D PLATFORM_ESP -D FUNCTION_CONTROL
+build_flags = -D PLATFORM_ESP -D FUNCTION_CONTROL -D TWI_GPIO
 upload_protocol = esptool
 upload_port = /dev/ttyUSB1
 lib_deps =

src/GPIOBank.cpp

@@ -23,9 +23,12 @@
 #include "config.h"
 #include "config_pins.h"
 
-#ifdef PLATFORM_ESP
+#ifdef TWI_GPIO
 #include <PCF8574.h>
 #include <Wire.h>
+#endif
+
+#ifdef PLATFORM_ESP
 #include "WifiStuff.h"
 #endif // PLATFORM_ESP
 
@@ -33,13 +36,13 @@
 
 // ----------------------------------------------------------------------------
 
-#if (I2C_GPIO_EXPANDER_COUNT > 0)
+#if defined(TWI_GPIO) && (I2C_GPIO_EXPANDER_COUNT > 0)
 static uint8_t expand_addr[I2C_GPIO_EXPANDER_COUNT] = { I2C_GPIO_EXPANDER_ADDR };
 static PCF8574 expand[I2C_GPIO_EXPANDER_COUNT];
 #endif
 
 void gpio_i2c_init(void) {
-#if (I2C_GPIO_EXPANDER_COUNT > 0)
+#if defined(TWI_GPIO) && (I2C_GPIO_EXPANDER_COUNT > 0)
     for (int i = 0; i < I2C_GPIO_EXPANDER_COUNT; i++) {
         expand[i].setAddress(expand_addr[i]);
         expand[i].begin(0xFF);
@@ -53,6 +56,7 @@ static void gpio_pinMode(int pin, int value) {
     } else if (pin < 0) {
         // ignore negative pin numbers
     } else {
+#if defined(TWI_GPIO) && (I2C_GPIO_EXPANDER_COUNT > 0)
         pin -= 100;
         int ex = pin / 8;
         pin = pin % 8;
@@ -65,6 +69,7 @@ static void gpio_pinMode(int pin, int value) {
             }
             expand[ex].setButtonMask(mask);
         }
+#endif
     }
 }
 
@@ -74,12 +79,14 @@ static void gpio_digitalWrite(int pin, int value) {
     } else if (pin < 0) {
         // ignore negative pin numbers
     } else {
+#if defined(TWI_GPIO) && (I2C_GPIO_EXPANDER_COUNT > 0)
         pin -= 100;
         int ex = pin / 8;
         pin = pin % 8;
         if (ex < I2C_GPIO_EXPANDER_COUNT) {
             expand[ex].write(pin, value);
         }
+#endif
     }
 }
 
@@ -90,6 +97,7 @@ static int gpio_digitalRead(int pin) {
         // ignore negative pin numbers
         return 0;
     } else {
+#if defined(TWI_GPIO) && (I2C_GPIO_EXPANDER_COUNT > 0)
         pin -= 100;
         int ex = pin / 8;
         pin = pin % 8;
@@ -98,6 +106,9 @@ static int gpio_digitalRead(int pin) {
         } else {
             return 0;
         }
+#else
+        return 0;
+#endif
     }
 }
 

src/Statemachine.cpp

@@ -24,6 +24,8 @@
 #include "config.h"
 #include "config_pins.h"
 
+#ifdef FUNCTION_CONTROL
+
 Statemachine::DigitBuffer::DigitBuffer(int _size) {
     size = _size;
     pos = 0;
@@ -1521,3 +1523,5 @@ void Statemachine::switch_to(States s) {
         debug.println(s);
     }
 }
+
+#endif