Skip to content

Commit c8f74f2

Browse files
author
Gustavo Casanova
committed
Release v1.2.0
1 parent b3caec4 commit c8f74f2

File tree

15 files changed

+2182
-904
lines changed

15 files changed

+2182
-904
lines changed

‎.gitignore

+328-120
Large diffs are not rendered by default.

‎examples/Arduino/Timonel-TwiM-MS/Timonel-TwiM-MS.ino

+245-17
Large diffs are not rendered by default.

‎examples/Arduino/Timonel-TwiM-SS/Timonel-TwiM-SS.ino

+640-262
Large diffs are not rendered by default.

‎examples/PlatformIO/timonel-twim-ms/include/timonel-twim-ms.h

+24-5
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,44 @@
33
==================
44
Timonel library test header (Multi Slave) v1.5
55
----------------------------------------------------------------------------
6-
2020-04-29 Gustavo Casanova
6+
2020-07-13 Gustavo Casanova
77
----------------------------------------------------------------------------
88
*/
99

10-
#ifndef _TIMONEL_TWIM_MS_H_
11-
#define _TIMONEL_TWIM_MS_H_
10+
#ifndef TIMONEL_TWIM_MS_H
11+
#define TIMONEL_TWIM_MS_H
1212

1313
#include <NbMicro.h>
1414
#include <TimonelTwiM.h>
1515
#include <TwiBus.h>
1616

17+
// This software
18+
#define VER_MAJOR 1
19+
#define VER_MINOR 5
20+
#define VER_PATCH 0
21+
22+
// Serial display settings
23+
#define USE_SERIAL Serial
24+
#define SERIAL_BPS 115200
25+
26+
// I2C pins
27+
#define SDA 2 // I2C SDA pin - ESP8266 2 - ESP32 21
28+
#define SCL 0 // I2C SCL pin - ESP8266 0 - ESP32 22
29+
30+
// Routine settings
31+
#define MAX_TWI_DEVS 28
32+
#define LOOP_COUNT 3
33+
#define T_SIGNATURE 84
34+
1735
// Prototypes
1836
void setup(void);
1937
void loop(void);
2038
bool CheckApplUpdate(void);
21-
void PrintStatus(Timonel timonel);
39+
//void PrintStatus(Timonel timonel);
40+
Timonel::Status PrintStatus(Timonel *timonel);
2241
void ThreeStarDelay(void);
2342
void ShowHeader(void);
2443
void PrintLogo(void);
2544
void ClrScr(void);
2645

27-
#endif // _TIMONEL_TWIM_MS_H_
46+
#endif // TIMONEL_TWIM_MS_H

‎examples/PlatformIO/timonel-twim-ms/src/timonel-twim-ms.cpp

+74-64
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
----------------------------------------------------------------------------
66
This demo shows how to control and update several Tiny85 microcontrollers
77
running the Timonel bootloader from an ESP8266 master.
8-
It uses a serial console configured at 9600 N 8 1 for feedback.
8+
It uses a serial console configured at 115200 N 8 1 for feedback.
99
----------------------------------------------------------------------------
10-
2020-06-03 Gustavo Casanova
10+
2020-07-13 Gustavo Casanova
1111
----------------------------------------------------------------------------
1212
*/
1313

@@ -31,13 +31,6 @@
3131

3232
#include "payload.h"
3333

34-
#define USE_SERIAL Serial
35-
#define SDA 2 // I2C SDA pin - ESP8266 2 - ESP32 21
36-
#define SCL 0 // I2C SCL pin - ESP8266 0 - ESP32 22
37-
#define MAX_TWI_DEVS 28
38-
#define LOOP_COUNT 3
39-
#define T_SIGNATURE 84
40-
4134
// Global variables
4235
uint8_t slave_address = 0;
4336
uint8_t block_rx_size = 0;
@@ -49,7 +42,7 @@ void (*resetFunc)(void) = 0;
4942
// Setup block
5043
void setup() {
5144
// Initialize the serial port for debugging
52-
USE_SERIAL.begin(9600);
45+
USE_SERIAL.begin(SERIAL_BPS);
5346
ClrScr();
5447
PrintLogo();
5548
ShowHeader();
@@ -196,7 +189,7 @@ void setup() {
196189
USE_SERIAL.println(dev_info_arr[i].addr);
197190
#endif // ARDUINO_ARCH_ESP8266 || ARDUINO_ESP32_DEV || ESP_PLATFORM
198191
tml_pool[i]->GetStatus();
199-
PrintStatus(*tml_pool[i]);
192+
PrintStatus(tml_pool[i]);
200193
}
201194
}
202195
ThreeStarDelay();
@@ -242,7 +235,7 @@ void setup() {
242235
USE_SERIAL.println(dev_info_arr[i].addr);
243236
#endif // ARDUINO_ARCH_ESP8266 || ARDUINO_ESP32_DEV || ESP_PLATFORM
244237
tml_pool[i]->GetStatus();
245-
PrintStatus(*tml_pool[i]);
238+
PrintStatus(tml_pool[i]);
246239
delay(10);
247240
#if (ARDUINO_ARCH_ESP8266 || ARDUINO_ESP32_DEV || ESP_PLATFORM)
248241
// // If the Timonel features support it, dump the device memory
@@ -393,11 +386,16 @@ void PrintLogo(void) {
393386
}
394387

395388
// Function print Timonel instance status
396-
void PrintStatus(Timonel timonel) {
397-
Timonel::Status tml_status = timonel.GetStatus(); /* Get the instance id parameters received from the ATTiny85 */
398-
uint8_t twi_address = timonel.GetTwiAddress();
389+
Timonel::Status PrintStatus(Timonel *timonel) {
390+
Timonel::Status tml_status = timonel->GetStatus(); /* Get the instance id parameters received from the ATTiny85 */
391+
uint8_t twi_address = timonel->GetTwiAddress();
399392
uint8_t version_major = tml_status.version_major;
400393
uint8_t version_minor = tml_status.version_minor;
394+
uint16_t app_start = tml_status.application_start;
395+
uint8_t app_start_msb = ((tml_status.application_start >> 8) & 0xFF);
396+
uint8_t app_start_lsb = (tml_status.application_start & 0xFF);
397+
uint16_t trampoline = ((~(((app_start_lsb << 8) | app_start_msb) & 0xFFF)) + 1);
398+
trampoline = ((((tml_status.bootloader_start >> 1) - trampoline) & 0xFFF) << 1);
401399
if ((tml_status.signature == T_SIGNATURE) && ((version_major != 0) || (version_minor != 0))) {
402400
String version_mj_nick = "";
403401
switch (version_major) {
@@ -419,70 +417,80 @@ void PrintStatus(Timonel timonel) {
419417
USE_SERIAL.printf_P("(TWI: %02d)\n\r", twi_address);
420418
USE_SERIAL.printf_P(" ====================================\n\r");
421419
USE_SERIAL.printf_P(" Bootloader address: 0x%X\n\r", tml_status.bootloader_start);
422-
uint16_t app_start = tml_status.application_start;
423420
if (app_start != 0xFFFF) {
424-
USE_SERIAL.printf_P(" Application start: 0x%X (0x%X)\n\r", app_start, tml_status.trampoline_addr);
421+
USE_SERIAL.printf_P(" Application start: 0x%04X (0x%X)\n\r", app_start, trampoline);
425422
} else {
426-
USE_SERIAL.printf_P(" Application start: 0x%X (Not Set)\n\r", app_start);
423+
USE_SERIAL.printf_P(" Application start: 0x%04X (Not Set)\n\r", app_start);
427424
}
428425
USE_SERIAL.printf_P(" Features code: %d | %d ", tml_status.features_code, tml_status.ext_features_code);
429-
if ((tml_status.ext_features_code >> F_AUTO_CLK_TWEAK) & true) {
426+
if ((tml_status.ext_features_code >> E_AUTO_CLK_TWEAK) & true) {
430427
USE_SERIAL.printf_P("(Auto)");
431428
} else {
432429
USE_SERIAL.printf_P("(Fixed)");
433430
}
434431
USE_SERIAL.printf_P("\n\r");
435432
USE_SERIAL.printf_P(" Low fuse: 0x%02X\n\r", tml_status.low_fuse_setting);
436-
USE_SERIAL.printf_P(" RC osc: 0x%02X\n\n\r", tml_status.oscillator_cal);
437-
#else // -----
438-
USE_SERIAL.print("\n\r Timonel v");
439-
USE_SERIAL.print(version_major);
440-
USE_SERIAL.print(".");
441-
USE_SERIAL.print(version_minor);
442-
USE_SERIAL.print(" ");
443-
USE_SERIAL.print(version_mj_nick.c_str());
444-
USE_SERIAL.print(" TWI: ");
445-
USE_SERIAL.println(twi_address);
446-
USE_SERIAL.println(" ====================================");
447-
USE_SERIAL.print(" Bootloader address: 0x");
448-
USE_SERIAL.println(tml_status.bootloader_start, HEX);
449-
uint16_t app_start = tml_status.application_start;
450-
if (app_start != 0xFFFF) {
451-
USE_SERIAL.print(" Application start: 0x");
452-
USE_SERIAL.print(app_start, HEX);
453-
USE_SERIAL.print(" - 0x");
454-
USE_SERIAL.println(tml_status.trampoline_addr, HEX);
455-
} else {
456-
USE_SERIAL.print(" Application start: Not set: 0x");
457-
USE_SERIAL.println(app_start, HEX);
433+
USE_SERIAL.printf_P(" RC osc: 0x%02X", tml_status.oscillator_cal);
434+
#if ((defined EXT_FEATURES) && ((EXT_FEATURES >> E_CMD_READDEVS) & true))
435+
if ((tml_status.ext_features_code >> E_CMD_READDEVS) & true) {
436+
Timonel::DevSettings dev_settings = timonel->GetDevSettings();
437+
USE_SERIAL.printf_P("\n\r ....................................\n\r");
438+
USE_SERIAL.printf_P(" Fuse settings: L=0x%02X H=0x%02X E=0x%02X\n\r", dev_settings.low_fuse_bits, dev_settings.high_fuse_bits, dev_settings.extended_fuse_bits);
439+
USE_SERIAL.printf_P(" Lock bits: 0x%02X\n\r", dev_settings.lock_bits);
440+
USE_SERIAL.printf_P(" Signature: 0x%02X 0x%02X 0x%02X\n\r", dev_settings.signature_byte_0, dev_settings.signature_byte_1, dev_settings.signature_byte_2);
441+
USE_SERIAL.printf_P(" Oscillator: 8.0Mhz=0x%02X, 6.4Mhz=0x%02X", dev_settings.calibration_0, dev_settings.calibration_1);
458442
}
459-
USE_SERIAL.print(" Features code: ");
460-
USE_SERIAL.print(tml_status.features_code);
461-
USE_SERIAL.print(" | ");
462-
USE_SERIAL.print(tml_status.ext_features_code);
463-
if ((tml_status.ext_features_code >> F_AUTO_CLK_TWEAK) & true) {
464-
USE_SERIAL.print(" (Auto)");
465-
} else {
466-
USE_SERIAL.print(" (Fixed)");
467-
}
468-
USE_SERIAL.println("");
469-
USE_SERIAL.print(" Low fuse: 0x");
470-
USE_SERIAL.println(tml_status.low_fuse_setting, HEX);
471-
USE_SERIAL.print(" RC osc: 0x");
472-
USE_SERIAL.println(tml_status.oscillator_cal, HEX);
443+
#endif // E_CMD_READDEVS
444+
USE_SERIAL.printf_P("\n\n\r");
445+
#else // -----
446+
USE_SERIAL.print("\n\r Timonel v");
447+
USE_SERIAL.print(version_major);
448+
USE_SERIAL.print(".");
449+
USE_SERIAL.print(version_minor);
450+
USE_SERIAL.print(" ");
451+
USE_SERIAL.print(version_mj_nick.c_str());
452+
USE_SERIAL.print(" TWI: ");
453+
USE_SERIAL.println(twi_address);
454+
USE_SERIAL.println(" ====================================");
455+
USE_SERIAL.print(" Bootloader address: 0x");
456+
USE_SERIAL.println(tml_status.bootloader_start, HEX);
457+
if (app_start != 0xFFFF) {
458+
USE_SERIAL.print(" Application start: 0x");
459+
USE_SERIAL.print(app_start, HEX);
460+
USE_SERIAL.print(" - 0x");
461+
USE_SERIAL.println(trampoline, HEX);
462+
} else {
463+
USE_SERIAL.print(" Application start: Not set: 0x");
464+
USE_SERIAL.println(app_start, HEX);
465+
}
466+
USE_SERIAL.print(" Features code: ");
467+
USE_SERIAL.print(tml_status.features_code);
468+
USE_SERIAL.print(" | ");
469+
USE_SERIAL.print(tml_status.ext_features_code);
470+
if ((tml_status.ext_features_code >> F_AUTO_CLK_TWEAK) & true) {
471+
USE_SERIAL.print(" (Auto)");
472+
} else {
473+
USE_SERIAL.print(" (Fixed)");
474+
}
475+
USE_SERIAL.println("");
476+
USE_SERIAL.print(" Low fuse: 0x");
477+
USE_SERIAL.println(tml_status.low_fuse_setting, HEX);
478+
USE_SERIAL.print(" RC osc: 0x");
479+
USE_SERIAL.println(tml_status.oscillator_cal, HEX);
473480
#endif // ARDUINO_ARCH_ESP8266 || ARDUINO_ESP32_DEV || ESP_PLATFORM
474481
} else {
475482
#if (ARDUINO_ARCH_ESP8266 || ARDUINO_ESP32_DEV || ESP_PLATFORM)
476-
USE_SERIAL.printf_P("\n\r *******************************************************************\n\r");
477-
USE_SERIAL.printf_P(" * Unknown bootloader, application or device at TWI address %02d ... *\n\r", twi_address);
478-
USE_SERIAL.printf_P(" *******************************************************************\n\n\r");
483+
USE_SERIAL.printf_P("\n\r *************************************************\n\r");
484+
USE_SERIAL.printf_P(" * User application running on TWI device %02d ... *\n\r", twi_address);
485+
USE_SERIAL.printf_P(" *************************************************\n\n\r");
479486
#else // -----
480-
USE_SERIAL.println("\n\r *******************************************************************");
481-
USE_SERIAL.print(" * Unknown bootloader, application or device at TWI address ");
482-
USE_SERIAL.println(twi_address);
483-
USE_SERIAL.println(" *******************************************************************\n");
487+
USE_SERIAL.println("\n\r *******************************************************************");
488+
USE_SERIAL.print(" * Unknown bootloader, application or device at TWI address ");
489+
USE_SERIAL.println(twi_address);
490+
USE_SERIAL.println(" *******************************************************************\n");
484491
#endif // ARDUINO_ARCH_ESP8266 || ARDUINO_ESP32_DEV || ESP_PLATFORM
485492
}
493+
return tml_status;
486494
}
487495

488496
// Function ThreeStarDelay
@@ -503,8 +511,10 @@ void ShowHeader(void) {
503511
//ClrScr();
504512
delay(250);
505513
#if (ARDUINO_ARCH_ESP8266 || ARDUINO_ESP32_DEV || ESP_PLATFORM)
506-
USE_SERIAL.printf_P("\n\r Timonel TWI Bootloader Multi Slave Test (v1.5 twim-ms)\n\r");
514+
USE_SERIAL.printf_P("\n\r..............................................................\n\r");
515+
USE_SERIAL.printf_P(". Timonel I2C Bootloader Multi Slave Test (v%d.%d twim-ms) .\n\r", VER_MAJOR, VER_MINOR);
516+
USE_SERIAL.printf_P("..............................................................\n\r");
507517
#else // -----
508-
USE_SERIAL.println("\n\r Timonel TWI Bootloader Multi Slave Test (v1.5 twim-ms)");
518+
USE_SERIAL.println("\n\r Timonel TWI Bootloader Multi Slave Test (twim-ms)");
509519
#endif // ARDUINO_ARCH_ESP8266 || ARDUINO_ESP32_DEV || ESP_PLATFORM
510520
}

‎examples/PlatformIO/timonel-twim-ss/LICENSE

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2020 Gustavo Casanova
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎examples/PlatformIO/timonel-twim-ss/include/timonel-twim-ss.h

+29-8
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,49 @@
33
==================
44
Timonel library test header (Single Slave) v1.5
55
----------------------------------------------------------------------------
6-
2020-04-29 Gustavo Casanova
6+
2020-07-13 Gustavo Casanova
77
----------------------------------------------------------------------------
88
*/
99

10-
#ifndef _TIMONEL_TWIM_SS_H_
11-
#define _TIMONEL_TWIM_SS_H_
10+
#ifndef TIMONEL_TWIM_SS_H
11+
#define TIMONEL_TWIM_SS_H
1212

1313
#include <NbMicro.h>
1414
#include <TimonelTwiM.h>
1515
#include <TwiBus.h>
1616

17+
// This software
18+
#define VER_MAJOR 1
19+
#define VER_MINOR 5
20+
#define VER_PATCH 0
21+
22+
// Serial display settings
23+
#define USE_SERIAL Serial
24+
#define SERIAL_BPS 115200
25+
26+
// I2C pins
27+
#define SDA 2 // I2C SDA pin - ESP8266 2 - ESP32 21
28+
#define SCL 0 // I2C SCL pin - ESP8266 0 - ESP32 22
29+
30+
// Upper EEPROM memory location
31+
#define EEPROM_TOP 0x1FF
32+
// Rotating bar delay
33+
#define ROTATION_DLY 60
34+
// Application mode switch delay
35+
#define MODE_SWITCH_DLY 250
36+
1737
// Prototypes
1838
void setup(void);
1939
void loop(void);
20-
void ListTwiDevices(uint8_t sda = 0, uint8_t scl = 0);
21-
void PrintStatus(Timonel tml);
2240
void ReadChar(void);
2341
uint16_t ReadWord(void);
24-
void ShowHeader(void);
25-
void ShowMenu(void);
42+
uint8_t DiscoverDevice(bool *p_app_mode, const uint8_t sda = 0, const uint8_t scl = 0);
43+
Timonel::Status PrintStatus(Timonel *timonel);
44+
void ShowHeader(const bool app_mode);
45+
void ShowMenu(const bool app_mode);
2646
void ClrScr(void);
2747
void PrintLogo(void);
2848
void RotaryDelay(void);
49+
void RotatingBar(uint8_t *rotary_state);
2950

30-
#endif // _TIMONEL_TWIM_SS_H_
51+
#endif // TIMONEL_TWIM_SS_H

0 commit comments

Comments
 (0)