[#143] PinsModule commands reduce duplication

susanw1 · Nov 21, 2023 · 0a3f02a · 0a3f02a
1 parent 45b1b95
commit 0a3f02a
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 54 deletions.
diff --git a/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/AtoDPinReadCommand.hpp b/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/AtoDPinReadCommand.hpp
@@ -22,12 +22,7 @@ class AtoDPinReadCommand: public AnalogRead_CommandDefs {
 public:
     static void execute(ZscriptCommandContext<ZP> ctx) {
         uint16_t pin;
-        if (!ctx.getField(ReqPin__P, &pin)) {
-            ctx.status(ResponseStatus::MISSING_KEY);
-            return;
-        }
-        if (pin >= ZP::pinCount) {
-            ctx.status(ResponseStatus::VALUE_OUT_OF_RANGE);
+        if (!ctx.getReqdFieldCheckLimit(ReqPin__P, ZP::pinCount, &pin)) {
             return;
         }
         CommandOutStream<ZP> out = ctx.getOutStream();

diff --git a/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/AtoDPinSetupCommand.hpp b/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/AtoDPinSetupCommand.hpp
@@ -22,12 +22,7 @@ class AtoDPinSetupCommand: public AToDSetup_CommandDefs {
 public:
     static void execute(ZscriptCommandContext<ZP> ctx) {
         uint16_t pin;
-        if (!ctx.getField(ReqPin__P, &pin)) {
-            ctx.status(ResponseStatus::MISSING_KEY);
-            return;
-        }
-        if (pin >= ZP::pinCount) {
-            ctx.status(ResponseStatus::VALUE_OUT_OF_RANGE);
+        if (!ctx.getReqdFieldCheckLimit(ReqPin__P, ZP::pinCount, &pin)) {
             return;
         }
 #ifdef ZSCRIPT_PIN_SUPPORT_ANALOG_NOTIFICATIONS

diff --git a/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/DigitalPinReadCommand.hpp b/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/DigitalPinReadCommand.hpp
@@ -22,12 +22,7 @@ class DigitalPinReadCommand: public DigitalRead_CommandDefs {
 public:
     static void execute(ZscriptCommandContext<ZP> ctx) {
         uint16_t pin;
-        if (!ctx.getField(ReqPin__P, &pin)) {
-            ctx.status(ResponseStatus::MISSING_KEY);
-            return;
-        }
-        if (pin >= ZP::pinCount) {
-            ctx.status(ResponseStatus::VALUE_OUT_OF_RANGE);
+        if (!ctx.getReqdFieldCheckLimit(ReqPin__P, ZP::pinCount, &pin)) {
             return;
         }
         CommandOutStream<ZP> out = ctx.getOutStream();

diff --git a/...ivers/native/arduino/src/main/c++/arduino/pins-module/commands/DigitalPinSetupCommand.hpp b/...ivers/native/arduino/src/main/c++/arduino/pins-module/commands/DigitalPinSetupCommand.hpp
@@ -22,12 +22,7 @@ class DigitalPinSetupCommand : public DigitalSetup_CommandDefs {
 public:
     static void execute(ZscriptCommandContext<ZP> ctx) {
         uint16_t pin;
-        if (!ctx.getField(ReqPin__P, &pin)) {
-            ctx.status(ResponseStatus::MISSING_KEY);
-            return;
-        }
-        if (pin >= ZP::pinCount) {
-            ctx.status(ResponseStatus::VALUE_OUT_OF_RANGE);
+        if (!ctx.getReqdFieldCheckLimit(ReqPin__P, ZP::pinCount, &pin)) {
             return;
         }
         uint16_t mode;

diff --git a/...ivers/native/arduino/src/main/c++/arduino/pins-module/commands/DigitalPinWriteCommand.hpp b/...ivers/native/arduino/src/main/c++/arduino/pins-module/commands/DigitalPinWriteCommand.hpp
@@ -22,12 +22,7 @@ class DigitalPinWriteCommand: public DigitalWrite_CommandDefs {
 public:
     static void execute(ZscriptCommandContext<ZP> ctx) {
         uint16_t pin;
-        if (!ctx.getField(ReqPin__P, &pin)) {
-            ctx.status(ResponseStatus::MISSING_KEY);
-            return;
-        }
-        if (pin >= ZP::pinCount) {
-            ctx.status(ResponseStatus::VALUE_OUT_OF_RANGE);
+        if (!ctx.getReqdFieldCheckLimit(ReqPin__P, ZP::pinCount, &pin)) {
             return;
         }
         uint16_t value;

diff --git a/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/DtoAPinSetupCommand.hpp b/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/DtoAPinSetupCommand.hpp
@@ -22,12 +22,7 @@ class DtoAPinSetupCommand: public DToASetup_CommandDefs {
 public:
     static void execute(ZscriptCommandContext<ZP> ctx) {
         uint16_t pin;
-        if (!ctx.getField(ReqPin__P, &pin)) {
-            ctx.status(ResponseStatus::MISSING_KEY);
-            return;
-        }
-        if (pin >= ZP::pinCount) {
-            ctx.status(ResponseStatus::VALUE_OUT_OF_RANGE);
+        if (!ctx.getReqdFieldCheckLimit(ReqPin__P, ZP::pinCount, &pin)) {
             return;
         }
         CommandOutStream<ZP> out = ctx.getOutStream();

diff --git a/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/DtoAPinWriteCommand.hpp b/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/DtoAPinWriteCommand.hpp
@@ -22,12 +22,7 @@ class DtoAPinWriteCommand: public AnalogWrite_CommandDefs {
 public:
     static void execute(ZscriptCommandContext<ZP> ctx) {
         uint16_t pin;
-        if (!ctx.getField(ReqPin__P, &pin)) {
-            ctx.status(ResponseStatus::MISSING_KEY);
-            return;
-        }
-        if (pin >= ZP::pinCount) {
-            ctx.status(ResponseStatus::VALUE_OUT_OF_RANGE);
+        if (!ctx.getReqdFieldCheckLimit(ReqPin__P, ZP::pinCount, &pin)) {
             return;
         }
         uint16_t value;

diff --git a/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/PwmPinSetupCommand.hpp b/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/PwmPinSetupCommand.hpp
@@ -22,12 +22,7 @@ class PwmPinSetupCommand: public PwmSetup_CommandDefs {
 public:
     static void execute(ZscriptCommandContext<ZP> ctx) {
         uint16_t pin;
-        if (!ctx.getField(ReqPin__P, &pin)) {
-            ctx.status(ResponseStatus::MISSING_KEY);
-            return;
-        }
-        if (pin >= ZP::pinCount) {
-            ctx.status(ResponseStatus::VALUE_OUT_OF_RANGE);
+        if (!ctx.getReqdFieldCheckLimit(ReqPin__P, ZP::pinCount, &pin)) {
             return;
         }
         CommandOutStream<ZP> out = ctx.getOutStream();

diff --git a/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/PwmPinWriteCommand.hpp b/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/PwmPinWriteCommand.hpp
@@ -22,12 +22,7 @@ class PwmPinWriteCommand: public PwmWrite_CommandDefs {
 public:
     static void execute(ZscriptCommandContext<ZP> ctx) {
         uint16_t pin;
-        if (!ctx.getField(ReqPin__P, &pin)) {
-            ctx.status(ResponseStatus::MISSING_KEY);
-            return;
-        }
-        if (pin >= ZP::pinCount) {
-            ctx.status(ResponseStatus::VALUE_OUT_OF_RANGE);
+        if (!ctx.getReqdFieldCheckLimit(ReqPin__P, ZP::pinCount, &pin)) {
             return;
         }
         uint16_t value;