thomas/CelloEffects
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ajout BLE

Browse Source
This commit is contained in:
thomas committed 2026-10-24 00:14:53 +02:00
1 parent 66bb319423
commit 3757975e51
48 files changed
+293826 -284536
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Appli/Core/Inc/remote_ble.h
+34
View File
@@ -0,0 +1,34 @@
#ifndef REMOTE_BLE_H
#define REMOTE_BLE_H
#ifdef __cplusplus
extern "C" {
#endif
/* Controle a distance par BLE (module ST67W611M1 de la X-NUCLEO-67W61M1, liaison SPI4).
* Une tache FreeRTOS initialise le module, annonce un serveur GATT "CelloFX" et applique les
* commandes recues aux parametres d'effets (voir remote_params.h).
*
* Service c3110000-7e8a-4b1c-9d52-f0a1e4b7c600
* Control c3110001-... ecriture (avec ou sans reponse)
* State c3110002-... notification
*
* Les deux caracteristiques echangent des enregistrements de 3 octets :
* [id : uint8] [valeur : int16 little-endian]
* Plusieurs enregistrements peuvent tenir dans une ecriture (jusqu'a la taille du MTU).
* Control : le client envoie des commandes. L'identifiant 0xFF demande un instantane de l'etat.
* State : le serveur notifie les valeurs courantes (a l'abonnement du client, et sur 0xFF).
*
* Le module est appaire en "Just Works" : n'importe quel appareil a portee peut piloter les
* effets. A durcir (code PIN) avant tout usage hors banc d'essai.
*/
/* Cree la tache de controle. A appeler une fois, avant osKernelStart(). Sans effet sur l'audio :
* si le module est absent ou ne repond pas, la tache s'arrete et le reste tourne normalement. */
void RemoteBle_Start(void);
#ifdef __cplusplus
}
#endif
#endif /* REMOTE_BLE_H */
Appli/Core/Inc/remote_params.h
+45
View File
@@ -0,0 +1,45 @@
#ifndef REMOTE_PARAMS_H
#define REMOTE_PARAMS_H
#include <stdbool.h>
#include <stdint.h>
#ifdef __cplusplus
extern "C" {
#endif
/* Couche commune du controle a distance (BLE maintenant, Wi-Fi ensuite) : elle expose les
* parametres de AudioEffects_GetParams() sous forme d'identifiants d'un octet avec une valeur
* entiere signee 16 bits. Aucune dependance au transport.
*
* Valeur sur le fil (int16) = valeur reelle * echelle, bornee a la plage du parametre :
* booleen (actif/inactif) 0 ou 1
* niveaux 0.0..1.0 echelle 1000 (500 = 0.5)
* gain d'une bande d'egaliseur echelle 10 (-60 = -6.0 dB)
* delai d'echo echelle 1 (250 = 250 ms)
*
* Identifiants :
* 0x00 audio_on_off 0x01 master_volume
* 0x10 octaver.enabled 0x11 down2 0x12 down1 0x13 dry 0x14 up1 0x15 up2
* 0x20 equalizer.enabled 0x30..0x39 gain des bandes 0 a 9
* 0x50 overdrive.enabled 0x51 drive 0x52 tone 0x53 level
* 0x60 saturation.enabled 0x61 drive 0x62 level
* 0x70 echo.enabled 0x71 delay_ms 0x72 feedback 0x73 mix
* 0x80 reverb.enabled 0x81 room_size 0x82 damping 0x83 mix
*/
/* Applique une valeur recue. Retourne false si l'identifiant est inconnu. */
bool RemoteParams_Set(uint8_t id, int16_t value);
/* Lit la valeur courante d'un parametre. Retourne false si l'identifiant est inconnu. */
bool RemoteParams_Get(uint8_t id, int16_t *value);
/* Parcours de tous les parametres (pour envoyer un instantane de l'etat). */
uint8_t RemoteParams_Count(void);
uint8_t RemoteParams_IdAt(uint8_t index);
#ifdef __cplusplus
}
#endif
#endif /* REMOTE_PARAMS_H */
Appli/Core/Inc/st67_glue.h
+24
View File
@@ -0,0 +1,24 @@
#ifndef ST67_GLUE_H
#define ST67_GLUE_H
#include <stdint.h>
#ifdef __cplusplus
extern "C" {
#endif
/* A appeler depuis HAL_GPIO_EXTI_Callback() pour toute broche : ne fait rien sauf pour SPI_RDY,
* dont les fronts cadencent la liaison SPI avec le module ST67W611M1. */
void ST67_ExtiCallback(uint16_t gpio_pin);
/* Journal du driver ST67 : tampon circulaire en RAM, lisible au debogueur (variables
* st67_log_ring / st67_log_head). Pas de liaison serie disponible pour les traces. */
#define ST67_LOG_RING_SIZE 4096U
extern char st67_log_ring[ST67_LOG_RING_SIZE];
extern volatile uint32_t st67_log_head; /* prochain octet a ecrire (modulo la taille) */
#ifdef __cplusplus
}
#endif
#endif /* ST67_GLUE_H */
Appli/Core/Src/main.c
+2
View File
@@ -29,6 +29,7 @@
#include "audio_effects.h"
#include "audio_analysis.h"
#include "audio_looper.h"
#include "remote_ble.h"
#include <string.h>
/* USER CODE END Includes */
@@ -264,6 +265,7 @@ int main(void)
/* USER CODE BEGIN RTOS_THREADS */
/* add threads, ... */
RemoteBle_Start(); /* controle a distance BLE (module ST67W611M1) */
/* USER CODE END RTOS_THREADS */
/* USER CODE BEGIN RTOS_EVENTS */
Appli/Core/Src/remote_ble.c
+292
View File
@@ -0,0 +1,292 @@
#include "remote_ble.h"
#include <inttypes.h>
#include <stdbool.h>
#include <stdint.h>
#include <string.h>
#include "FreeRTOS.h"
#include "event_groups.h"
#include "cmsis_os2.h"
#include "w6x_api.h"
#include "logging.h"
#include "remote_params.h"
/* Identifiants GATT : UUID 128 bits en notation canonique, sans tirets (format du module). */
#define SERVICE_UUID "c31100007e8a4b1c9d52f0a1e4b7c600"
#define CHAR_CONTROL_UUID "c31100017e8a4b1c9d52f0a1e4b7c600"
#define CHAR_STATE_UUID "c31100027e8a4b1c9d52f0a1e4b7c600"
#define SERVICE_INDEX 0U
#define CHAR_CONTROL_INDEX 0U
#define CHAR_STATE_INDEX 1U
#define DEVICE_NAME "CelloFX"
/* Donnees d'annonce BLE brutes (hexadecimal) :
* annonce : flags (LE General Discoverable, BR/EDR non supporte) + nom complet "CelloFX"
* reponse au scan : liste complete de l'UUID 128 bits du service, en little-endian */
#define ADV_DATA "020106" "0809" "43656C6C6F4658"
#define SCAN_RESP_DATA "1107" "00C6B7E4A1F0529D1C4B8A7E000011C3"
#define RECORD_SIZE 3U
#define CMD_SNAPSHOT 0xFFU
/* 6 enregistrements = 18 octets : tient dans une notification avec le MTU ATT par defaut (23). */
#define NOTIFY_MAX_RECORDS 6U
#define RX_BUFFER_SIZE 247U
#define INIT_RETRIES 3U
#define INIT_RETRY_DELAY_MS 3000U
#define EVT_CONNECTED (1UL << 0)
#define EVT_DISCONNECTED (1UL << 1)
#define EVT_SNAPSHOT (1UL << 2)
#define EVT_ALL (EVT_CONNECTED | EVT_DISCONNECTED | EVT_SNAPSHOT)
static uint8_t rx_buffer[RX_BUFFER_SIZE]; /* le module y copie les donnees ecrites par le client */
static EventGroupHandle_t events;
static volatile uint32_t conn_handle = 0xFFU;
static volatile bool connected;
static bool started;
static const osThreadAttr_t task_attr = {
.name = "remoteBle",
.stack_size = 3072,
.priority = (osPriority_t)osPriorityBelowNormal,
};
/* Les callbacks du driver s'executent dans son propre contexte : ils doivent rester courts et
* n'appellent aucune fonction W6X_* (l'envoi des notifications est fait par la tache). */
static void on_ble_data(const W6X_Ble_CbParamData_t *p)
{
uint32_t len = p->available_data_length;
if (len > RX_BUFFER_SIZE)
{
len = RX_BUFFER_SIZE;
}
for (uint32_t i = 0; i + RECORD_SIZE <= len; i += RECORD_SIZE)
{
uint8_t id = rx_buffer[i];
int16_t value = (int16_t)((uint16_t)rx_buffer[i + 1] | ((uint16_t)rx_buffer[i + 2] << 8));
if (id == CMD_SNAPSHOT)
{
(void)xEventGroupSetBits(events, EVT_SNAPSHOT);
}
else if (!RemoteParams_Set(id, value))
{
LogWarn("BLE: identifiant de parametre inconnu 0x%02X\n", (unsigned)id);
}
}
}
static void app_ble_cb(W6X_event_id_t event_id, void *event_args)
{
const W6X_Ble_CbParamData_t *p = (const W6X_Ble_CbParamData_t *)event_args;
switch (event_id)
{
case W6X_BLE_EVT_CONNECTED_ID:
conn_handle = p->remote_ble_device.conn_handle;
connected = true;
LogInfo("BLE: client connecte (handle %" PRIu32 ")\n", conn_handle);
(void)xEventGroupSetBits(events, EVT_CONNECTED);
break;
case W6X_BLE_EVT_DISCONNECTED_ID:
connected = false;
conn_handle = 0xFFU;
LogInfo("BLE: client deconnecte\n");
(void)xEventGroupSetBits(events, EVT_DISCONNECTED);
break;
case W6X_BLE_EVT_WRITE_ID:
if (p->service_idx == SERVICE_INDEX && p->charac_idx == CHAR_CONTROL_INDEX)
{
on_ble_data(p);
}
break;
case W6X_BLE_EVT_NOTIFICATION_STATUS_ENABLED_ID:
/* le client s'abonne : on lui envoie l'etat complet pour qu'il se synchronise */
(void)xEventGroupSetBits(events, EVT_SNAPSHOT);
break;
default:
break;
}
}
/* Le driver exige des callbacks valides pour toutes les familles d'evenements. */
static void app_unused_cb(W6X_event_id_t event_id, void *event_args)
{
(void)event_id;
(void)event_args;
}
static void app_error_cb(W6X_Status_t status, char const *func_name)
{
LogError("ST67: erreur %" PRIi32 " dans %s\n", (int32_t)status, func_name);
}
static W6X_Status_t configure_server(void)
{
W6X_Status_t ret;
char name[W6X_BLE_DEVICE_NAME_SIZE] = DEVICE_NAME; /* l'API lit un tableau de taille fixe */
ret = W6X_Ble_SetDeviceName(name);
if (ret != W6X_STATUS_OK) { LogError("BLE: nom\n"); return ret; }
ret = W6X_Ble_SetTxPower(0);
if (ret != W6X_STATUS_OK) { LogError("BLE: puissance d'emission\n"); return ret; }
ret = W6X_Ble_SetAdvData(ADV_DATA);
if (ret != W6X_STATUS_OK) { LogError("BLE: donnees d'annonce\n"); return ret; }
ret = W6X_Ble_SetScanRespData(SCAN_RESP_DATA);
if (ret != W6X_STATUS_OK) { LogError("BLE: reponse au scan\n"); return ret; }
ret = W6X_Ble_CreateService(SERVICE_INDEX, SERVICE_UUID, W6X_BLE_UUID_TYPE_128);
if (ret != W6X_STATUS_OK) { LogError("BLE: creation du service\n"); return ret; }
ret = W6X_Ble_CreateCharacteristic(SERVICE_INDEX, CHAR_CONTROL_INDEX, CHAR_CONTROL_UUID,
W6X_BLE_UUID_TYPE_128,
W6X_BLE_CHAR_PROP_WRITE_WITHOUT_RESP | W6X_BLE_CHAR_PROP_WRITE_WITH_RESP,
W6X_BLE_CHAR_PERM_WRITE);
if (ret != W6X_STATUS_OK) { LogError("BLE: caracteristique Control\n"); return ret; }
ret = W6X_Ble_CreateCharacteristic(SERVICE_INDEX, CHAR_STATE_INDEX, CHAR_STATE_UUID,
W6X_BLE_UUID_TYPE_128,
W6X_BLE_CHAR_PROP_NOTIFY,
W6X_BLE_CHAR_PERM_READ);
if (ret != W6X_STATUS_OK) { LogError("BLE: caracteristique State\n"); return ret; }
ret = W6X_Ble_RegisterCharacteristics();
if (ret != W6X_STATUS_OK) { LogError("BLE: enregistrement des caracteristiques\n"); return ret; }
ret = W6X_Ble_SetSecurityParam(W6X_BLE_SEC_IO_NO_INPUT_OUTPUT);
if (ret != W6X_STATUS_OK) { LogWarn("BLE: parametres de securite\n"); }
return W6X_Ble_AdvStart();
}
static void send_snapshot(void)
{
if (!connected)
{
return;
}
uint8_t buffer[NOTIFY_MAX_RECORDS * RECORD_SIZE];
uint8_t count = RemoteParams_Count();
uint8_t index = 0;
while (index < count && connected)
{
uint32_t used = 0;
while (index < count && used < sizeof(buffer))
{
uint8_t id = RemoteParams_IdAt(index);
int16_t value = 0;
(void)RemoteParams_Get(id, &value);
buffer[used++] = id;
buffer[used++] = (uint8_t)((uint16_t)value & 0xFFU);
buffer[used++] = (uint8_t)(((uint16_t)value >> 8) & 0xFFU);
index++;
}
uint32_t sent = 0;
W6X_Status_t ret = W6X_Ble_ServerNotify((uint8_t)conn_handle, SERVICE_INDEX, CHAR_STATE_INDEX,
buffer, used, &sent, 1000);
if (ret != W6X_STATUS_OK)
{
LogError("BLE: echec de notification (%" PRIi32 ")\n", (int32_t)ret);
return;
}
osDelay(20); /* laisse le temps au lien radio d'ecouler la notification */
}
}
static bool start_module(void)
{
W6X_App_Cb_t cb = {0};
cb.APP_wifi_cb = app_unused_cb;
cb.APP_net_cb = app_unused_cb;
cb.APP_mqtt_cb = app_unused_cb;
cb.APP_ble_cb = app_ble_cb;
cb.APP_error_cb = app_error_cb;
(void)W6X_RegisterAppCb(&cb);
for (uint32_t attempt = 1; attempt <= INIT_RETRIES; attempt++)
{
W6X_Status_t ret = W6X_Init();
if (ret == W6X_STATUS_OK)
{
ret = W6X_Ble_Init(W6X_BLE_MODE_SERVER, rx_buffer, sizeof(rx_buffer) - 1U);
if (ret == W6X_STATUS_OK)
{
ret = configure_server();
if (ret == W6X_STATUS_OK)
{
return true;
}
}
}
LogError("ST67: initialisation impossible (essai %" PRIu32 "/%u, code %" PRIi32 ")\n",
attempt, (unsigned)INIT_RETRIES, (int32_t)ret);
W6X_DeInit();
osDelay(INIT_RETRY_DELAY_MS);
}
return false;
}
static void remote_ble_task(void *argument)
{
(void)argument;
if (!start_module())
{
LogError("ST67: module absent ou muet, controle a distance desactive\n");
osThreadExit();
}
LogInfo("BLE: annonce \"" DEVICE_NAME "\" demarree\n");
LogInfo("tas FreeRTOS libre: %u octets (minimum atteint: %u)\n",
(unsigned)xPortGetFreeHeapSize(), (unsigned)xPortGetMinimumEverFreeHeapSize());
for (;;)
{
EventBits_t bits = xEventGroupWaitBits(events, EVT_ALL, pdTRUE, pdFALSE, portMAX_DELAY);
if ((bits & EVT_DISCONNECTED) != 0U)
{
W6X_Status_t ret = W6X_Ble_AdvStart(); /* redevient visible apres une deconnexion */
if (ret != W6X_STATUS_OK)
{
LogWarn("BLE: relance de l'annonce (%" PRIi32 ")\n", (int32_t)ret);
}
}
if ((bits & EVT_SNAPSHOT) != 0U)
{
send_snapshot();
}
}
}
void RemoteBle_Start(void)
{
if (started)
{
return;
}
started = true;
events = xEventGroupCreate();
if (events == NULL || osThreadNew(remote_ble_task, NULL, &task_attr) == NULL)
{
LogError("ST67: creation de la tache de controle impossible\n");
}
}
Appli/Core/Src/remote_params.c
+136
View File
@@ -0,0 +1,136 @@
#include "remote_params.h"
#include <stddef.h>
#include <math.h>
#include "audio_effects.h"
typedef enum
{
PARAM_BOOL,
PARAM_FLOAT
} ParamKind;
typedef struct
{
uint8_t id;
ParamKind kind;
uint16_t offset; /* position du champ dans AudioEffectsParams */
float scale; /* valeur sur le fil = reel * scale */
float min;
float max;
} ParamDesc;
#define P_BOOL(id, field) { (id), PARAM_BOOL, offsetof(AudioEffectsParams, field), 1.0f, 0.0f, 1.0f }
#define P_UNIT(id, field) { (id), PARAM_FLOAT, offsetof(AudioEffectsParams, field), 1000.0f, 0.0f, 1.0f }
#define P_UNIT_MAX(id, field, vmax) { (id), PARAM_FLOAT, offsetof(AudioEffectsParams, field), 1000.0f, 0.0f, (vmax) }
#define P_EQ_GAIN(i) { (uint8_t)(0x30 + (i)), PARAM_FLOAT, \
offsetof(AudioEffectsParams, equalizer.bands[i].gain_db), 10.0f, -24.0f, 24.0f }
static const ParamDesc k_params[] =
{
P_BOOL(0x00, audio_on_off),
P_UNIT(0x01, master_volume),
P_BOOL(0x10, octaver.enabled),
P_UNIT(0x11, octaver.level_down2),
P_UNIT(0x12, octaver.level_down1),
P_UNIT(0x13, octaver.level_dry),
P_UNIT(0x14, octaver.level_up1),
P_UNIT(0x15, octaver.level_up2),
P_BOOL(0x20, equalizer.enabled),
P_EQ_GAIN(0), P_EQ_GAIN(1), P_EQ_GAIN(2), P_EQ_GAIN(3), P_EQ_GAIN(4),
P_EQ_GAIN(5), P_EQ_GAIN(6), P_EQ_GAIN(7), P_EQ_GAIN(8), P_EQ_GAIN(9),
P_BOOL(0x50, overdrive.enabled),
P_UNIT(0x51, overdrive.drive),
P_UNIT(0x52, overdrive.tone),
P_UNIT(0x53, overdrive.level),
P_BOOL(0x60, saturation.enabled),
P_UNIT(0x61, saturation.drive),
P_UNIT(0x62, saturation.level),
P_BOOL(0x70, echo.enabled),
{ 0x71, PARAM_FLOAT, offsetof(AudioEffectsParams, echo.delay_ms), 1.0f, 0.0f, (float)FX_ECHO_MAX_DELAY_MS },
P_UNIT_MAX(0x72, echo.feedback, 0.95f), /* < 1.0 pour eviter l'emballement */
P_UNIT(0x73, echo.mix),
P_BOOL(0x80, reverb.enabled),
P_UNIT(0x81, reverb.room_size),
P_UNIT(0x82, reverb.damping),
P_UNIT(0x83, reverb.mix),
};
#define PARAM_COUNT (sizeof(k_params) / sizeof(k_params[0]))
_Static_assert(FX_EQ_NUM_BANDS == 10U, "la table des bandes d'egaliseur suppose 10 bandes");
_Static_assert(PARAM_COUNT < 256U, "RemoteParams_Count() tient sur un octet");
static const ParamDesc *find(uint8_t id)
{
for (size_t i = 0; i < PARAM_COUNT; i++)
{
if (k_params[i].id == id)
{
return &k_params[i];
}
}
return NULL;
}
bool RemoteParams_Set(uint8_t id, int16_t value)
{
const ParamDesc *d = find(id);
if (d == NULL)
{
return false;
}
uint8_t *base = (uint8_t *)AudioEffects_GetParams();
if (d->kind == PARAM_BOOL)
{
*(bool *)(base + d->offset) = (value != 0);
}
else
{
float v = (float)value / d->scale;
if (v < d->min) { v = d->min; }
if (v > d->max) { v = d->max; }
*(float *)(base + d->offset) = v;
}
return true;
}
bool RemoteParams_Get(uint8_t id, int16_t *value)
{
const ParamDesc *d = find(id);
if (d == NULL || value == NULL)
{
return false;
}
const uint8_t *base = (const uint8_t *)AudioEffects_GetParams();
if (d->kind == PARAM_BOOL)
{
*value = *(const bool *)(base + d->offset) ? 1 : 0;
}
else
{
float raw = roundf(*(const float *)(base + d->offset) * d->scale);
if (raw > 32767.0f) { raw = 32767.0f; }
if (raw < -32768.0f) { raw = -32768.0f; }
*value = (int16_t)raw;
}
return true;
}
uint8_t RemoteParams_Count(void)
{
return (uint8_t)PARAM_COUNT;
}
uint8_t RemoteParams_IdAt(uint8_t index)
{
return (index < PARAM_COUNT) ? k_params[index].id : 0xFFU;
}
Appli/Core/Src/st67_glue.c
+98
View File
@@ -0,0 +1,98 @@
#include "st67_glue.h"
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
#include "main.h"
#include "logging.h"
#include "spi_iface.h"
char st67_log_ring[ST67_LOG_RING_SIZE];
volatile uint32_t st67_log_head;
/* Niveau le plus verbeux conserve dans le tampon (LOG_ERROR < LOG_WARN < LOG_INFO < LOG_DEBUG). */
#define ST67_LOG_MAX_LEVEL LOG_INFO
static const char *level_tag(uint32_t level)
{
switch (level)
{
case LOG_ERROR: return "E ";
case LOG_WARN: return "W ";
case LOG_INFO: return "I ";
default: return "D ";
}
}
static void ring_write(const char *text, uint32_t len)
{
uint32_t primask = __get_PRIMASK();
__disable_irq();
uint32_t head = st67_log_head;
for (uint32_t i = 0; i < len; i++)
{
st67_log_ring[head] = text[i];
head = (head + 1U) % ST67_LOG_RING_SIZE;
}
st67_log_head = head;
__set_PRIMASK(primask);
}
/* Implementation attendue par les macros LogInfo/LogError/... du driver (composant "Logging" non
* retenu, et pas de UART : les traces vont dans le tampon circulaire st67_log_ring). */
void vLoggingPrintf(uint32_t log_level,
const uint8_t metadata_print,
const uint32_t line_number,
const char *const p_file_name,
const char *const p_format,
...)
{
char line[128];
int n = 0;
if (log_level > ST67_LOG_MAX_LEVEL)
{
return; /* les traces DEBUG du driver saturent le tampon circulaire */
}
n += snprintf(line + n, sizeof(line) - (size_t)n, "%s", level_tag(log_level));
if (metadata_print != 0U && p_file_name != NULL)
{
n += snprintf(line + n, sizeof(line) - (size_t)n, "%s:%lu ", p_file_name, (unsigned long)line_number);
}
va_list args;
va_start(args, p_format);
int m = vsnprintf(line + n, sizeof(line) - (size_t)n, p_format, args);
va_end(args);
if (m < 0)
{
return;
}
n += m;
if ((size_t)n >= sizeof(line))
{
n = (int)sizeof(line) - 1; /* ligne tronquee */
}
ring_write(line, (uint32_t)n);
}
void ST67_ExtiCallback(uint16_t gpio_pin)
{
if (gpio_pin != SPI_RDY_Pin)
{
return;
}
/* front montant : le module a des donnees a transmettre ; front descendant : il a acquitte l'en-tete */
if (HAL_GPIO_ReadPin(SPI_RDY_GPIO_Port, SPI_RDY_Pin) == GPIO_PIN_SET)
{
(void)spi_on_txn_data_ready();
}
else
{
(void)spi_on_header_ack();
}
}
Appli/ST67W6X_Network_Driver/Target/spi_port.c
+79 -13
View File
@@ -37,12 +37,30 @@
#include "main.h"
/* USER CODE BEGIN Includes */
/* Noms de broches : les etiquettes CubeMX du projet sont ST67_CHIP_EN, SPI4_CS ; le driver attend
* CHIP_EN et SPI_CS (SPI_RDY est deja identique). Ces alias survivent a la regeneration. */
#ifndef CHIP_EN_Pin
#define CHIP_EN_Pin ST67_CHIP_EN_Pin
#define CHIP_EN_GPIO_Port ST67_CHIP_EN_GPIO_Port
#endif
#ifndef SPI_CS_Pin
#define SPI_CS_Pin SPI4_CS_Pin
#define SPI_CS_GPIO_Port SPI4_CS_GPIO_Port
#endif
/* USER CODE END Includes */
/* Global variables ----------------------------------------------------------*/
/* USER CODE BEGIN GV */
/* Le DMA du SPI ne sait ni lire ni ecrire la DTCM, or les tampons du driver viennent du tas FreeRTOS
* place en DTCM (cf. Appli/stm32h7rsxx_RAMxspi1_ROMxspi2.ld) : le canal DMA sortait en erreur de
* transfert (HAL_DMA_ERROR_TE) des que le module envoyait plus que l'en-tete. Les transferts DMA
* passent donc par deux tampons de rebond en RAM_CMD (non cachee, region MPU 6), recopies a la
* volee. Taille : W61_MAX_SPI_XFER + en-tete SPI + alignement. */
#define DMA_BOUNCE_SIZE 1536U
static uint8_t dma_tx_bounce[DMA_BOUNCE_SIZE] __attribute__((section("noncacheable_buffer"), aligned(32)));
static uint8_t dma_rx_bounce[DMA_BOUNCE_SIZE] __attribute__((section("noncacheable_buffer"), aligned(32)));
static void * volatile dma_rx_dest; /* tampon final du transfert de reception en cours */
static volatile uint16_t dma_rx_len;
/* USER CODE END GV */
/* Private typedef -----------------------------------------------------------*/
@@ -145,7 +163,35 @@ void *spi_port_memcpy(void *dest, const void *src, unsigned int len)
int32_t spi_port_init(spi_transaction_complete_t transaction_complete_cb)
{
/* USER CODE BEGIN spi_port_init_1 */
/* Le driver traite CS comme actif a l'etat haut (spi_port_set_cs(1) = niveau haut). Au repos il
* doit donc etre bas, avant meme d'alimenter le module (CubeMX le laisse haut par defaut). */
HAL_GPIO_WritePin(SPI_CS_GPIO_Port, SPI_CS_Pin, GPIO_PIN_RESET);
/* CubeMX configure SCK/MOSI du SPI4 en vitesse LOW (front lent) alors que le bus tourne a
* ~19 Mbit/s : les fronts deformes corrompent l'en-tete (magic 0x5501 au lieu de 0x55AA).
* Vitesse tres haute pour PE12 (SCK), PE13 (MISO) et PE14 (MOSI). */
GPIO_InitTypeDef spi_gpio = {0};
spi_gpio.Pin = GPIO_PIN_12 | GPIO_PIN_13 | GPIO_PIN_14;
spi_gpio.Mode = GPIO_MODE_AF_PP;
spi_gpio.Pull = GPIO_NOPULL;
spi_gpio.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
spi_gpio.Alternate = GPIO_AF5_SPI4;
HAL_GPIO_Init(GPIOE, &spi_gpio);
/* CubeMX genere les DMA de SPI4 avec adresse memoire FIXE (RX: DestInc, TX: SrcInc) : tous les
* octets recus sont ecrits au meme endroit. A cocher dans CubeMX (SPI4 > DMA Settings >
* "Increment Address" cote memoire) ; en attendant on corrige ici. */
extern DMA_HandleTypeDef handle_GPDMA1_Channel4, handle_GPDMA1_Channel5;
handle_GPDMA1_Channel4.Init.DestInc = DMA_DINC_INCREMENTED; /* SPI4_RX */
handle_GPDMA1_Channel5.Init.SrcInc = DMA_SINC_INCREMENTED; /* SPI4_TX */
if ((HAL_DMA_Init(&handle_GPDMA1_Channel4) != HAL_OK) || (HAL_DMA_Init(&handle_GPDMA1_Channel5) != HAL_OK))
{
Error_Handler();
}
/* Le bus est instable a ~19 Mbit/s (en-tetes decales d'un bit, donnees nulles) : on ralentit.
* Reglage equivalent dans CubeMX : SPI4 > Baud Rate Prescaler (regenere ensuite sans effet ici). */
__HAL_SPI_DISABLE(&NCP_SPI_HANDLE);
MODIFY_REG(NCP_SPI_HANDLE.Instance->CFG1, SPI_CFG1_MBR, SPI_BAUDRATEPRESCALER_16);
/* USER CODE END spi_port_init_1 */
if (NCP_SPI_HANDLE.State == HAL_SPI_STATE_RESET)
{
@@ -221,8 +267,7 @@ int32_t spi_port_transfer(void *tx_buf, void *rx_buf, uint16_t len, uint32_t tim
status = HAL_SPI_TransmitReceive(&NCP_SPI_HANDLE, tx_dummy, rx_buf, len, timeout);
}
/* USER CODE BEGIN spi_port_transfer_2 */
/* USER CODE END spi_port_transfer_2 */
/* USER CODE END spi_port_transfer_2 */
return ((status == HAL_OK) ? 0 : -1);
/* USER CODE BEGIN spi_port_transfer_End */
@@ -254,14 +299,27 @@ int32_t spi_port_transfer_dma(void *tx_buf, void *rx_buf, uint16_t len)
SCB_CleanDCache_by_Addr(tx_buf, len);
#endif /* __DCACHE_PRESENT */
/* USER CODE BEGIN spi_port_transfer_dma_trx */
status = HAL_SPI_TransmitReceive_DMA(&NCP_SPI_HANDLE, tx_buf, rx_buf, len);
/* USER CODE END spi_port_transfer_dma_trx */
if (len > DMA_BOUNCE_SIZE)
{
return -1;
}
(void)memcpy(dma_tx_bounce, tx_buf, len);
dma_rx_dest = rx_buf;
dma_rx_len = len;
status = HAL_SPI_TransmitReceive_DMA(&NCP_SPI_HANDLE, dma_tx_bounce, dma_rx_bounce, len);
/* USER CODE END spi_port_transfer_dma_trx */
}
else
{
/* USER CODE BEGIN spi_port_transfer_dma_rx */
status = HAL_SPI_Receive_DMA(&NCP_SPI_HANDLE, rx_buf, len);
/* USER CODE END spi_port_transfer_dma_rx */
if (len > DMA_BOUNCE_SIZE)
{
return -1;
}
dma_rx_dest = rx_buf;
dma_rx_len = len;
status = HAL_SPI_Receive_DMA(&NCP_SPI_HANDLE, dma_rx_bounce, len);
/* USER CODE END spi_port_transfer_dma_rx */
}
/* USER CODE BEGIN spi_port_transfer_dma_2 */
@@ -314,7 +372,15 @@ int32_t spi_port_set_cs(int32_t state)
}
/* USER CODE BEGIN FD */
/* Recopie la reception DMA du tampon de rebond vers le tampon du driver, avant de signaler la fin. */
static void spi_port_dma_rx_copyback(SPI_HandleTypeDef *hspi)
{
if (hspi == &NCP_SPI_HANDLE && dma_rx_dest != NULL)
{
(void)memcpy(dma_rx_dest, dma_rx_bounce, dma_rx_len);
dma_rx_dest = NULL;
}
}
/* USER CODE END FD */
/* Weak functions redefinition -----------------------------------------------*/
@@ -335,8 +401,8 @@ void HAL_SPI_TxCpltCallback(SPI_HandleTypeDef *hspi)
void HAL_SPI_RxCpltCallback(SPI_HandleTypeDef *hspi)
{
/* USER CODE BEGIN HAL_SPI_RxCpltCallback_1 */
/* USER CODE END HAL_SPI_RxCpltCallback_1 */
spi_port_dma_rx_copyback(hspi);
/* USER CODE END HAL_SPI_RxCpltCallback_1 */
if (hspi == &NCP_SPI_HANDLE)
{
spi_port_transaction_complete_cb();
@@ -349,8 +415,8 @@ void HAL_SPI_RxCpltCallback(SPI_HandleTypeDef *hspi)
void HAL_SPI_TxRxCpltCallback(SPI_HandleTypeDef *hspi)
{
/* USER CODE BEGIN HAL_SPI_TxRxCpltCallback_1 */
/* USER CODE END HAL_SPI_TxRxCpltCallback_1 */
spi_port_dma_rx_copyback(hspi);
/* USER CODE END HAL_SPI_TxRxCpltCallback_1 */
if (hspi == &NCP_SPI_HANDLE)
{
spi_port_transaction_complete_cb();
Appli/TouchGFX/build/bin/application.map
+10493 -6137
View File
File diff suppressed because it is too large. Load diff
Appli/TouchGFX/build/bin/intflash.elf
BIN
View File
Binary file not shown.
Appli/TouchGFX/build/bin/intflash.hex
+32765 -30941
View File
File diff suppressed because it is too large. Load diff
Appli/TouchGFX/build/bin/target.elf
BIN
View File
Binary file not shown.
Appli/TouchGFX/build/bin/target.hex
+32765 -30941
View File
File diff suppressed because it is too large. Load diff
Appli/TouchGFX/generated/images/include/BitmapDatabase.hpp
+1 -1
View File
@@ -1 +1 @@
#include <images/BitmapDatabase.hpp>
#include <images/BitmapDatabase.hpp>
Appli/TouchGFX/generated/images/include/images/BitmapDatabase.hpp
+39 -39
View File
@@ -1,39 +1,39 @@
// Generated by imageconverter. Please, do not edit!
#ifndef TOUCHGFX_BITMAPDATABASE_HPP
#define TOUCHGFX_BITMAPDATABASE_HPP
#include <touchgfx/hal/Types.hpp>
#include <touchgfx/Bitmap.hpp>
const uint16_t BITMAP_FONDHORLOGERIE1_ID = 0;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_ICON_ROUND_HUGE_FILL_NORMAL_ID = 1;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_ICON_ROUND_HUGE_FILL_PRESSED_ID = 2;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_ICON_ROUND_TINY_FILL_NORMAL_ID = 3;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_ICON_ROUND_TINY_FILL_PRESSED_ID = 4;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_REGULAR_HEIGHT_36_MEDIUM_ROUND_ACTION_ID = 5;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_REGULAR_HEIGHT_50_LARGE_ROUNDED_NORMAL_ID = 6;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_REGULAR_HEIGHT_50_LARGE_ROUNDED_PRESSED_ID = 7;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_REGULAR_HEIGHT_50_SMALL_ROUNDED_NORMAL_ID = 8;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_REGULAR_HEIGHT_50_SMALL_ROUNDED_PRESSED_ID = 9;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_SLIDER_HORIZONTAL_THICK_FILLER_LARGE_ID = 10;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_SLIDER_HORIZONTAL_THICK_ROUNDED_DARK_ID = 11;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_SLIDER_HORIZONTAL_THICK_TRACK_LARGE_ID = 12;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_SLIDER_VERTICAL_THICK_FILLER_MEDIUM_ID = 13;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_SLIDER_VERTICAL_THICK_ROUNDED_DARK_ID = 14;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_SLIDER_VERTICAL_THICK_TRACK_MEDIUM_ID = 15;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_TOGGLEBUTTON_LARGE_ROUND_TEXT_OFF_NORMAL_ID = 16;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_TOGGLEBUTTON_LARGE_ROUND_TEXT_ON_ACTIVE_ID = 17;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_TOGGLEBUTTON_LARGE_ROUNDED_TEXT_OFF_NORMAL_ID = 18;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_TOGGLEBUTTON_LARGE_ROUNDED_TEXT_ON_ACTIVE_ID = 19;
const uint16_t BITMAP_ICON_THEME_IMAGES_ACTION_DONE_50_50_B5241F_SVG_ID = 20;
const uint16_t BITMAP_ICON_THEME_IMAGES_AV_FIBER_MANUAL_RECORD_50_50_5E3E10_SVG_ID = 21;
const uint16_t BITMAP_ICON_THEME_IMAGES_HARDWARE_HEADSET_50_50_FFFFFF_SVG_ID = 22;
namespace BitmapDatabase
{
const touchgfx::Bitmap::BitmapData* getInstance();
uint16_t getInstanceSize();
} // namespace BitmapDatabase
#endif // TOUCHGFX_BITMAPDATABASE_HPP
// Generated by imageconverter. Please, do not edit!
#ifndef TOUCHGFX_BITMAPDATABASE_HPP
#define TOUCHGFX_BITMAPDATABASE_HPP
#include <touchgfx/hal/Types.hpp>
#include <touchgfx/Bitmap.hpp>
const uint16_t BITMAP_FONDHORLOGERIE1_ID = 0;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_ICON_ROUND_HUGE_FILL_NORMAL_ID = 1;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_ICON_ROUND_HUGE_FILL_PRESSED_ID = 2;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_ICON_ROUND_TINY_FILL_NORMAL_ID = 3;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_ICON_ROUND_TINY_FILL_PRESSED_ID = 4;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_REGULAR_HEIGHT_36_MEDIUM_ROUND_ACTION_ID = 5;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_REGULAR_HEIGHT_50_LARGE_ROUNDED_NORMAL_ID = 6;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_REGULAR_HEIGHT_50_LARGE_ROUNDED_PRESSED_ID = 7;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_REGULAR_HEIGHT_50_SMALL_ROUNDED_NORMAL_ID = 8;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_REGULAR_HEIGHT_50_SMALL_ROUNDED_PRESSED_ID = 9;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_SLIDER_HORIZONTAL_THICK_FILLER_LARGE_ID = 10;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_SLIDER_HORIZONTAL_THICK_ROUNDED_DARK_ID = 11;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_SLIDER_HORIZONTAL_THICK_TRACK_LARGE_ID = 12;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_SLIDER_VERTICAL_THICK_FILLER_MEDIUM_ID = 13;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_SLIDER_VERTICAL_THICK_ROUNDED_DARK_ID = 14;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_SLIDER_VERTICAL_THICK_TRACK_MEDIUM_ID = 15;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_TOGGLEBUTTON_LARGE_ROUND_TEXT_OFF_NORMAL_ID = 16;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_TOGGLEBUTTON_LARGE_ROUND_TEXT_ON_ACTIVE_ID = 17;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_TOGGLEBUTTON_LARGE_ROUNDED_TEXT_OFF_NORMAL_ID = 18;
const uint16_t BITMAP_GLASS_THEME_IMAGES_WIDGETS_TOGGLEBUTTON_LARGE_ROUNDED_TEXT_ON_ACTIVE_ID = 19;
const uint16_t BITMAP_ICON_THEME_IMAGES_ACTION_DONE_50_50_B5241F_SVG_ID = 20;
const uint16_t BITMAP_ICON_THEME_IMAGES_AV_FIBER_MANUAL_RECORD_50_50_5E3E10_SVG_ID = 21;
const uint16_t BITMAP_ICON_THEME_IMAGES_HARDWARE_HEADSET_50_50_FFFFFF_SVG_ID = 22;
namespace BitmapDatabase
{
const touchgfx::Bitmap::BitmapData* getInstance();
uint16_t getInstanceSize();
} // namespace BitmapDatabase
#endif // TOUCHGFX_BITMAPDATABASE_HPP
Appli/TouchGFX/generated/images/include/images/SVGDatabase.hpp
+20 -20
View File
@@ -1,20 +1,20 @@
// Generated by imageconverter. Please, do not edit!
#ifndef TOUCHGFX_SVGDATABASE_HPP
#define TOUCHGFX_SVGDATABASE_HPP
#include <touchgfx/hal/Types.hpp>
#include <touchgfx/hal/VGData.hpp>
enum SVGImages
{
NUMBER_OF_SVG_IMAGES = 0
};
namespace SVGDatabase
{
const touchgfx::VGObject* getInstance();
uint16_t getInstanceSize();
} // namespace SVGDatabase
#endif // TOUCHGFX_SVGDATABASE_HPP
// Generated by imageconverter. Please, do not edit!
#ifndef TOUCHGFX_SVGDATABASE_HPP
#define TOUCHGFX_SVGDATABASE_HPP
#include <touchgfx/hal/Types.hpp>
#include <touchgfx/hal/VGData.hpp>
enum SVGImages
{
NUMBER_OF_SVG_IMAGES = 0
};
namespace SVGDatabase
{
const touchgfx::VGObject* getInstance();
uint16_t getInstanceSize();
} // namespace SVGDatabase
#endif // TOUCHGFX_SVGDATABASE_HPP
Appli/TouchGFX/generated/images/src/BitmapDatabase.cpp
+68 -68
View File
@@ -1,68 +1,68 @@
// 4.26.1 0xd94e70b0
// Generated by imageconverter. Please, do not edit!
#include <images/BitmapDatabase.hpp>
#include <touchgfx/Bitmap.hpp>
extern const unsigned char image_fondhorlogerie1[]; // BITMAP_FONDHORLOGERIE1_ID = 0, Size: 800x483 pixels
extern const unsigned char image_glass_theme_images_widgets_button_icon_round_huge_fill_normal[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_ICON_ROUND_HUGE_FILL_NORMAL_ID = 1, Size: 334x322 pixels
extern const unsigned char image_glass_theme_images_widgets_button_icon_round_huge_fill_pressed[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_ICON_ROUND_HUGE_FILL_PRESSED_ID = 2, Size: 334x322 pixels
extern const unsigned char image_glass_theme_images_widgets_button_icon_round_tiny_fill_normal[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_ICON_ROUND_TINY_FILL_NORMAL_ID = 3, Size: 128x116 pixels
extern const unsigned char image_glass_theme_images_widgets_button_icon_round_tiny_fill_pressed[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_ICON_ROUND_TINY_FILL_PRESSED_ID = 4, Size: 128x116 pixels
extern const unsigned char image_glass_theme_images_widgets_button_regular_height_36_medium_round_action[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_REGULAR_HEIGHT_36_MEDIUM_ROUND_ACTION_ID = 5, Size: 264x80 pixels
extern const unsigned char image_glass_theme_images_widgets_button_regular_height_50_large_rounded_normal[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_REGULAR_HEIGHT_50_LARGE_ROUNDED_NORMAL_ID = 6, Size: 420x94 pixels
extern const unsigned char image_glass_theme_images_widgets_button_regular_height_50_large_rounded_pressed[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_REGULAR_HEIGHT_50_LARGE_ROUNDED_PRESSED_ID = 7, Size: 420x94 pixels
extern const unsigned char image_glass_theme_images_widgets_button_regular_height_50_small_rounded_normal[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_REGULAR_HEIGHT_50_SMALL_ROUNDED_NORMAL_ID = 8, Size: 225x94 pixels
extern const unsigned char image_glass_theme_images_widgets_button_regular_height_50_small_rounded_pressed[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_REGULAR_HEIGHT_50_SMALL_ROUNDED_PRESSED_ID = 9, Size: 225x94 pixels
extern const unsigned char image_glass_theme_images_widgets_slider_horizontal_thick_filler_large[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_SLIDER_HORIZONTAL_THICK_FILLER_LARGE_ID = 10, Size: 400x10 pixels
extern const unsigned char image_glass_theme_images_widgets_slider_horizontal_thick_rounded_dark[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_SLIDER_HORIZONTAL_THICK_ROUNDED_DARK_ID = 11, Size: 56x52 pixels
extern const unsigned char image_glass_theme_images_widgets_slider_horizontal_thick_track_large[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_SLIDER_HORIZONTAL_THICK_TRACK_LARGE_ID = 12, Size: 400x10 pixels
extern const unsigned char image_glass_theme_images_widgets_slider_vertical_thick_filler_medium[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_SLIDER_VERTICAL_THICK_FILLER_MEDIUM_ID = 13, Size: 10x300 pixels
extern const unsigned char image_glass_theme_images_widgets_slider_vertical_thick_rounded_dark[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_SLIDER_VERTICAL_THICK_ROUNDED_DARK_ID = 14, Size: 56x52 pixels
extern const unsigned char image_glass_theme_images_widgets_slider_vertical_thick_track_medium[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_SLIDER_VERTICAL_THICK_TRACK_MEDIUM_ID = 15, Size: 10x300 pixels
extern const unsigned char image_glass_theme_images_widgets_togglebutton_large_round_text_off_normal[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_TOGGLEBUTTON_LARGE_ROUND_TEXT_OFF_NORMAL_ID = 16, Size: 170x60 pixels
extern const unsigned char image_glass_theme_images_widgets_togglebutton_large_round_text_on_active[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_TOGGLEBUTTON_LARGE_ROUND_TEXT_ON_ACTIVE_ID = 17, Size: 170x60 pixels
extern const unsigned char image_glass_theme_images_widgets_togglebutton_large_rounded_text_off_normal[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_TOGGLEBUTTON_LARGE_ROUNDED_TEXT_OFF_NORMAL_ID = 18, Size: 170x60 pixels
extern const unsigned char image_glass_theme_images_widgets_togglebutton_large_rounded_text_on_active[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_TOGGLEBUTTON_LARGE_ROUNDED_TEXT_ON_ACTIVE_ID = 19, Size: 170x60 pixels
extern const unsigned char image_icon_theme_images_action_done_50_50_b5241f_svg[]; // BITMAP_ICON_THEME_IMAGES_ACTION_DONE_50_50_B5241F_SVG_ID = 20, Size: 50x50 pixels
extern const unsigned char image_icon_theme_images_av_fiber_manual_record_50_50_5e3e10_svg[]; // BITMAP_ICON_THEME_IMAGES_AV_FIBER_MANUAL_RECORD_50_50_5E3E10_SVG_ID = 21, Size: 50x50 pixels
extern const unsigned char image_icon_theme_images_hardware_headset_50_50_ffffff_svg[]; // BITMAP_ICON_THEME_IMAGES_HARDWARE_HEADSET_50_50_FFFFFF_SVG_ID = 22, Size: 50x50 pixels
const touchgfx::Bitmap::BitmapData bitmap_database[] = {
{ image_fondhorlogerie1, 0, 800, 483, 0, 0, 800, ((uint8_t)touchgfx::Bitmap::RGB565) >> 3, 483, ((uint8_t)touchgfx::Bitmap::RGB565) & 0x7 },
{ image_glass_theme_images_widgets_button_icon_round_huge_fill_normal, 0, 334, 322, 0, 0, 0, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 0, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_button_icon_round_huge_fill_pressed, 0, 334, 322, 298, 144, 1, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 34, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_button_icon_round_tiny_fill_normal, 0, 128, 116, 0, 0, 0, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 0, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_button_icon_round_tiny_fill_pressed, 0, 128, 116, 92, 50, 1, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 16, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_button_regular_height_36_medium_round_action, 0, 264, 80, 42, 22, 180, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 36, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_button_regular_height_50_large_rounded_normal, 0, 420, 94, 0, 0, 0, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 0, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_button_regular_height_50_large_rounded_pressed, 0, 420, 94, 31, 23, 360, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 2, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_button_regular_height_50_small_rounded_normal, 0, 225, 94, 0, 0, 0, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 0, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_button_regular_height_50_small_rounded_pressed, 0, 225, 94, 31, 23, 165, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 2, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_slider_horizontal_thick_filler_large, 0, 400, 10, 5, 0, 390, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 10, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_slider_horizontal_thick_rounded_dark, 0, 56, 52, 14, 12, 28, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 28, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_slider_horizontal_thick_track_large, 0, 400, 10, 0, 0, 0, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 0, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_slider_vertical_thick_filler_medium, 0, 10, 300, 0, 5, 10, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 290, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_slider_vertical_thick_rounded_dark, 0, 56, 52, 14, 12, 28, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 28, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_slider_vertical_thick_track_medium, 0, 10, 300, 0, 0, 0, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 0, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_togglebutton_large_round_text_off_normal, 0, 170, 60, 0, 0, 0, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 0, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_togglebutton_large_round_text_on_active, 0, 170, 60, 96, 12, 55, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 36, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_togglebutton_large_rounded_text_off_normal, 0, 170, 60, 0, 0, 0, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 0, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_togglebutton_large_rounded_text_on_active, 0, 170, 60, 88, 10, 71, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 40, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_icon_theme_images_action_done_50_50_b5241f_svg, 0, 50, 50, 15, 32, 6, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 4, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_icon_theme_images_av_fiber_manual_record_50_50_5e3e10_svg, 0, 50, 50, 18, 9, 12, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 4, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_icon_theme_images_hardware_headset_50_50_ffffff_svg, 0, 50, 50, 38, 14, 4, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 22, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 }
};
namespace BitmapDatabase
{
const touchgfx::Bitmap::BitmapData* getInstance()
{
return bitmap_database;
}
uint16_t getInstanceSize()
{
return (uint16_t)(sizeof(bitmap_database) / sizeof(touchgfx::Bitmap::BitmapData));
}
} // namespace BitmapDatabase
// 4.26.1 0xd94e70b0
// Generated by imageconverter. Please, do not edit!
#include <images/BitmapDatabase.hpp>
#include <touchgfx/Bitmap.hpp>
extern const unsigned char image_fondhorlogerie1[]; // BITMAP_FONDHORLOGERIE1_ID = 0, Size: 800x483 pixels
extern const unsigned char image_glass_theme_images_widgets_button_icon_round_huge_fill_normal[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_ICON_ROUND_HUGE_FILL_NORMAL_ID = 1, Size: 334x322 pixels
extern const unsigned char image_glass_theme_images_widgets_button_icon_round_huge_fill_pressed[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_ICON_ROUND_HUGE_FILL_PRESSED_ID = 2, Size: 334x322 pixels
extern const unsigned char image_glass_theme_images_widgets_button_icon_round_tiny_fill_normal[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_ICON_ROUND_TINY_FILL_NORMAL_ID = 3, Size: 128x116 pixels
extern const unsigned char image_glass_theme_images_widgets_button_icon_round_tiny_fill_pressed[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_ICON_ROUND_TINY_FILL_PRESSED_ID = 4, Size: 128x116 pixels
extern const unsigned char image_glass_theme_images_widgets_button_regular_height_36_medium_round_action[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_REGULAR_HEIGHT_36_MEDIUM_ROUND_ACTION_ID = 5, Size: 264x80 pixels
extern const unsigned char image_glass_theme_images_widgets_button_regular_height_50_large_rounded_normal[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_REGULAR_HEIGHT_50_LARGE_ROUNDED_NORMAL_ID = 6, Size: 420x94 pixels
extern const unsigned char image_glass_theme_images_widgets_button_regular_height_50_large_rounded_pressed[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_REGULAR_HEIGHT_50_LARGE_ROUNDED_PRESSED_ID = 7, Size: 420x94 pixels
extern const unsigned char image_glass_theme_images_widgets_button_regular_height_50_small_rounded_normal[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_REGULAR_HEIGHT_50_SMALL_ROUNDED_NORMAL_ID = 8, Size: 225x94 pixels
extern const unsigned char image_glass_theme_images_widgets_button_regular_height_50_small_rounded_pressed[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_BUTTON_REGULAR_HEIGHT_50_SMALL_ROUNDED_PRESSED_ID = 9, Size: 225x94 pixels
extern const unsigned char image_glass_theme_images_widgets_slider_horizontal_thick_filler_large[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_SLIDER_HORIZONTAL_THICK_FILLER_LARGE_ID = 10, Size: 400x10 pixels
extern const unsigned char image_glass_theme_images_widgets_slider_horizontal_thick_rounded_dark[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_SLIDER_HORIZONTAL_THICK_ROUNDED_DARK_ID = 11, Size: 56x52 pixels
extern const unsigned char image_glass_theme_images_widgets_slider_horizontal_thick_track_large[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_SLIDER_HORIZONTAL_THICK_TRACK_LARGE_ID = 12, Size: 400x10 pixels
extern const unsigned char image_glass_theme_images_widgets_slider_vertical_thick_filler_medium[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_SLIDER_VERTICAL_THICK_FILLER_MEDIUM_ID = 13, Size: 10x300 pixels
extern const unsigned char image_glass_theme_images_widgets_slider_vertical_thick_rounded_dark[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_SLIDER_VERTICAL_THICK_ROUNDED_DARK_ID = 14, Size: 56x52 pixels
extern const unsigned char image_glass_theme_images_widgets_slider_vertical_thick_track_medium[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_SLIDER_VERTICAL_THICK_TRACK_MEDIUM_ID = 15, Size: 10x300 pixels
extern const unsigned char image_glass_theme_images_widgets_togglebutton_large_round_text_off_normal[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_TOGGLEBUTTON_LARGE_ROUND_TEXT_OFF_NORMAL_ID = 16, Size: 170x60 pixels
extern const unsigned char image_glass_theme_images_widgets_togglebutton_large_round_text_on_active[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_TOGGLEBUTTON_LARGE_ROUND_TEXT_ON_ACTIVE_ID = 17, Size: 170x60 pixels
extern const unsigned char image_glass_theme_images_widgets_togglebutton_large_rounded_text_off_normal[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_TOGGLEBUTTON_LARGE_ROUNDED_TEXT_OFF_NORMAL_ID = 18, Size: 170x60 pixels
extern const unsigned char image_glass_theme_images_widgets_togglebutton_large_rounded_text_on_active[]; // BITMAP_GLASS_THEME_IMAGES_WIDGETS_TOGGLEBUTTON_LARGE_ROUNDED_TEXT_ON_ACTIVE_ID = 19, Size: 170x60 pixels
extern const unsigned char image_icon_theme_images_action_done_50_50_b5241f_svg[]; // BITMAP_ICON_THEME_IMAGES_ACTION_DONE_50_50_B5241F_SVG_ID = 20, Size: 50x50 pixels
extern const unsigned char image_icon_theme_images_av_fiber_manual_record_50_50_5e3e10_svg[]; // BITMAP_ICON_THEME_IMAGES_AV_FIBER_MANUAL_RECORD_50_50_5E3E10_SVG_ID = 21, Size: 50x50 pixels
extern const unsigned char image_icon_theme_images_hardware_headset_50_50_ffffff_svg[]; // BITMAP_ICON_THEME_IMAGES_HARDWARE_HEADSET_50_50_FFFFFF_SVG_ID = 22, Size: 50x50 pixels
const touchgfx::Bitmap::BitmapData bitmap_database[] = {
{ image_fondhorlogerie1, 0, 800, 483, 0, 0, 800, ((uint8_t)touchgfx::Bitmap::RGB565) >> 3, 483, ((uint8_t)touchgfx::Bitmap::RGB565) & 0x7 },
{ image_glass_theme_images_widgets_button_icon_round_huge_fill_normal, 0, 334, 322, 0, 0, 0, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 0, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_button_icon_round_huge_fill_pressed, 0, 334, 322, 298, 144, 1, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 34, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_button_icon_round_tiny_fill_normal, 0, 128, 116, 0, 0, 0, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 0, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_button_icon_round_tiny_fill_pressed, 0, 128, 116, 92, 50, 1, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 16, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_button_regular_height_36_medium_round_action, 0, 264, 80, 42, 22, 180, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 36, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_button_regular_height_50_large_rounded_normal, 0, 420, 94, 0, 0, 0, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 0, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_button_regular_height_50_large_rounded_pressed, 0, 420, 94, 31, 23, 360, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 2, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_button_regular_height_50_small_rounded_normal, 0, 225, 94, 0, 0, 0, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 0, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_button_regular_height_50_small_rounded_pressed, 0, 225, 94, 31, 23, 165, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 2, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_slider_horizontal_thick_filler_large, 0, 400, 10, 5, 0, 390, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 10, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_slider_horizontal_thick_rounded_dark, 0, 56, 52, 14, 12, 28, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 28, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_slider_horizontal_thick_track_large, 0, 400, 10, 0, 0, 0, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 0, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_slider_vertical_thick_filler_medium, 0, 10, 300, 0, 5, 10, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 290, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_slider_vertical_thick_rounded_dark, 0, 56, 52, 14, 12, 28, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 28, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_slider_vertical_thick_track_medium, 0, 10, 300, 0, 0, 0, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 0, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_togglebutton_large_round_text_off_normal, 0, 170, 60, 0, 0, 0, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 0, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_togglebutton_large_round_text_on_active, 0, 170, 60, 96, 12, 55, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 36, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_togglebutton_large_rounded_text_off_normal, 0, 170, 60, 0, 0, 0, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 0, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_glass_theme_images_widgets_togglebutton_large_rounded_text_on_active, 0, 170, 60, 88, 10, 71, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 40, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_icon_theme_images_action_done_50_50_b5241f_svg, 0, 50, 50, 15, 32, 6, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 4, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_icon_theme_images_av_fiber_manual_record_50_50_5e3e10_svg, 0, 50, 50, 18, 9, 12, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 4, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 },
{ image_icon_theme_images_hardware_headset_50_50_ffffff_svg, 0, 50, 50, 38, 14, 4, ((uint8_t)touchgfx::Bitmap::ARGB8888) >> 3, 22, ((uint8_t)touchgfx::Bitmap::ARGB8888) & 0x7 }
};
namespace BitmapDatabase
{
const touchgfx::Bitmap::BitmapData* getInstance()
{
return bitmap_database;
}
uint16_t getInstanceSize()
{
return (uint16_t)(sizeof(bitmap_database) / sizeof(touchgfx::Bitmap::BitmapData));
}
} // namespace BitmapDatabase
Appli/TouchGFX/generated/images/src/SVGDatabase.cpp
+19 -19
View File
@@ -1,19 +1,19 @@
// Generated by imageconverter. Please, do not edit!
#include <images/SVGDatabase.hpp>
using namespace touchgfx;
namespace SVGDatabase
{
const touchgfx::VGObject* getInstance()
{
return (const touchgfx::VGObject*)0;
}
uint16_t getInstanceSize()
{
return 0;
}
} // namespace SVGDatabase
// Generated by imageconverter. Please, do not edit!
#include <images/SVGDatabase.hpp>
using namespace touchgfx;
namespace SVGDatabase
{
const touchgfx::VGObject* getInstance()
{
return (const touchgfx::VGObject*)0;
}
uint16_t getInstanceSize()
{
return 0;
}
} // namespace SVGDatabase
Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_button_icon_round_huge_fill_normal.cpp
+35858 -35858
View File
File diff suppressed because it is too large. Load diff
Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_button_icon_round_huge_fill_pressed.cpp
+35858 -35858
View File
File diff suppressed because it is too large. Load diff
Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_button_icon_round_tiny_fill_normal.cpp
+4958 -4958
View File
File diff suppressed because it is too large. Load diff
Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_button_icon_round_tiny_fill_pressed.cpp
+4958 -4958
View File
File diff suppressed because it is too large. Load diff
Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_button_regular_height_36_medium_round_action.cpp
+7048 -7048
View File
File diff suppressed because it is too large. Load diff
Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_button_regular_height_50_large_rounded_normal.cpp
+13168 -13168
View File
File diff suppressed because it is too large. Load diff
Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_button_regular_height_50_large_rounded_pressed.cpp
+13168 -13168
View File
File diff suppressed because it is too large. Load diff
Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_button_regular_height_50_small_rounded_normal.cpp
+7058 -7058
View File
File diff suppressed because it is too large. Load diff
Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_button_regular_height_50_small_rounded_pressed.cpp
+7058 -7058
View File
File diff suppressed because it is too large. Load diff
Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_slider_horizontal_thick_filler_large.cpp
+1342 -1342
View File
File diff suppressed because it is too large. Load diff
Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_slider_horizontal_thick_rounded_dark.cpp
+979 -979
View File
File diff suppressed because it is too large. Load diff
Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_slider_horizontal_thick_track_large.cpp
+1342 -1342
View File
File diff suppressed because it is too large. Load diff
Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_slider_vertical_thick_filler_medium.cpp
+1008 -1008
View File
File diff suppressed because it is too large. Load diff
Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_slider_vertical_thick_rounded_dark.cpp
+979 -979
View File
File diff suppressed because it is too large. Load diff
Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_slider_vertical_thick_track_medium.cpp
+1008 -1008
View File
File diff suppressed because it is too large. Load diff
Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_togglebutton_large_round_text_off_normal.cpp
+3408 -3408
View File
File diff suppressed because it is too large. Load diff
Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_togglebutton_large_round_text_on_active.cpp
+3408 -3408
View File
File diff suppressed because it is too large. Load diff
Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_togglebutton_large_rounded_text_off_normal.cpp
+3408 -3408
View File
File diff suppressed because it is too large. Load diff
Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_togglebutton_large_rounded_text_on_active.cpp
+3408 -3408
View File
File diff suppressed because it is too large. Load diff
Appli/TouchGFX/generated/images/src/__generated/image_icon_theme_images_action_done_50_50_B5241F.svg.cpp
+842 -842
View File
File diff suppressed because it is too large. Load diff
Appli/TouchGFX/generated/images/src/__generated/image_icon_theme_images_av_fiber_manual_record_50_50_5E3E10.svg.cpp
+842 -842
View File
File diff suppressed because it is too large. Load diff
Appli/TouchGFX/generated/images/src/__generated/image_icon_theme_images_hardware_headset_50_50_FFFFFF.svg.cpp
+842 -842
View File
File diff suppressed because it is too large. Load diff
Appli/TouchGFX/generated/images/src/image_fondHorlogerie1.cpp
+64408 -64408
View File
File diff suppressed because it is too large. Load diff
Appli/TouchGFX/target/STM32TouchController.cpp
+4
View File
@@ -29,6 +29,7 @@
volatile bool doSampleTouch = false;
extern "C" I2C_HandleTypeDef hi2c1;
extern "C" void ST67_ExtiCallback(uint16_t gpio_pin); /* Core/Src/st67_glue.c */
using namespace touchgfx;
extern "C"
@@ -52,6 +53,9 @@ extern "C"
doSampleTouch = true;
return;
}
/* SPI_RDY du module Wi-Fi/BLE ST67W611M1 : une seule fonction HAL_GPIO_EXTI_Callback possible */
ST67_ExtiCallback(GPIO_Pin);
}
}