Merge branch 'master' into dev-v2.2

This commit is contained in:
Gunnar Skjold
2023-01-18 17:11:10 +01:00
3 changed files with 9 additions and 42 deletions

View File

@@ -1028,6 +1028,7 @@ void AmsWebServer::handleSetup() {
switch(sys.boardType) {
case 0: // roarfred
config->clearGpio(*gpioConfig);
gpioConfig->hanPin = 3;
gpioConfig->apPin = 0;
gpioConfig->ledPin = 2;
@@ -1035,6 +1036,7 @@ void AmsWebServer::handleSetup() {
gpioConfig->tempSensorPin = 5;
break;
case 1: // Arnio Kamstrup
config->clearGpio(*gpioConfig);
gpioConfig->hanPin = 3;
gpioConfig->apPin = 0;
gpioConfig->ledPin = 2;
@@ -1044,6 +1046,7 @@ void AmsWebServer::handleSetup() {
gpioConfig->ledRgbInverted = true;
break;
case 2: // spenceme
config->clearGpio(*gpioConfig);
gpioConfig->hanPin = 3;
gpioConfig->apPin = 0;
gpioConfig->ledPin = 2;
@@ -1053,6 +1056,7 @@ void AmsWebServer::handleSetup() {
wifi.sleep = 1;
break;
case 3: // Pow UART0
config->clearGpio(*gpioConfig);
gpioConfig->hanPin = 3;
gpioConfig->apPin = 0;
gpioConfig->ledPin = 2;
@@ -1063,6 +1067,7 @@ void AmsWebServer::handleSetup() {
wifi.sleep = 1;
break;
case 4: // Pow GPIO12
config->clearGpio(*gpioConfig);
gpioConfig->hanPin = 12;
gpioConfig->apPin = 0;
gpioConfig->ledPin = 2;
@@ -1073,6 +1078,7 @@ void AmsWebServer::handleSetup() {
wifi.sleep = 1;
break;
case 5: // Pow-K+ UART2
config->clearGpio(*gpioConfig);
gpioConfig->hanPin = 16;
gpioConfig->apPin = 0;
gpioConfig->ledPinRed = 13;
@@ -1084,6 +1090,7 @@ void AmsWebServer::handleSetup() {
wifi.sleep = 1;
break;
case 6: // Pow-P1
config->clearGpio(*gpioConfig);
gpioConfig->hanPin = 16;
gpioConfig->apPin = 0;
gpioConfig->ledPinRed = 13;
@@ -1094,6 +1101,7 @@ void AmsWebServer::handleSetup() {
gpioConfig->vccResistorVcc = 33;
break;
case 7: // Pow-U+
config->clearGpio(*gpioConfig);
gpioConfig->hanPin = 16;
gpioConfig->apPin = 0;
gpioConfig->ledPinRed = 13;