From ffb9e2cd818e1b0afb21e375abb8cf1cf5d3f2f8 Mon Sep 17 00:00:00 2001 From: Fabien TREGAN Date: Mon, 20 Jan 2025 12:01:03 +0100 Subject: [PATCH] Remove references to the unused Acknowledge pin. --- headers/addons/psx_input.h | 5 ----- proto/config.proto | 1 - src/addons/psx_input.cpp | 5 ----- src/config_utils.cpp | 1 - src/configs/webconfig.cpp | 2 -- www/src/Addons/PSX.tsx | 22 ---------------------- www/src/Locales/en/Addons/PSX.jsx | 3 +-- 7 files changed, 1 insertion(+), 38 deletions(-) diff --git a/headers/addons/psx_input.h b/headers/addons/psx_input.h index 97b010ba8..9f8938ff0 100644 --- a/headers/addons/psx_input.h +++ b/headers/addons/psx_input.h @@ -30,10 +30,6 @@ #define PSX_CLOCK_PIN -1 #endif -#ifndef PSX_ACKNOWLEDGE_PIN - #define PSX_ACKNOWLEDGE_PIN -1 -#endif - class PsxAddon : public GPAddon { public: virtual bool available(); @@ -42,7 +38,6 @@ class PsxAddon : public GPAddon { virtual void preprocess(); virtual std::string name() { return PsxAddonName; } private: - uint32_t acknowledgePin; uint32_t attentionPin; uint32_t clockPin; uint32_t commandPin; diff --git a/proto/config.proto b/proto/config.proto index e09b4ff00..b7bbd5b5a 100644 --- a/proto/config.proto +++ b/proto/config.proto @@ -700,7 +700,6 @@ message PsxOptions optional int32 attentionPin = 3; optional int32 commandPin = 4; optional int32 clockPin = 5; - optional int32 acknowledgePin = 6; } message KeyboardHostOptions diff --git a/src/addons/psx_input.cpp b/src/addons/psx_input.cpp index ccfb4619f..d38ee3b76 100644 --- a/src/addons/psx_input.cpp +++ b/src/addons/psx_input.cpp @@ -9,7 +9,6 @@ bool PsxAddon::available() { const PsxOptions& psxOptions = Storage::getInstance().getAddonOptions().psxOptions; return psxOptions.enabled - && isValidPin(psxOptions.acknowledgePin) && isValidPin(psxOptions.attentionPin) && isValidPin(psxOptions.clockPin) && isValidPin(psxOptions.commandPin) @@ -21,7 +20,6 @@ bool PsxAddon::available() { void PsxAddon::setup() { const PsxOptions& psxOptions = Storage::getInstance().getAddonOptions().psxOptions; - acknowledgePin = psxOptions.acknowledgePin; attentionPin = psxOptions.attentionPin; clockPin = psxOptions.clockPin; commandPin = psxOptions.commandPin; @@ -56,9 +54,6 @@ void PsxAddon::setup() { // Unknown (??, 8, white) // Acknowledge (IN, 9, green) - gpio_init(acknowledgePin); - gpio_pull_up(acknowledgePin); - gpio_set_dir(acknowledgePin, GPIO_IN); }; diff --git a/src/config_utils.cpp b/src/config_utils.cpp index b8f18fd38..3a838d46d 100644 --- a/src/config_utils.cpp +++ b/src/config_utils.cpp @@ -722,7 +722,6 @@ void ConfigUtils::initUnsetPropertiesWithDefaults(Config& config) INIT_UNSET_PROPERTY(config.addonOptions.psxOptions, attentionPin, PSX_ATTENTION_PIN); INIT_UNSET_PROPERTY(config.addonOptions.psxOptions, commandPin, PSX_COMMAND_PIN); INIT_UNSET_PROPERTY(config.addonOptions.psxOptions, clockPin, PSX_CLOCK_PIN); - INIT_UNSET_PROPERTY(config.addonOptions.psxOptions, acknowledgePin, PSX_ACKNOWLEDGE_PIN); // addonOptions.pcf8575Options INIT_UNSET_PROPERTY(config.addonOptions.pcf8575Options, enabled, I2C_PCF8575_ENABLED); diff --git a/src/configs/webconfig.cpp b/src/configs/webconfig.cpp index 5d542a8bf..f6c46107d 100644 --- a/src/configs/webconfig.cpp +++ b/src/configs/webconfig.cpp @@ -1595,7 +1595,6 @@ std::string setAddonOptions() docToPin(psxOptions.commandPin, doc, "psxCommandPin"); docToPin(psxOptions.attentionPin, doc, "psxAttentionPin"); docToPin(psxOptions.clockPin, doc, "psxClockPin"); - docToPin(psxOptions.acknowledgePin, doc, "psxAcknowledgePin"); InputHistoryOptions& inputHistoryOptions = Storage::getInstance().getAddonOptions().inputHistoryOptions; docToValue(inputHistoryOptions.length, doc, "inputHistoryLength"); @@ -2019,7 +2018,6 @@ std::string getAddonOptions() writeDoc(doc, "psxCommandPin", cleanPin(psxOptions.commandPin)); writeDoc(doc, "psxAttentionPin", cleanPin(psxOptions.attentionPin)); writeDoc(doc, "psxClockPin", cleanPin(psxOptions.clockPin)); - writeDoc(doc, "psxAcknowledgePin", cleanPin(psxOptions.acknowledgePin)); const InputHistoryOptions& inputHistoryOptions = Storage::getInstance().getAddonOptions().inputHistoryOptions; writeDoc(doc, "inputHistoryLength", inputHistoryOptions.length); diff --git a/www/src/Addons/PSX.tsx b/www/src/Addons/PSX.tsx index 7ab70c58a..83876367c 100644 --- a/www/src/Addons/PSX.tsx +++ b/www/src/Addons/PSX.tsx @@ -34,12 +34,6 @@ export const psxScheme = { .max(29) .label('Validation message PSX Clock') .validatePinWhenValue('psxEnabled'), - psxAcknowledgePin: yup - .number() - .min(-1) - .max(29) - .label('Validation message PSX Acknowledge') - .validatePinWhenValue('psxEnabled'), }; export const psxState = { @@ -48,7 +42,6 @@ export const psxState = { psxCommandPin: -1, psxAttentionPin: -1, psxClockPin: -1, - psxAcknowledgePin: -1, }; const PSX = ({ values, errors, handleChange, handleCheckbox }) => { @@ -122,21 +115,6 @@ const PSX = ({ values, errors, handleChange, handleCheckbox }) => { max={29} /> - - -