Skip to content

Commit 2bf1842

Browse files
J-RiosJ-Rios
authored
Merge pull request #7 from J-Rios/ci-local-lib
CI build examples using local minbasecli version
2 parents 0cc3f9c + 2e85fa6 commit 2bf1842

13 files changed

Lines changed: 185 additions & 104 deletions

File tree

‎.github/workflows/build_avr.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request:
55
branches:
66
- main
7+
- development
78

89
jobs:
910
build_avr:
@@ -26,9 +27,11 @@ jobs:
2627
sudo apt-get -y install cflow
2728
- name: Build
2829
run: |
29-
cd examples/avr/basic_usage/build
30+
cd examples/avr/
31+
cd basic_usage/build/
3032
make clean
3133
make build DEVICE=atmega328p F_CPU=16000000L
32-
cd examples/avr/basic_usage_callbacks/build
34+
cd ../../
35+
cd basic_usage_callbacks/build/
3336
make clean
3437
make build DEVICE=atmega328p F_CPU=16000000L

‎.github/workflows/build_linux.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request:
55
branches:
66
- main
7+
- development
78

89
jobs:
910
build_linux:
@@ -26,9 +27,11 @@ jobs:
2627
sudo apt-get -y install cflow
2728
- name: Build
2829
run: |
29-
cd examples/linux/basic_usage/build
30+
cd examples/linux/
31+
cd basic_usage/build/
3032
make clean
3133
make build
32-
cd examples/linux/basic_usage_callbacks/build
34+
cd ../../
35+
cd basic_usage_callbacks/build/
3336
make clean
3437
make build

‎.github/workflows/build_pio_arduino.yml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,12 @@ on:
44
pull_request:
55
branches:
66
- main
7+
- development
78

89
jobs:
910
build_pio_arduino:
1011

1112
runs-on: ubuntu-latest
12-
strategy:
13-
matrix:
14-
example: [
15-
examples/arduino/basic_usage/src/main.cpp,
16-
examples/arduino/basic_usage_callbacks/src/main.cpp
17-
]
18-
1913
steps:
2014
- uses: actions/checkout@v2
2115
- name: Cache pip
@@ -36,6 +30,10 @@ jobs:
3630
python -m pip install --upgrade pip
3731
pip install --upgrade platformio
3832
- name: Run PlatformIO
39-
run: pio ci --project-conf="examples/arduino/platformio.ini"
40-
env:
41-
PLATFORMIO_CI_SRC: ${{ matrix.example }}
33+
run: |
34+
pio run -c examples/arduino/platformio.ini \
35+
-d examples/arduino/basic_usage \
36+
-e arduino_uno_atmega328 -e arduino_esp32 -e arduino_esp8266
37+
pio run -c examples/arduino/platformio.ini \
38+
-d examples/arduino/basic_usage_callbacks \
39+
-e arduino_uno_atmega328 -e arduino_esp32 -e arduino_esp8266

‎.github/workflows/build_pio_espidf.yml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,12 @@ on:
44
pull_request:
55
branches:
66
- main
7+
- development
78

89
jobs:
910
build_pio_espidf:
1011

1112
runs-on: ubuntu-latest
12-
strategy:
13-
matrix:
14-
example: [
15-
examples/espidf/basic_usage/src/main.cpp,
16-
examples/espidf/basic_usage_callbacks/src/main.cpp
17-
]
18-
1913
steps:
2014
- uses: actions/checkout@v2
2115
- name: Cache pip
@@ -36,6 +30,10 @@ jobs:
3630
python -m pip install --upgrade pip
3731
pip install --upgrade platformio
3832
- name: Run PlatformIO
39-
run: pio ci --project-conf="examples/espidf/basic_usage/platformio.ini"
40-
env:
41-
PLATFORMIO_CI_SRC: ${{ matrix.example }}
33+
run: |
34+
pio run -c examples/espidf/platformio.ini \
35+
-d examples/espidf/basic_usage \
36+
-e espidf_esp32 -e espidf_esp32_c3
37+
pio run -c examples/espidf/platformio.ini \
38+
-d examples/espidf/basic_usage_callbacks \
39+
-e espidf_esp32 -e espidf_esp32_c3

‎examples/arduino/basic_usage/platformio.ini‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
[platformio]
1111
default_envs = arduino_esp32 ; Build ESP32 with Arduino Framework
12+
;default_envs = arduino_esp32_c3 ; Build ESP32-C3 with Arduino Framework
1213
;default_envs = arduino_esp8266 ; Build ESP8266 with Arduino Framework
1314
;default_envs = arduino_uno_atmega328 ; Build Arduino Uno with Arduino Framework
1415
;default_envs = arduino_mega_atmega2560 ; Build Arduino Mega with Arduino Framework
@@ -19,51 +20,58 @@ default_envs = arduino_esp32 ; Build ESP32 with Arduino Framework
1920
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2021

2122
[env]
22-
lib_deps = minbasecli@1.2.0
23+
lib_deps = minbasecli
2324

2425
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2526

2627
; Arduino Build Configs
2728

2829
; ESP32 Arduino
2930
[env:arduino_esp32]
30-
platform = espressif32@3.5.0
31+
platform = espressif32@5.0.0
3132
board = esp32dev
3233
framework = arduino
3334

35+
; ESP32-C3 Arduino
36+
[env:arduino_esp32_c3]
37+
platform = espressif32@5.0.0
38+
board = esp32-c3-devkitm-1
39+
framework = arduino
40+
board_build.mcu = esp32c3
41+
3442
; ESP8266 Arduino
3543
[env:arduino_esp8266]
36-
platform = espressif8266@3.2.0
44+
platform = espressif8266@4.0.1
3745
board = esp12e
3846
framework = arduino
3947

4048
; Arduino Uno (atmega328)
4149
[env:arduino_uno_atmega328]
42-
platform = atmelavr@3.3.0
50+
platform = atmelavr@4.0.0
4351
board = uno
4452
framework = arduino
4553

4654
; Arduino Mega (atmega2560)
4755
[env:arduino_mega_atmega2560]
48-
platform = atmelavr@3.3.0
56+
platform = atmelavr@4.0.0
4957
board = megaatmega2560
5058
framework = arduino
5159

5260
; Arduino Nano (atmega168)
5361
[env:arduino_nano_atmega168]
54-
platform = atmelavr@3.3.0
62+
platform = atmelavr@4.0.0
5563
board = nanoatmega168
5664
framework = arduino
5765

5866
; Arduino Nano (atmega328)
5967
[env:arduino_nano_atmega328]
60-
platform = atmelavr@3.3.0
68+
platform = atmelavr@4.0.0
6169
board = nanoatmega328
6270
framework = arduino
6371

6472
; Arduino Pro Micro (atmega32u4)
6573
[env:arduino_micro_atmega32u4]
66-
platform = atmelavr@3.3.0
74+
platform = atmelavr@4.0.0
6775
board = micro
6876
framework = arduino
6977
;build_flags = -DUSBCON=1

‎examples/arduino/basic_usage/src/main.cpp‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/**
2-
* @file examples/arduino/basic_usage/src/basic_usage.ino
2+
* @file examples/arduino/basic_usage/src/main.cpp
33
* @author Jose Miguel Rios Rubio <jrios.github@gmail.com>
4-
* @date 02-04-2022
5-
* @version 1.0.1
4+
* @date 10-07-2022
5+
* @version 1.0.2
66
*
77
* @section DESCRIPTION
88
*
@@ -76,7 +76,7 @@ void setup()
7676

7777
// CLI init to use Serial as interface
7878
Cli.setup(&Serial);
79-
Cli.printf("\nCommand Line Interface is ready\n\n");
79+
Cli.printf(PSTR("\nCommand Line Interface is ready\n\n"));
8080
}
8181

8282
void loop()
@@ -87,21 +87,21 @@ void loop()
8787
if(Cli.manage(&cli_read))
8888
{
8989
// Show read result element
90-
Cli.printf("Command received: %s\n", cli_read.cmd);
91-
Cli.printf("Number of arguments: %d\n", (int)(cli_read.argc));
90+
Cli.printf(PSTR("Command received: %s\n"), cli_read.cmd);
91+
Cli.printf(PSTR("Number of arguments: %d\n"), (int)(cli_read.argc));
9292
for(int i = 0; i < cli_read.argc; i++)
93-
Cli.printf(" Argument %d: %s", i, cli_read.argv[i]);
94-
Cli.printf("\n");
93+
Cli.printf(PSTR(" Argument %d: %s"), i, cli_read.argv[i]);
94+
Cli.printf(PSTR("\n"));
9595

9696
// Handle Commands
97-
if(strcmp(cli_read.cmd, "help") == 0)
97+
if(strcmp(cli_read.cmd, PSTR("help")) == 0)
9898
{
99-
Cli.printf("Available Commands:\n");
100-
Cli.printf(" help - Current info.\n");
101-
Cli.printf(" led [on/off] - Turn LED ON or OFF.\n");
102-
Cli.printf(" version - Shows current firmware version.\n");
99+
Cli.printf(PSTR("Available Commands:\n"));
100+
Cli.printf(PSTR(" help - Current info.\n"));
101+
Cli.printf(PSTR(" led [on/off] - Turn LED ON or OFF.\n"));
102+
Cli.printf(PSTR(" version - Shows current firmware version.\n"));
103103
}
104-
else if(strcmp(cli_read.cmd, "led") == 0)
104+
else if(strcmp(cli_read.cmd, PSTR("led")) == 0)
105105
{
106106
bool invalid_argv = false;
107107
char* led_mode = NULL;
@@ -112,30 +112,30 @@ void loop()
112112
else
113113
{
114114
led_mode = cli_read.argv[0];
115-
if(strcmp(led_mode, "on") == 0)
115+
if(strcmp(led_mode, PSTR("on")) == 0)
116116
{
117-
Cli.printf("Turning LED ON.\n");
117+
Cli.printf(PSTR("Turning LED ON.\n"));
118118
digitalWrite(COMMAND_LED, HIGH);
119119
}
120-
else if(strcmp(led_mode, "off") == 0)
120+
else if(strcmp(led_mode, PSTR("off")) == 0)
121121
{
122-
Cli.printf("Turning LED OFF.\n");
122+
Cli.printf(PSTR("Turning LED OFF.\n"));
123123
digitalWrite(COMMAND_LED, LOW);
124124
}
125125
else
126126
invalid_argv = true;
127127
}
128128

129129
if(invalid_argv)
130-
Cli.printf("led command needs \"on\" or \"off\" arg.\n");
130+
Cli.printf(PSTR("led command needs \"on\" or \"off\" arg.\n"));
131131
}
132-
else if(strcmp(cli_read.cmd, "version") == 0)
132+
else if(strcmp(cli_read.cmd, PSTR("version")) == 0)
133133
{
134-
Cli.printf("FW App Version: %s\n", FW_APP_VERSION);
134+
Cli.printf(PSTR("FW App Version: %s\n"), FW_APP_VERSION);
135135
}
136136
// ...
137137
else
138-
Cli.printf("Unkown command.\n");
139-
Cli.printf("\n");
138+
Cli.printf(PSTR("Unkown command.\n"));
139+
Cli.printf(PSTR("\n"));
140140
}
141141
}

‎examples/arduino/basic_usage_callbacks/platformio.ini‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
[platformio]
1111
default_envs = arduino_esp32 ; Build ESP32 with Arduino Framework
12+
;default_envs = arduino_esp32_c3 ; Build ESP32-C3 with Arduino Framework
1213
;default_envs = arduino_esp8266 ; Build ESP8266 with Arduino Framework
1314
;default_envs = arduino_uno_atmega328 ; Build Arduino Uno with Arduino Framework
1415
;default_envs = arduino_mega_atmega2560 ; Build Arduino Mega with Arduino Framework
@@ -19,51 +20,58 @@ default_envs = arduino_esp32 ; Build ESP32 with Arduino Framework
1920
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2021

2122
[env]
22-
lib_deps = minbasecli@1.2.0
23+
lib_deps = minbasecli
2324

2425
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2526

2627
; Arduino Build Configs
2728

2829
; ESP32 Arduino
2930
[env:arduino_esp32]
30-
platform = espressif32@3.5.0
31+
platform = espressif32@5.0.0
3132
board = esp32dev
3233
framework = arduino
3334

35+
; ESP32-C3 Arduino
36+
[env:arduino_esp32_c3]
37+
platform = espressif32@5.0.0
38+
board = esp32-c3-devkitm-1
39+
framework = arduino
40+
board_build.mcu = esp32c3
41+
3442
; ESP8266 Arduino
3543
[env:arduino_esp8266]
36-
platform = espressif8266@3.2.0
44+
platform = espressif8266@4.0.1
3745
board = esp12e
3846
framework = arduino
3947

4048
; Arduino Uno (atmega328)
4149
[env:arduino_uno_atmega328]
42-
platform = atmelavr@3.3.0
50+
platform = atmelavr@4.0.0
4351
board = uno
4452
framework = arduino
4553

4654
; Arduino Mega (atmega2560)
4755
[env:arduino_mega_atmega2560]
48-
platform = atmelavr@3.3.0
56+
platform = atmelavr@4.0.0
4957
board = megaatmega2560
5058
framework = arduino
5159

5260
; Arduino Nano (atmega168)
5361
[env:arduino_nano_atmega168]
54-
platform = atmelavr@3.3.0
62+
platform = atmelavr@4.0.0
5563
board = nanoatmega168
5664
framework = arduino
5765

5866
; Arduino Nano (atmega328)
5967
[env:arduino_nano_atmega328]
60-
platform = atmelavr@3.3.0
68+
platform = atmelavr@4.0.0
6169
board = nanoatmega328
6270
framework = arduino
6371

6472
; Arduino Pro Micro (atmega32u4)
6573
[env:arduino_micro_atmega32u4]
66-
platform = atmelavr@3.3.0
74+
platform = atmelavr@4.0.0
6775
board = micro
6876
framework = arduino
6977
;build_flags = -DUSBCON=1

0 commit comments

Comments
 (0)