mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9116 from Jason2866/fix_warning 

Fix warning in ESP8266SAM
This commit is contained in:
Theo Arends 2020-08-18 09:18:43 +02:00 committed by GitHub
parent 37d4bef412 4e1959bcd1
commit 8d2073bc7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 134 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
.github/workflows/CI_github_ESP32.yml vendored
View File

@ -18,10 +18,9 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
cp platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32
tasmota32-webcam:
runs-on: ubuntu-latest
steps:
@ -36,7 +35,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
cp platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-webcam
tasmota32-minimal:
@ -53,9 +52,8 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
cp platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-minimal
tasmota32-lite:
runs-on: ubuntu-latest
steps:
@ -70,9 +68,8 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
cp platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-lite
tasmota32-knx:
runs-on: ubuntu-latest
steps:
@ -87,7 +84,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
cp platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-knx
tasmota32-sensors:
@ -104,9 +101,8 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
cp platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-sensors
tasmota32-display:
runs-on: ubuntu-latest
steps:
@ -121,9 +117,8 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
cp platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-display
tasmota32-ir:
runs-on: ubuntu-latest
steps:
@ -138,9 +133,8 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
cp platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-ir
tasmota32-BG:
runs-on: ubuntu-latest
steps:
@ -155,7 +149,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
cp platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-BG
tasmota32-BR:
@ -172,9 +166,8 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
cp platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-BR
tasmota32-CN:
runs-on: ubuntu-latest
steps:
@ -189,9 +182,8 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
cp platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-CN
tasmota32-CZ:
runs-on: ubuntu-latest
steps:
@ -206,9 +198,8 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
cp platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-CZ
tasmota32-DE:
runs-on: ubuntu-latest
steps:
@ -223,7 +214,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
cp platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-DE
tasmota32-ES:
@ -240,10 +231,8 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
cp platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-ES
tasmota32-FR:
runs-on: ubuntu-latest
steps:
@ -258,9 +247,8 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
cp platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-FR
tasmota32-GR:
runs-on: ubuntu-latest
steps:
@ -275,9 +263,8 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
cp platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-GR
tasmota32-HE:
runs-on: ubuntu-latest
steps:
@ -292,7 +279,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
cp platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-HE
tasmota32-HU:
@ -309,9 +296,8 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
cp platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-HU
tasmota32-IT:
runs-on: ubuntu-latest
steps:
@ -326,9 +312,8 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
cp platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-IT
tasmota32-KO:
runs-on: ubuntu-latest
steps:
@ -343,9 +328,8 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
cp platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-KO
tasmota32-NL:
runs-on: ubuntu-latest
steps:
@ -360,7 +344,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
cp platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-NL
tasmota32-PL:
@ -377,9 +361,8 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
cp platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-PL
tasmota32-PT:
runs-on: ubuntu-latest
steps:
@ -394,9 +377,8 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
cp platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-PT
tasmota32-RO:
runs-on: ubuntu-latest
steps:
@ -411,9 +393,8 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
cp platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-RO
tasmota32-RU:
runs-on: ubuntu-latest
steps:
@ -428,7 +409,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
cp platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-RU
tasmota32-SE:
@ -445,9 +426,8 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
cp platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-SE
tasmota32-SK:
runs-on: ubuntu-latest
steps:
@ -462,9 +442,8 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
cp platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-SK
tasmota32-TR:
runs-on: ubuntu-latest
steps:
@ -479,9 +458,8 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
cp platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-TR
tasmota32-TW:
runs-on: ubuntu-latest
steps:
@ -496,7 +474,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
cp platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-TW
tasmota32-UK:
@ -513,5 +491,5 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
cp platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-UK

62
.github/workflows/Tasmota_build.yml vendored
View File

@ -751,7 +751,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
mv platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32
- uses: actions/upload-artifact@v2
with:
@ -775,7 +775,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
mv platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-minimal
- uses: actions/upload-artifact@v2
with:
@ -799,7 +799,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
mv platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-lite
- uses: actions/upload-artifact@v2
with:
@ -823,7 +823,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
mv platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-webcam
- uses: actions/upload-artifact@v2
with:
@ -847,7 +847,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
mv platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-knx
- uses: actions/upload-artifact@v2
with:
@ -871,7 +871,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
mv platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-sensors
- uses: actions/upload-artifact@v2
with:
@ -895,7 +895,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
mv platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-display
- uses: actions/upload-artifact@v2
with:
@ -919,7 +919,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
mv platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-ir
- uses: actions/upload-artifact@v2
with:
@ -943,7 +943,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
mv platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-ircustom
- uses: actions/upload-artifact@v2
with:
@ -967,7 +967,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
mv platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-BG
- uses: actions/upload-artifact@v2
with:
@ -991,7 +991,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
mv platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-BR
- uses: actions/upload-artifact@v2
with:
@ -1015,7 +1015,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
mv platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-CN
- uses: actions/upload-artifact@v2
with:
@ -1039,7 +1039,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
mv platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-CZ
- uses: actions/upload-artifact@v2
with:
@ -1063,7 +1063,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
mv platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-DE
- uses: actions/upload-artifact@v2
with:
@ -1087,7 +1087,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
mv platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-ES
- uses: actions/upload-artifact@v2
with:
@ -1111,7 +1111,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
mv platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-FR
- uses: actions/upload-artifact@v2
with:
@ -1135,7 +1135,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
mv platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-GR
- uses: actions/upload-artifact@v2
with:
@ -1159,7 +1159,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
mv platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-HE
- uses: actions/upload-artifact@v2
with:
@ -1183,7 +1183,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
mv platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-HU
- uses: actions/upload-artifact@v2
with:
@ -1207,7 +1207,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
mv platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-IT
- uses: actions/upload-artifact@v2
with:
@ -1231,7 +1231,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
mv platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-KO
- uses: actions/upload-artifact@v2
with:
@ -1255,7 +1255,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
mv platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-NL
- uses: actions/upload-artifact@v2
with:
@ -1279,7 +1279,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
mv platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-PL
- uses: actions/upload-artifact@v2
with:
@ -1303,7 +1303,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
mv platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-PT
- uses: actions/upload-artifact@v2
with:
@ -1327,7 +1327,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
mv platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-RO
- uses: actions/upload-artifact@v2
with:
@ -1351,7 +1351,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
mv platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-RU
- uses: actions/upload-artifact@v2
with:
@ -1375,7 +1375,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
mv platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-SE
- uses: actions/upload-artifact@v2
with:
@ -1399,7 +1399,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
mv platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-SK
- uses: actions/upload-artifact@v2
with:
@ -1423,7 +1423,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
mv platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-TR
- uses: actions/upload-artifact@v2
with:
@ -1447,7 +1447,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
mv platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-TW
- uses: actions/upload-artifact@v2
with:
@ -1471,7 +1471,7 @@ jobs:
platformio update
- name: Run PlatformIO
run: |
mv platformio_override_sample.ini platformio_override.ini
mv -f platformio_override_sample.ini platformio_override.ini
platformio run -e tasmota32-UK
- uses: actions/upload-artifact@v2
with:

4
lib/ESP8266Audio/src/libflac/config.h
View File

@ -2,7 +2,9 @@
#ifdef DEBUG
#undef NDEBUG
#else
#endif
#ifndef NDEBUG
#define NDEBUG
#endif

2
lib/ESP8266SAM/src/ReciterTabs.h
View File

@ -3,7 +3,7 @@
#include <pgmspace.h>
#include "debug.h"
#if debug
#if sam_debug
#define PROGMEM
#endif

2
lib/ESP8266SAM/src/RenderTabs.h
View File

@ -3,7 +3,7 @@
#include <pgmspace.h>
#include "samdebug.h"
#if debug
#if sam_debug
#define PROGMEM
#endif

2
lib/ESP8266SAM/src/SamTabs.h
View File

@ -3,7 +3,7 @@
#include <pgmspace.h>
#include "samdebug.h"
#if debug
#if sam_debug
#define PROGMEM
#endif

2
lib/ESP8266SAM/src/reciter.c
View File

@ -527,7 +527,7 @@ pos37455:
Y = mem64;
mem61 = mem60;
if (debug)
if (sam_debug)
PrintRule(mem62);
pos37461:

4
lib/ESP8266SAM/src/render.c
View File

@ -445,7 +445,7 @@ do
mem44++;
} while(mem44 != 0);
yield();
if (debug)
if (sam_debug)
{
PrintOutput(sampledConsonantFlag, frequency1, frequency2, frequency3, amplitude1, amplitude2, amplitude3, pitches);
}
@ -786,7 +786,7 @@ if (debug)
X = A;
mem38 = A - (A>>2); // 3/4*A ???
yield();
if (debug)
if (sam_debug)
{
PrintOutput(sampledConsonantFlag, frequency1, frequency2, frequency3, amplitude1, amplitude2, amplitude3, pitches);
}

124
lib/ESP8266SAM/src/sam.c
View File

@ -146,7 +146,7 @@ int SAMMain( void (*cb)(void *, unsigned char), void *cbd )
phonemeindex[255] = 32; //to prevent buffer overflow
if (!Parser1()) return 0;
if (debug)
if (sam_debug)
PrintPhonemes(phonemeindex, phonemeLength, stress);
Parser2();
CopyStress();
@ -168,7 +168,7 @@ int SAMMain( void (*cb)(void *, unsigned char), void *cbd )
InsertBreath();
//mem[40158] = 255;
if (debug)
if (sam_debug)
{
PrintPhonemes(phonemeindex, phonemeLength, stress);
}
@ -645,7 +645,7 @@ void Code41240()
//void Code41397()
void Parser2()
{
if (debug) printf("Parser2\n");
if (sam_debug) printf("Parser2\n");
unsigned char pos = 0; //mem66;
unsigned char mem58 = 0;
@ -659,7 +659,7 @@ void Parser2()
A = phonemeindex[pos];
// DEBUG: Print phoneme and index
if (debug && A != 255) printf("%d: %c%c\n", X, signInputTable1[A], signInputTable2[A]);
if (sam_debug && A != 255) printf("%d: %c%c\n", X, signInputTable1[A], signInputTable2[A]);
// Is phoneme pause?
if (A == 0)
@ -695,8 +695,8 @@ void Parser2()
//pos41443:
// Insert at WX or YX following, copying the stress
if (debug) if (A==20) printf("RULE: insert WX following diphtong NOT ending in IY sound\n");
if (debug) if (A==21) printf("RULE: insert YX following diphtong ending in IY sound\n");
if (sam_debug) if (A==20) printf("RULE: insert WX following diphtong NOT ending in IY sound\n");
if (sam_debug) if (A==21) printf("RULE: insert YX following diphtong ending in IY sound\n");
Insert(pos+1, A, mem59, mem58);
X = pos;
// Jump to ???
@ -716,7 +716,7 @@ pos41457:
if (A != 78) goto pos41487; // 'UL'
A = 24; // 'L' //change 'UL' to 'AX L'
if (debug) printf("RULE: UL -> AX L\n");
if (sam_debug) printf("RULE: UL -> AX L\n");
pos41466:
// Get current phoneme stress
@ -740,7 +740,7 @@ pos41487:
if (A != 79) goto pos41495; // 'UM'
// Jump up to branch - replaces current phoneme with AX and continues
A = 27; // 'M' //change 'UM' to 'AX M'
if (debug) printf("RULE: UM -> AX M\n");
if (sam_debug) printf("RULE: UM -> AX M\n");
goto pos41466;
pos41495:
@ -754,7 +754,7 @@ pos41495:
// Jump up to branch - replaces current phoneme with AX and continues
A = 28; // 'N' //change UN to 'AX N'
if (debug) printf("RULE: UN -> AX N\n");
if (sam_debug) printf("RULE: UN -> AX N\n");
goto pos41466;
pos41503:
@ -802,7 +802,7 @@ pos41503:
if (A != 0)
{
// Insert a glottal stop and move forward
if (debug) printf("RULE: Insert glottal stop between two stressed vowels with space between them\n");
if (sam_debug) printf("RULE: Insert glottal stop between two stressed vowels with space between them\n");
// 31 = 'Q'
Insert(X, 31, mem59, 0);
pos++;
@ -831,7 +831,7 @@ pos41503:
if (A == 69) // 'T'
{
// Change T to CH
if (debug) printf("RULE: T R -> CH R\n");
if (sam_debug) printf("RULE: T R -> CH R\n");
phonemeindex[pos-1] = 42;
goto pos41779;
}
@ -846,7 +846,7 @@ pos41503:
{
// Change D to J
phonemeindex[pos-1] = 44;
if (debug) printf("RULE: D R -> J R\n");
if (sam_debug) printf("RULE: D R -> J R\n");
goto pos41788;
}
@ -857,7 +857,7 @@ pos41503:
// If vowel flag is set change R to RX
A = flags[A] & 128;
if (debug) printf("RULE: R -> RX\n");
if (sam_debug) printf("RULE: R -> RX\n");
if (A != 0) phonemeindex[pos] = 18; // 'RX'
// continue to next phoneme
@ -876,7 +876,7 @@ pos41611:
// If prior phoneme does not have VOWEL flag set, move to next phoneme
if ((flags[phonemeindex[pos-1]] & 128) == 0) {pos++; continue;}
// Prior phoneme has VOWEL flag set, so change L to LX and move to next phoneme
if (debug) printf("RULE: <VOWEL> L -> <VOWEL> LX\n");
if (sam_debug) printf("RULE: <VOWEL> L -> <VOWEL> LX\n");
phonemeindex[X] = 19; // 'LX'
pos++;
continue;
@ -895,7 +895,7 @@ pos41611:
// If prior phoneme is not G, move to next phoneme
if (phonemeindex[pos-1] != 60) {pos++; continue;}
// Replace S with Z and move on
if (debug) printf("RULE: G S -> G Z\n");
if (sam_debug) printf("RULE: G S -> G Z\n");
phonemeindex[pos] = 38; // 'Z'
pos++;
continue;
@ -916,7 +916,7 @@ pos41611:
{
// VOWELS AND DIPHTONGS ENDING WITH IY SOUND flag set?
A = flags[Y] & 32;
if (debug) if (A==0) printf("RULE: K <VOWEL OR DIPHTONG NOT ENDING WITH IY> -> KX <VOWEL OR DIPHTONG NOT ENDING WITH IY>\n");
if (sam_debug) if (A==0) printf("RULE: K <VOWEL OR DIPHTONG NOT ENDING WITH IY> -> KX <VOWEL OR DIPHTONG NOT ENDING WITH IY>\n");
// Replace with KX
if (A == 0) phonemeindex[pos] = 75; // 'KX'
}
@ -943,7 +943,7 @@ pos41611:
// If diphtong ending with YX, move continue processing next phoneme
if ((flags[index] & 32) != 0) {pos++; continue;}
// replace G with GX and continue processing next phoneme
if (debug) printf("RULE: G <VOWEL OR DIPHTONG NOT ENDING WITH IY> -> GX <VOWEL OR DIPHTONG NOT ENDING WITH IY>\n");
if (sam_debug) printf("RULE: G <VOWEL OR DIPHTONG NOT ENDING WITH IY> -> GX <VOWEL OR DIPHTONG NOT ENDING WITH IY>\n");
phonemeindex[pos] = 63; // 'GX'
pos++;
continue;
@ -968,7 +968,7 @@ pos41611:
goto pos41812;
}
// Replace with softer version
if (debug) printf("RULE: S* %c%c -> S* %c%c\n", signInputTable1[Y], signInputTable2[Y],signInputTable1[Y-12], signInputTable2[Y-12]);
if (sam_debug) printf("RULE: S* %c%c -> S* %c%c\n", signInputTable1[Y], signInputTable2[Y],signInputTable1[Y-12], signInputTable2[Y-12]);
phonemeindex[pos] = Y-12;
pos++;
continue;
@ -991,7 +991,7 @@ pos41749:
A = flags2[Y] & 4;
// If not set, continue processing next phoneme
if (A == 0) {pos++; continue;}
if (debug) printf("RULE: <ALVEOLAR> UW -> <ALVEOLAR> UX\n");
if (sam_debug) printf("RULE: <ALVEOLAR> UW -> <ALVEOLAR> UX\n");
phonemeindex[X] = 16;
pos++;
continue;
@ -1005,7 +1005,7 @@ pos41779:
if (A == 42) // 'CH'
{
// pos41783:
if (debug) printf("CH -> CH CH+1\n");
if (sam_debug) printf("CH -> CH CH+1\n");
Insert(X+1, A+1, mem59, stress[X]);
pos++;
continue;
@ -1020,7 +1020,7 @@ pos41788:
if (A == 44) // 'J'
{
if (debug) printf("J -> J J+1\n");
if (sam_debug) printf("J -> J J+1\n");
Insert(X+1, A+1, mem59, stress[X]);
pos++;
continue;
@ -1060,7 +1060,7 @@ pos41812:
if (stress[X] != 0) {pos++; continue;}
//pos41856:
// Set phonemes to DX
if (debug) printf("RULE: Soften T or D following vowel or ER and preceding a pause -> DX\n");
if (sam_debug) printf("RULE: Soften T or D following vowel or ER and preceding a pause -> DX\n");
phonemeindex[pos] = 30; // 'DX'
} else
{
@ -1070,7 +1070,7 @@ pos41812:
else
// Is next phoneme a vowel or ER?
A = flags[A] & 128;
if (debug) if (A != 0) printf("RULE: Soften T or D following vowel or ER and preceding a pause -> DX\n");
if (sam_debug) if (A != 0) printf("RULE: Soften T or D following vowel or ER and preceding a pause -> DX\n");
if (A != 0) phonemeindex[pos] = 30; // 'DX'
}
@ -1160,14 +1160,14 @@ pos48644:
// change phoneme length to (length * 1.5) + 1
A = (A >> 1) + A + 1;
if (debug) printf("RULE: Lengthen <FRICATIVE> or <VOICED> between <VOWEL> and <PUNCTUATION> by 1.5\n");
if (debug) printf("PRE\n");
if (debug) printf("phoneme %d (%c%c) length %d\n", X, signInputTable1[phonemeindex[X]], signInputTable2[phonemeindex[X]], phonemeLength[X]);
if (sam_debug) printf("RULE: Lengthen <FRICATIVE> or <VOICED> between <VOWEL> and <PUNCTUATION> by 1.5\n");
if (sam_debug) printf("PRE\n");
if (sam_debug) printf("phoneme %d (%c%c) length %d\n", X, signInputTable1[phonemeindex[X]], signInputTable2[phonemeindex[X]], phonemeLength[X]);
phonemeLength[X] = A;
if (debug) printf("POST\n");
if (debug) printf("phoneme %d (%c%c) length %d\n", X, signInputTable1[phonemeindex[X]], signInputTable2[phonemeindex[X]], phonemeLength[X]);
if (sam_debug) printf("POST\n");
if (sam_debug) printf("phoneme %d (%c%c) length %d\n", X, signInputTable1[phonemeindex[X]], signInputTable2[phonemeindex[X]], phonemeLength[X]);
}
// keep moving forward
@ -1221,15 +1221,15 @@ if (debug) printf("phoneme %d (%c%c) length %d\n", X, signInputTable1[phonemeind
// RULE: <VOWEL> RX | LX <CONSONANT>
if (debug) printf("RULE: <VOWEL> <RX | LX> <CONSONANT> - decrease length by 1\n");
if (debug) printf("PRE\n");
if (debug) printf("phoneme %d (%c%c) length %d\n", loopIndex, signInputTable1[phonemeindex[loopIndex]], signInputTable2[phonemeindex[loopIndex]], phonemeLength[loopIndex]);
if (sam_debug) printf("RULE: <VOWEL> <RX | LX> <CONSONANT> - decrease length by 1\n");
if (sam_debug) printf("PRE\n");
if (sam_debug) printf("phoneme %d (%c%c) length %d\n", loopIndex, signInputTable1[phonemeindex[loopIndex]], signInputTable2[phonemeindex[loopIndex]], phonemeLength[loopIndex]);
// decrease length of vowel by 1 frame
phonemeLength[loopIndex]--;
if (debug) printf("POST\n");
if (debug) printf("phoneme %d (%c%c) length %d\n", loopIndex, signInputTable1[phonemeindex[loopIndex]], signInputTable2[phonemeindex[loopIndex]], phonemeLength[loopIndex]);
if (sam_debug) printf("POST\n");
if (sam_debug) printf("phoneme %d (%c%c) length %d\n", loopIndex, signInputTable1[phonemeindex[loopIndex]], signInputTable2[phonemeindex[loopIndex]], phonemeLength[loopIndex]);
}
// move ahead
@ -1267,16 +1267,16 @@ if (debug) printf("phoneme %d (%c%c) length %d\n", loopIndex, signInputTable1[ph
// move back
X--;
if (debug) printf("RULE: <VOWEL> <UNVOICED PLOSIVE> - decrease vowel by 1/8th\n");
if (debug) printf("PRE\n");
if (debug) printf("phoneme %d (%c%c) length %d\n", X, signInputTable1[phonemeindex[X]], signInputTable2[phonemeindex[X]], phonemeLength[X]);
if (sam_debug) printf("RULE: <VOWEL> <UNVOICED PLOSIVE> - decrease vowel by 1/8th\n");
if (sam_debug) printf("PRE\n");
if (sam_debug) printf("phoneme %d (%c%c) length %d\n", X, signInputTable1[phonemeindex[X]], signInputTable2[phonemeindex[X]], phonemeLength[X]);
// decrease length by 1/8th
mem56 = phonemeLength[X] >> 3;
phonemeLength[X] -= mem56;
if (debug) printf("POST\n");
if (debug) printf("phoneme %d (%c%c) length %d\n", X, signInputTable1[phonemeindex[X]], signInputTable2[phonemeindex[X]], phonemeLength[X]);
if (sam_debug) printf("POST\n");
if (sam_debug) printf("phoneme %d (%c%c) length %d\n", X, signInputTable1[phonemeindex[X]], signInputTable2[phonemeindex[X]], phonemeLength[X]);
// move ahead
loopIndex++;
@ -1286,16 +1286,16 @@ if (debug) printf("phoneme %d (%c%c) length %d\n", X, signInputTable1[phonemeind
// RULE: <VOWEL> <VOICED CONSONANT>
// <VOWEL> <WH, R*, L*, W*, Y*, M*, N*, NX, DX, Q*, Z*, ZH, V*, DH, J*, B*, D*, G*, GX>
if (debug) printf("RULE: <VOWEL> <VOICED CONSONANT> - increase vowel by 1/2 + 1\n");
if (debug) printf("PRE\n");
if (debug) printf("phoneme %d (%c%c) length %d\n", X-1, signInputTable1[phonemeindex[X-1]], signInputTable2[phonemeindex[X-1]], phonemeLength[X-1]);
if (sam_debug) printf("RULE: <VOWEL> <VOICED CONSONANT> - increase vowel by 1/2 + 1\n");
if (sam_debug) printf("PRE\n");
if (sam_debug) printf("phoneme %d (%c%c) length %d\n", X-1, signInputTable1[phonemeindex[X-1]], signInputTable2[phonemeindex[X-1]], phonemeLength[X-1]);
// decrease length
A = phonemeLength[X-1];
phonemeLength[X-1] = (A >> 2) + A + 1; // 5/4*A + 1
if (debug) printf("POST\n");
if (debug) printf("phoneme %d (%c%c) length %d\n", X-1, signInputTable1[phonemeindex[X-1]], signInputTable2[phonemeindex[X-1]], phonemeLength[X-1]);
if (sam_debug) printf("POST\n");
if (sam_debug) printf("phoneme %d (%c%c) length %d\n", X-1, signInputTable1[phonemeindex[X-1]], signInputTable2[phonemeindex[X-1]], phonemeLength[X-1]);
// move ahead
loopIndex++;
@ -1335,10 +1335,10 @@ if (debug) printf("phoneme %d (%c%c) length %d\n", X-1, signInputTable1[phonemei
// B*, D*, G*, GX, P*, T*, K*, KX
{
if (debug) printf("RULE: <NASAL> <STOP CONSONANT> - set nasal = 5, consonant = 6\n");
if (debug) printf("POST\n");
if (debug) printf("phoneme %d (%c%c) length %d\n", X, signInputTable1[phonemeindex[X]], signInputTable2[phonemeindex[X]], phonemeLength[X]);
if (debug) printf("phoneme %d (%c%c) length %d\n", X-1, signInputTable1[phonemeindex[X-1]], signInputTable2[phonemeindex[X-1]], phonemeLength[X-1]);
if (sam_debug) printf("RULE: <NASAL> <STOP CONSONANT> - set nasal = 5, consonant = 6\n");
if (sam_debug) printf("POST\n");
if (sam_debug) printf("phoneme %d (%c%c) length %d\n", X, signInputTable1[phonemeindex[X]], signInputTable2[phonemeindex[X]], phonemeLength[X]);
if (sam_debug) printf("phoneme %d (%c%c) length %d\n", X-1, signInputTable1[phonemeindex[X-1]], signInputTable2[phonemeindex[X-1]], phonemeLength[X-1]);
// set stop consonant length to 6
phonemeLength[X] = 6;
@ -1346,9 +1346,9 @@ if (debug) printf("phoneme %d (%c%c) length %d\n", X-1, signInputTable1[phonemei
// set nasal length to 5
phonemeLength[X-1] = 5;
if (debug) printf("POST\n");
if (debug) printf("phoneme %d (%c%c) length %d\n", X, signInputTable1[phonemeindex[X]], signInputTable2[phonemeindex[X]], phonemeLength[X]);
if (debug) printf("phoneme %d (%c%c) length %d\n", X-1, signInputTable1[phonemeindex[X-1]], signInputTable2[phonemeindex[X-1]], phonemeLength[X-1]);
if (sam_debug) printf("POST\n");
if (sam_debug) printf("phoneme %d (%c%c) length %d\n", X, signInputTable1[phonemeindex[X]], signInputTable2[phonemeindex[X]], phonemeLength[X]);
if (sam_debug) printf("phoneme %d (%c%c) length %d\n", X-1, signInputTable1[phonemeindex[X-1]], signInputTable2[phonemeindex[X-1]], phonemeLength[X-1]);
}
// move to next phoneme
@ -1388,10 +1388,10 @@ if (debug) printf("phoneme %d (%c%c) length %d\n", X-1, signInputTable1[phonemei
}
// RULE: <UNVOICED STOP CONSONANT> {optional silence} <STOP CONSONANT>
if (debug) printf("RULE: <UNVOICED STOP CONSONANT> {optional silence} <STOP CONSONANT> - shorten both to 1/2 + 1\n");
if (debug) printf("PRE\n");
if (debug) printf("phoneme %d (%c%c) length %d\n", X, signInputTable1[phonemeindex[X]], signInputTable2[phonemeindex[X]], phonemeLength[X]);
if (debug) printf("phoneme %d (%c%c) length %d\n", X-1, signInputTable1[phonemeindex[X-1]], signInputTable2[phonemeindex[X-1]], phonemeLength[X-1]);
if (sam_debug) printf("RULE: <UNVOICED STOP CONSONANT> {optional silence} <STOP CONSONANT> - shorten both to 1/2 + 1\n");
if (sam_debug) printf("PRE\n");
if (sam_debug) printf("phoneme %d (%c%c) length %d\n", X, signInputTable1[phonemeindex[X]], signInputTable2[phonemeindex[X]], phonemeLength[X]);
if (sam_debug) printf("phoneme %d (%c%c) length %d\n", X-1, signInputTable1[phonemeindex[X-1]], signInputTable2[phonemeindex[X-1]], phonemeLength[X-1]);
// X gets overwritten, so hold prior X value for debug statement
int debugX = X;
// shorten the prior phoneme length to (length/2 + 1)
@ -1401,9 +1401,9 @@ int debugX = X;
// also shorten this phoneme length to (length/2 +1)
phonemeLength[loopIndex] = (phonemeLength[loopIndex] >> 1) + 1;
if (debug) printf("POST\n");
if (debug) printf("phoneme %d (%c%c) length %d\n", debugX, signInputTable1[phonemeindex[debugX]], signInputTable2[phonemeindex[debugX]], phonemeLength[debugX]);
if (debug) printf("phoneme %d (%c%c) length %d\n", debugX-1, signInputTable1[phonemeindex[debugX-1]], signInputTable2[phonemeindex[debugX-1]], phonemeLength[debugX-1]);
if (sam_debug) printf("POST\n");
if (sam_debug) printf("phoneme %d (%c%c) length %d\n", debugX, signInputTable1[phonemeindex[debugX]], signInputTable2[phonemeindex[debugX]], phonemeLength[debugX]);
if (sam_debug) printf("phoneme %d (%c%c) length %d\n", debugX-1, signInputTable1[phonemeindex[debugX-1]], signInputTable2[phonemeindex[debugX-1]], phonemeLength[debugX-1]);
// move ahead
@ -1429,15 +1429,15 @@ if (debug) printf("phoneme %d (%c%c) length %d\n", debugX-1, signInputTable1[pho
if((flags[index] & 2) != 0)
// Rule: <LIQUID CONSONANT> <DIPHTONG>
if (debug) printf("RULE: <LIQUID CONSONANT> <DIPHTONG> - decrease by 2\n");
if (debug) printf("PRE\n");
if (debug) printf("phoneme %d (%c%c) length %d\n", X, signInputTable1[phonemeindex[X]], signInputTable2[phonemeindex[X]], phonemeLength[X]);
if (sam_debug) printf("RULE: <LIQUID CONSONANT> <DIPHTONG> - decrease by 2\n");
if (sam_debug) printf("PRE\n");
if (sam_debug) printf("phoneme %d (%c%c) length %d\n", X, signInputTable1[phonemeindex[X]], signInputTable2[phonemeindex[X]], phonemeLength[X]);
// decrease the phoneme length by 2 frames (20 ms)
phonemeLength[X] -= 2;
if (debug) printf("POST\n");
if (debug) printf("phoneme %d (%c%c) length %d\n", X, signInputTable1[phonemeindex[X]], signInputTable2[phonemeindex[X]], phonemeLength[X]);
if (sam_debug) printf("POST\n");
if (sam_debug) printf("phoneme %d (%c%c) length %d\n", X, signInputTable1[phonemeindex[X]], signInputTable2[phonemeindex[X]], phonemeLength[X]);
}
// move to next phoneme

2
lib/ESP8266SAM/src/samdebug.h
View File

@ -14,6 +14,6 @@ void PrintOutput(
void PrintRule(int offset);
#define debug 0
#define sam_debug 0
#endif

2
pio/gzip-firmware.py
View File

@ -17,7 +17,7 @@ def bin_gzip(source, target, env):
# write gzip firmware file
with open(bin_file,"rb") as fp:
with gzip.open(gzip_file, "wb") as f:
with gzip.open(gzip_file, "wb", compresslevel = 9) as f:
shutil.copyfileobj(fp, f)
env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", [bin_gzip])