@@ -269,7 +269,10 @@ void setup()
269269 {
270270 auto const exp_analog = opta_expansion_manager_opcua->create_analog_expansion (i);
271271
272- for (int a = OA_CH_0; a <= OA_CH_5; a++)
272+ std::list<int > ANALOG_EXPANSION_MODULE_ANALOG_INPUT_LIST = {OA_CH_0, OA_CH_1, OA_CH_2, OA_CH_3, OA_CH_5, OA_CH_6};
273+
274+ int input_num = 1 ;
275+ for (int const a : ANALOG_EXPANSION_MODULE_ANALOG_INPUT_LIST)
273276 {
274277 /* Configure analog expansion module analog channels as analog inputs. */
275278 AnalogExpansion::beginChannelAsAdc (OptaController,
@@ -283,11 +286,15 @@ void setup()
283286
284287 /* Expose analog inputs as readable OPC UA properties. */
285288 char analog_in_name[32 ] = {0 };
286- snprintf (analog_in_name, sizeof (analog_in_name), " Analog Input I%d" , a + 1 );
289+ snprintf (analog_in_name, sizeof (analog_in_name), " Analog Input I%d" , input_num );
287290 exp_analog->analog_input_mgr ()->add_analog_input (opc_ua_server, analog_in_name, [i, a]() { return reinterpret_cast <AnalogExpansion *>(OptaController.getExpansionPtr (i))->pinVoltage (a); });
291+ input_num++;
288292 }
289293
290- for (int a = OA_CH_6; a <= OA_CH_7; a++)
294+ std::list<int > ANALOG_EXPANSION_MODULE_ANALOG_OUTPUT_LIST = {OA_CH_4, OA_CH_7};
295+
296+ int output_num = 1 ;
297+ for (int const a : ANALOG_EXPANSION_MODULE_ANALOG_OUTPUT_LIST)
291298 {
292299 /* Configure analog expansion module analog channels as analog outputs. */
293300 AnalogExpansion::beginChannelAsDac (OptaController,
@@ -300,8 +307,9 @@ void setup()
300307
301308 /* Expose analog inputs as readable OPC UA properties. */
302309 char analog_out_name[32 ] = {0 };
303- snprintf (analog_out_name, sizeof (analog_out_name), " Analog Output O%d" , a - OA_CH_6 + 1 );
310+ snprintf (analog_out_name, sizeof (analog_out_name), " Analog Output O%d" , output_num );
304311 exp_analog->analog_output_mgr ()->add_analog_output (opc_ua_server, analog_out_name, [i, a](float const voltage) { return reinterpret_cast <AnalogExpansion *>(OptaController.getExpansionPtr (i))->pinVoltage (a, voltage); });
312+ output_num++;
305313 }
306314
307315 /* Configure controllable LEDs of analog expansion module. */
0 commit comments