Skip to content

Commit 8030d60

Browse files
fabik111fabik111
committed
Provisioning sketch version 0.6.1
1 parent b1a7375 commit 8030d60

File tree

3 files changed

+63
-114
lines changed

3 files changed

+63
-114
lines changed

‎examples/utility/Provisioning_2.0/OptaFactoryTest.cpp‎

Lines changed: 57 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -59,37 +59,30 @@ void OptaFactoryTestClass::begin() {
5959

6060
/* Set ADC resolution to 12 bits */
6161
analogReadResolution(12);
62-
do{
62+
do {
6363
_info = boardInfo();
6464
} while (_info == nullptr);
65-
if(_info->_board_functionalities.rs485 == 1){
65+
if(_info->_board_functionalities.rs485 == 1) {
6666
ResetInput::getInstance().setPinChangedCallback(buttonCallbackRS485);
6767
} else {
6868
ResetInput::getInstance().setPinChangedCallback(endCallback);
6969
}
7070

7171
}
7272
void OptaFactoryTestClass::optaIDTest() {
73-
if(_info->magic == 0xB5)
74-
{
75-
if(_info->vid == VID_FINDER)
76-
{
77-
if(_info->pid == PID_BASIC)
78-
{
73+
if(_info->magic == 0xB5) {
74+
if(_info->vid == VID_FINDER) {
75+
if(_info->pid == PID_BASIC) {
7976
digitalWrite(RL4, HIGH);
8077
digitalWrite(LED4_SYS, HIGH);
8178
}
82-
else
83-
{
84-
if(_info->pid == PID_PLUS)
85-
{
79+
else {
80+
if(_info->pid == PID_PLUS) {
8681
digitalWrite(RL3, HIGH);
8782
digitalWrite(LED3_SYS, HIGH);
8883
}
89-
else
90-
{
91-
if(_info->pid == PID_ADVANCED)
92-
{
84+
else {
85+
if(_info->pid == PID_ADVANCED) {
9386
digitalWrite(RL4, HIGH);
9487
digitalWrite(LED4_SYS, HIGH);
9588
digitalWrite(RL3, HIGH);
@@ -98,28 +91,21 @@ void OptaFactoryTestClass::optaIDTest() {
9891
}
9992
}
10093
}
101-
else
102-
{
103-
if(_info->vid == VID_ARDUINO)
104-
{
105-
if(_info->pid == PID_BASIC)
106-
{
94+
else {
95+
if(_info->vid == VID_ARDUINO) {
96+
if(_info->pid == PID_BASIC) {
10797
digitalWrite(RL2, HIGH);
10898
digitalWrite(LED2_SYS, HIGH);
10999
}
110-
else
111-
{
112-
if(_info->pid == PID_PLUS)
113-
{
100+
else {
101+
if(_info->pid == PID_PLUS) {
114102
digitalWrite(RL2, HIGH);
115103
digitalWrite(LED2_SYS, HIGH);
116104
digitalWrite(RL4, HIGH);
117105
digitalWrite(LED4_SYS, HIGH);
118106
}
119-
else
120-
{
121-
if(_info->pid == PID_ADVANCED)
122-
{
107+
else {
108+
if(_info->pid == PID_ADVANCED) {
123109
digitalWrite(RL2, HIGH);
124110
digitalWrite(LED2_SYS, HIGH);
125111
digitalWrite(RL3, HIGH);
@@ -141,14 +127,12 @@ void OptaFactoryTestClass::optaIDTest() {
141127
}
142128

143129
/* Turn ON all LED */
144-
for(uint8_t i = 0; i < N_LED; i++)
145-
{
130+
for(uint8_t i = 0; i < N_LED; i++) {
146131
digitalWrite(n_led[i], HIGH);
147132
delay(50);
148133
}
149134
/* Turn OFF all LED */
150-
for(uint8_t i = 0; i < N_LED; i++)
151-
{
135+
for(uint8_t i = 0; i < N_LED; i++) {
152136
digitalWrite(n_led[i], LOW);
153137
delay(50);
154138
}
@@ -175,33 +159,29 @@ void OptaFactoryTestClass::optaIDTest() {
175159
}
176160

177161
bool OptaFactoryTestClass::poll() {
178-
if(_ms10 < millis())
179-
{
162+
if(_ms10 < millis()) {
180163
_ms10 = millis() + 10;
181164
ledManage();
182165
}
183-
if(_ms100 < millis())
184-
{
166+
if(_ms100 < millis()) {
185167
_ms100 = millis() + 100;
186168

187169
inputManage();
188170

189171
}
190172

191-
if (_showRS485Result){
173+
if (_showRS485Result) {
192174
showRS485SuccessResult();
193175
}
194176

195-
if (_nextBoardInfoPrint < millis())
196-
{
177+
if (_nextBoardInfoPrint < millis()) {
197178
_nextBoardInfoPrint = millis() + 3000;
198179
Serial.print(millis());
199180
Serial.println("ms");
200181
printModel();
201182
}
202183

203-
if(_nextRS485Run < millis() && _info->_board_functionalities.rs485 == 1 && _rs485_test_done == false)
204-
{
184+
if(_nextRS485Run < millis() && _info->_board_functionalities.rs485 == 1 && _rs485_test_done == false) {
205185
_nextRS485Run = millis() + 1000;
206186
rs485Manage();
207187
}
@@ -211,8 +191,7 @@ bool OptaFactoryTestClass::poll() {
211191
void OptaFactoryTestClass::ledManage(void)
212192
{
213193
/* Run every 10ms */
214-
if(_all_on)
215-
{
194+
if(_all_on) {
216195
digitalWrite(LEDR, HIGH);
217196
digitalWrite(LEDG, HIGH);
218197
digitalWrite(LEDB, HIGH);
@@ -222,89 +201,74 @@ void OptaFactoryTestClass::ledManage(void)
222201
void OptaFactoryTestClass::inputManage(void)
223202
{
224203
/* Read all analog input values */
225-
for(uint8_t i = 0; i < N_ANALOG_INPUTS; i++)
226-
{
204+
for(uint8_t i = 0; i < N_ANALOG_INPUTS; i++) {
227205
v_input[i] = analogRead(n_input[i]) * (3.3 / 4095.0);
228206
}
229-
if(v_input[0] >= ANALOG_THS)
230-
{
207+
if(v_input[0] >= ANALOG_THS) {
231208
_test_running = true;
232209
digitalWrite(RL1, HIGH);
233210
digitalWrite(LED1_SYS, HIGH);
234211
}
235-
if(v_input[1] >= ANALOG_THS)
236-
{
212+
if(v_input[1] >= ANALOG_THS) {
237213
digitalWrite(RL2, HIGH);
238214
digitalWrite(LED2_SYS, HIGH);
239215
}
240-
if(v_input[2] >= ANALOG_THS)
241-
{
216+
if(v_input[2] >= ANALOG_THS) {
242217
digitalWrite(RL3, HIGH);
243218
digitalWrite(LED3_SYS, HIGH);
244219
}
245-
if(v_input[3] >= ANALOG_THS)
246-
{
220+
if(v_input[3] >= ANALOG_THS) {
247221
digitalWrite(RL4, HIGH);
248222
digitalWrite(LED4_SYS, HIGH);
249223
}
250-
if(v_input[4] >= ANALOG_THS)
251-
{
224+
if(v_input[4] >= ANALOG_THS) {
252225
digitalWrite(RL1, HIGH);
253226
digitalWrite(LED1_SYS, HIGH);
254227
digitalWrite(RL2, HIGH);
255228
digitalWrite(LED2_SYS, HIGH);
256229
}
257-
if(v_input[5] >= ANALOG_THS)
258-
{
230+
if(v_input[5] >= ANALOG_THS) {
259231
digitalWrite(RL3, HIGH);
260232
digitalWrite(LED3_SYS, HIGH);
261233
digitalWrite(RL4, HIGH);
262234
digitalWrite(LED4_SYS, HIGH);
263235
}
264-
if(v_input[6] >= ANALOG_THS)
265-
{
236+
if(v_input[6] >= ANALOG_THS) {
266237
digitalWrite(RL1, HIGH);
267238
digitalWrite(LED1_SYS, HIGH);
268239
digitalWrite(RL3, HIGH);
269240
digitalWrite(LED3_SYS, HIGH);
270241
}
271-
if(v_input[7] >= ANALOG_THS)
272-
{
242+
if(v_input[7] >= ANALOG_THS) {
273243
digitalWrite(RL2, HIGH);
274244
digitalWrite(LED2_SYS, HIGH);
275245
digitalWrite(RL4, HIGH);
276246
digitalWrite(LED4_SYS, HIGH);
277247
}
278248

279-
if((v_input[0] < ANALOG_THS) && (v_input[4] < ANALOG_THS) && (v_input[6] < ANALOG_THS))
280-
{
249+
if((v_input[0] < ANALOG_THS) && (v_input[4] < ANALOG_THS) && (v_input[6] < ANALOG_THS)) {
281250
digitalWrite(RL1, LOW);
282251
digitalWrite(LED1_SYS, LOW);
283252
}
284-
if((v_input[1] < ANALOG_THS) && (v_input[4] < ANALOG_THS) && (v_input[7] < ANALOG_THS))
285-
{
253+
if((v_input[1] < ANALOG_THS) && (v_input[4] < ANALOG_THS) && (v_input[7] < ANALOG_THS)) {
286254
digitalWrite(RL2, LOW);
287255
digitalWrite(LED2_SYS, LOW);
288256
}
289-
if((v_input[2] < ANALOG_THS) && (v_input[5] < ANALOG_THS) && (v_input[6] < ANALOG_THS))
290-
{
257+
if((v_input[2] < ANALOG_THS) && (v_input[5] < ANALOG_THS) && (v_input[6] < ANALOG_THS)) {
291258
digitalWrite(RL3, LOW);
292259
digitalWrite(LED3_SYS, LOW);
293260
}
294-
if((v_input[3] < ANALOG_THS) && (v_input[5] < ANALOG_THS) && (v_input[7] < ANALOG_THS))
295-
{
261+
if((v_input[3] < ANALOG_THS) && (v_input[5] < ANALOG_THS) && (v_input[7] < ANALOG_THS)) {
296262
digitalWrite(RL4, LOW);
297263
digitalWrite(LED4_SYS, LOW);
298264
}
299-
if((v_input[0] >= ANALOG_THS) && (v_input[1] >= ANALOG_THS) && (v_input[2] >= ANALOG_THS) && (v_input[3] >= ANALOG_THS) && (v_input[4] >= ANALOG_THS) && (v_input[5] >= ANALOG_THS) && (v_input[6] >= ANALOG_THS) && (v_input[7] >= ANALOG_THS))
300-
{
265+
if((v_input[0] >= ANALOG_THS) && (v_input[1] >= ANALOG_THS) && (v_input[2] >= ANALOG_THS) && (v_input[3] >= ANALOG_THS) && (v_input[4] >= ANALOG_THS) && (v_input[5] >= ANALOG_THS) && (v_input[6] >= ANALOG_THS) && (v_input[7] >= ANALOG_THS)) {
301266
digitalWrite(LEDR, HIGH);
302267
digitalWrite(LEDG, HIGH);
303268
digitalWrite(LEDB, HIGH);
304269
_all_on = true;
305270
}
306-
else if( _all_on == true )
307-
{
271+
else if( _all_on == true ) {
308272
digitalWrite(LEDR, LOW);
309273
digitalWrite(LEDG, LOW);
310274
digitalWrite(LEDB, LOW);
@@ -318,8 +282,7 @@ void OptaFactoryTestClass::rs485Manage() {
318282
digitalWrite(MY_RS485_DE_PIN, HIGH);
319283
delay(10);
320284

321-
for(uint32_t i = 0; i < N_PULSE; i++)
322-
{
285+
for(uint32_t i = 0; i < N_PULSE; i++) {
323286
digitalWrite(MY_RS485_TX_PIN, HIGH);
324287
delay(1);
325288
digitalWrite(MY_RS485_TX_PIN, LOW);
@@ -331,34 +294,28 @@ void OptaFactoryTestClass::rs485Manage() {
331294

332295
/* Search start of incoming transmission */
333296
_rs485_pulse = 0;
334-
while((_rs485_pulse == 0) && (t_rs485_pulse < 200))
335-
{
297+
while((_rs485_pulse == 0) && (t_rs485_pulse < 200)) {
336298
t_rs485_pulse++;
337299
delay(1);
338300
}
339301

340302
_rs485_pulse = 0;
341303

342-
if(t_rs485_pulse < 200)
343-
{
304+
if(t_rs485_pulse < 200) {
344305
/* Receive data */
345306
t_rs485_pulse = 0;
346307
uint32_t rs485_pulse_old = 0;
347-
for(t_rs485_pulse = 0; t_rs485_pulse < 20; t_rs485_pulse++)
348-
{
349-
if(rs485_pulse_old != _rs485_pulse)
350-
{
308+
for(t_rs485_pulse = 0; t_rs485_pulse < 20; t_rs485_pulse++) {
309+
if(rs485_pulse_old != _rs485_pulse) {
351310
rs485_pulse_old = _rs485_pulse;
352311
t_rs485_pulse = 0;
353312
}
354313
delay(10);
355314
}
356315

357316
/* End of receiving */
358-
if(_rs485_pulse > 0)
359-
{
360-
if((_rs485_pulse == N_PULSE) || (_rs485_pulse == N_PULSE + 1))
361-
{
317+
if(_rs485_pulse > 0) {
318+
if((_rs485_pulse == N_PULSE) || (_rs485_pulse == N_PULSE + 1)) {
362319
Serial.println("RS485 check OK");
363320
_rs485_test_done = true;
364321
_rs485_ok = true;
@@ -376,8 +333,7 @@ void OptaFactoryTestClass::printInfo() {
376333
Serial.print("**********************************\n");
377334
Serial.print("\n");
378335

379-
if(_info->magic == 0xB5)
380-
{
336+
if(_info->magic == 0xB5) {
381337
printModel();
382338

383339
Serial.println("VID: 0x" + String(_info->vid, HEX));
@@ -386,24 +342,19 @@ void OptaFactoryTestClass::printInfo() {
386342
char mac_address_char[18];
387343
uint8_t idx_mac_address_char = 0;
388344
uint8_t a;
389-
for(uint8_t i = 0; i < 6; i++)
390-
{
345+
for(uint8_t i = 0; i < 6; i++) {
391346
a = _info->mac_address[i] >> 4;
392-
for(uint8_t b = 0; b < 2; b++)
393-
{
394-
if(a <= 9)
395-
{
347+
for(uint8_t b = 0; b < 2; b++) {
348+
if(a <= 9) {
396349
mac_address_char[idx_mac_address_char] = a + 0x30;
397350
}
398-
else
399-
{
351+
else {
400352
mac_address_char[idx_mac_address_char] = a + 0x37;
401353
}
402354
idx_mac_address_char++;
403355
a = _info->mac_address[i] & 0x0F;
404356
}
405-
if(i < 5)
406-
{
357+
if(i < 5) {
407358
mac_address_char[idx_mac_address_char++] = ':';
408359
}
409360
}
@@ -420,13 +371,11 @@ void OptaFactoryTestClass::printInfo() {
420371

421372
void OptaFactoryTestClass::printModel(void)
422373
{
423-
switch(_info->vid)
424-
{
374+
switch(_info->vid) {
425375
case VID_FINDER:
426376
{
427377
Serial.print(">>> Finder OPTA ");
428-
switch(_info->pid)
429-
{
378+
switch(_info->pid) {
430379
case PID_BASIC:
431380
{
432381
Serial.print("Basic");
@@ -452,8 +401,7 @@ void OptaFactoryTestClass::printModel(void)
452401
case VID_ARDUINO:
453402
{
454403
Serial.print(">>> Arduino OPTA ");
455-
switch(_info->pid)
456-
{
404+
switch(_info->pid) {
457405
case PID_BASIC:
458406
{
459407
Serial.print("Lite - AFX00003");
@@ -485,17 +433,15 @@ void OptaFactoryTestClass::printModel(void)
485433
}
486434

487435
void OptaFactoryTestClass::endCallback() {
488-
if(digitalRead(BTN_USER) == HIGH)
489-
{
436+
if(digitalRead(BTN_USER) == HIGH) {
490437
_test_running = false;
491438
}
492439
}
493440

494441
void OptaFactoryTestClass::buttonCallbackRS485()
495442
{
496443

497-
if(digitalRead(BTN_USER) == LOW && _rs485_ok == true)
498-
{
444+
if(digitalRead(BTN_USER) == LOW && _rs485_ok == true) {
499445
_showRS485Result = true;
500446
}
501447
}

‎examples/utility/Provisioning_2.0/OptaFactoryTest.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
License, v. 2.0. If a copy of the MPL was not distributed with this
66
file, You can obtain one at http://mozilla.org/MPL/2.0/.
77
*/
8+
89
#pragma once
910
#include <Arduino.h>
1011
#include "opta_info.h"

0 commit comments

Comments
 (0)