mirror of
https://github.com/lumapu/ahoy.git
synced 2025-04-28 17:56:21 +02:00
0.8.101
* updated converter scripts to include all enabled features again (redundant scan of build flags) #1534
This commit is contained in:
parent
4b75e72bf3
commit
2a4c83647a
4 changed files with 21 additions and 8 deletions
|
@ -9,19 +9,29 @@ from pathlib import Path
|
||||||
import subprocess
|
import subprocess
|
||||||
import configparser
|
import configparser
|
||||||
Import("env")
|
Import("env")
|
||||||
|
build_flags = []
|
||||||
|
|
||||||
import htmlPreprocessorDefines as prepro
|
import htmlPreprocessorDefines as prepro
|
||||||
|
|
||||||
|
def getFlagsOfEnv(env):
|
||||||
|
|
||||||
def get_build_flags():
|
|
||||||
config = configparser.ConfigParser()
|
config = configparser.ConfigParser()
|
||||||
config.read('platformio.ini')
|
config.read('platformio.ini')
|
||||||
global build_flags
|
global build_flags
|
||||||
build_flags = config["env:" + env['PIOENV']]['build_flags'].split('\n')
|
flags = config[env]['build_flags'].split('\n')
|
||||||
|
|
||||||
for i in range(len(build_flags)):
|
for i in range(len(flags)):
|
||||||
build_flags[i] = build_flags[i][2:]
|
if flags[i][:2] == "-D" or flags[i][:2] == "${":
|
||||||
|
flags[i] = flags[i][2:]
|
||||||
|
if flags[i][-13:-1] == ".build_flags":
|
||||||
|
getFlagsOfEnv(flags[i].split(".build_flags")[0])
|
||||||
|
elif len(flags[i]) > 0:
|
||||||
|
build_flags = build_flags + [flags[i]]
|
||||||
|
|
||||||
|
|
||||||
|
def get_build_flags():
|
||||||
|
getFlagsOfEnv("env:" + env['PIOENV'])
|
||||||
|
config = configparser.ConfigParser()
|
||||||
|
config.read('platformio.ini')
|
||||||
|
|
||||||
# translate board
|
# translate board
|
||||||
board = config["env:" + env['PIOENV']]['board']
|
board = config["env:" + env['PIOENV']]['board']
|
||||||
|
|
|
@ -35,6 +35,6 @@ def check(inp, lst, pattern):
|
||||||
return out
|
return out
|
||||||
|
|
||||||
def conv(inp, lst):
|
def conv(inp, lst):
|
||||||
#print(lst)
|
print(lst)
|
||||||
out = check(inp, lst, r'\/\*(?:IF_|ELS|ENDIF_)([A-Z0-9\-_]+)?\*\/')
|
out = check(inp, lst, r'\/\*(?:IF_|ELS|ENDIF_)([A-Z0-9\-_]+)?\*\/')
|
||||||
return check(out, lst, r'\<\!\-\-(?:IF_|ELS|ENDIF_)([A-Z0-9\-_]+)?\-\-\>')
|
return check(out, lst, r'\<\!\-\-(?:IF_|ELS|ENDIF_)([A-Z0-9\-_]+)?\-\-\>')
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
# Development Changes
|
# Development Changes
|
||||||
|
|
||||||
|
## 0.8.101 - 2024-03-28
|
||||||
|
* updated converter scripts to include all enabled features again (redundant scan of build flags) #1534
|
||||||
|
|
||||||
## 0.8.100 - 2024-03-27
|
## 0.8.100 - 2024-03-27
|
||||||
* fix captions in `/history #1532
|
* fix captions in `/history #1532
|
||||||
* fix get NTP time #1529 #1530
|
* fix get NTP time #1529 #1530
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
//-------------------------------------
|
//-------------------------------------
|
||||||
#define VERSION_MAJOR 0
|
#define VERSION_MAJOR 0
|
||||||
#define VERSION_MINOR 8
|
#define VERSION_MINOR 8
|
||||||
#define VERSION_PATCH 100
|
#define VERSION_PATCH 101
|
||||||
//-------------------------------------
|
//-------------------------------------
|
||||||
typedef struct {
|
typedef struct {
|
||||||
uint8_t ch;
|
uint8_t ch;
|
||||||
|
|
Loading…
Add table
Reference in a new issue