Skip to content

Commit 3f3a5cc

Browse files
authored
Update owl without hotfixes (#121)
* [feat] add owl token run length globally to cmakelist * [remove] removed hotfix & blocker * [update] changed to new owl version * [update] changed to new parsed parser.h * [revert] generate fresh parser.h again
1 parent 97b9740 commit 3f3a5cc

File tree

5 files changed

+3445
-3149
lines changed

5 files changed

+3445
-3149
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ jobs:
1818
- name: Determine version
1919
id: version_id
2020
run: echo "::set-output name=value::$(git describe --always --tags --dirty)"
21+
- name: Generate parser
22+
run: "./gen_parser.sh"
2123
- name: Build firmware
2224
uses: espressif/esp-idf-ci-action@v1
2325
with:

gen_parser.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
echo "Generating parser..."
44
if [[ "language.owl" -nt main/parser.h ]]
55
then
6-
echo "This generator does not include changes from PRs #107 and #112 and should not be used."
7-
exit 1
8-
96
pushd owl
107
make
118
popd
@@ -18,11 +15,6 @@ then
1815
exit 1
1916
fi
2017

21-
# remove minimum size of 4096 bytes (see https://github.com/zauberzeug/lizard/issues/23)
22-
sed -i '' 's/while (n < size \|\| n < 4096)/while (n < size)/g' main/parser.h
23-
24-
# increase RESERVATION_AMOUNT to 11 (see https://github.com/zauberzeug/field_friend/issues/7)
25-
sed -i '' 's/#define RESERVATION_AMOUNT 10/#define RESERVATION_AMOUNT 11/g' main/parser.h
2618
else
2719
echo "Nothing to do."
2820
fi

main/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ idf_component_register(
1111
INCLUDE_DIRS "." "compilation" "modules" "utils" "${CMAKE_BINARY_DIR}/generated"
1212
REQUIRES driver esp_wifi esp_timer efuse lwip esp_event esp_netif esp_adc esp32-ble-command esp32-zeug esp32-serial-flasher app_update esp_driver_uart esp_https_ota spi_flash
1313
)
14-
14+
add_compile_definitions(OWL_TOKEN_RUN_LENGTH=256)
1515
component_compile_options(-std=gnu++17 -Wsuggest-override)
1616
set_source_files_properties(parser.c PROPERTIES COMPILE_FLAGS -Wno-missing-field-initializers)

0 commit comments

Comments
 (0)