3 Commits
Author SHA1 Message Date
Admin-sn 1b19657e8c Ajout Polyswitch et Hall 2026-11-03 09:05:03 +01:00
Admin-sn 39c8099ab6 Merge branch 'main' of https://gitea.easylinux.fr/FinistRC/Brest_2027 2026-11-03 08:53:41 +01:00
Admin-sn 1e6e8bff19 Ajout ESP32 2026-11-03 08:52:12 +01:00
14 changed files with 123794 additions and 109 deletions

No files matched your search

File diff suppressed because it is too large. Load diff
+132
View File
@@ -0,0 +1,132 @@
{
"board": {
"active_layer": 0,
"active_layer_preset": "",
"auto_track_width": true,
"hidden_netclasses": [],
"hidden_nets": [],
"high_contrast_mode": 0,
"net_color_mode": 1,
"opacity": {
"images": 0.6,
"pads": 1.0,
"shapes": 1.0,
"tracks": 1.0,
"vias": 1.0,
"zones": 0.6
},
"selection_filter": {
"dimensions": true,
"footprints": true,
"graphics": true,
"keepouts": true,
"lockedItems": false,
"otherItems": true,
"pads": true,
"text": true,
"tracks": true,
"vias": true,
"zones": true
},
"visible_items": [
"vias",
"footprint_text",
"footprint_anchors",
"ratsnest",
"grid",
"footprints_front",
"footprints_back",
"footprint_values",
"footprint_references",
"tracks",
"drc_errors",
"drawing_sheet",
"bitmaps",
"pads",
"zones",
"drc_warnings",
"drc_exclusions",
"locked_item_shadows",
"conflict_shadows",
"shapes"
],
"visible_layers": "ffffffff_ffffffff_ffffffff_ffffffff",
"zone_display_mode": 0
},
"git": {
"integration_disabled": false,
"repo_type": "",
"repo_username": "",
"ssh_key": ""
},
"meta": {
"filename": "FinistRC.kicad_prl",
"version": 5
},
"net_inspector_panel": {
"col_hidden": [
false,
false,
false,
false,
false,
false,
false,
false,
false,
false
],
"col_order": [
0,
1,
2,
3,
4,
5,
6,
7,
8,
9
],
"col_widths": [
0,
0,
0,
0,
0,
0,
0,
0,
0,
0
],
"custom_group_rules": [],
"expanded_rows": [],
"filter_by_net_name": true,
"filter_by_netclass": true,
"filter_text": "",
"group_by_constraint": false,
"group_by_netclass": false,
"show_unconnected_nets": false,
"show_zero_pad_nets": false,
"sort_ascending": true,
"sorting_column": 0
},
"open_jobsets": [],
"project": {
"files": []
},
"schematic": {
"selection_filter": {
"graphics": true,
"images": true,
"labels": true,
"lockedItems": false,
"otherItems": true,
"pins": true,
"symbols": true,
"text": true,
"wires": true
}
}
}
+634
View File
@@ -0,0 +1,634 @@
{
"board": {
"3dviewports": [],
"design_settings": {
"defaults": {
"apply_defaults_to_fp_fields": false,
"apply_defaults_to_fp_shapes": false,
"apply_defaults_to_fp_text": false,
"board_outline_line_width": 0.05,
"copper_line_width": 0.2,
"copper_text_italic": false,
"copper_text_size_h": 1.5,
"copper_text_size_v": 1.5,
"copper_text_thickness": 0.3,
"copper_text_upright": false,
"courtyard_line_width": 0.05,
"dimension_precision": 4,
"dimension_units": 3,
"dimensions": {
"arrow_length": 1270000,
"extension_offset": 500000,
"keep_text_aligned": true,
"suppress_zeroes": true,
"text_position": 0,
"units_format": 0
},
"fab_line_width": 0.1,
"fab_text_italic": false,
"fab_text_size_h": 1.0,
"fab_text_size_v": 1.0,
"fab_text_thickness": 0.15,
"fab_text_upright": false,
"other_line_width": 0.1,
"other_text_italic": false,
"other_text_size_h": 1.0,
"other_text_size_v": 1.0,
"other_text_thickness": 0.15,
"other_text_upright": false,
"pads": {
"drill": 0.8,
"height": 1.27,
"width": 2.54
},
"silk_line_width": 0.1,
"silk_text_italic": false,
"silk_text_size_h": 1.0,
"silk_text_size_v": 1.0,
"silk_text_thickness": 0.1,
"silk_text_upright": false,
"zones": {
"min_clearance": 0.5
}
},
"diff_pair_dimensions": [
{
"gap": 0.0,
"via_gap": 0.0,
"width": 0.0
}
],
"drc_exclusions": [],
"meta": {
"version": 2
},
"rule_severities": {
"annular_width": "error",
"clearance": "error",
"connection_width": "warning",
"copper_edge_clearance": "error",
"copper_sliver": "warning",
"courtyards_overlap": "error",
"creepage": "error",
"diff_pair_gap_out_of_range": "error",
"diff_pair_uncoupled_length_too_long": "error",
"drill_out_of_range": "error",
"duplicate_footprints": "warning",
"extra_footprint": "warning",
"footprint": "error",
"footprint_filters_mismatch": "ignore",
"footprint_symbol_mismatch": "warning",
"footprint_type_mismatch": "ignore",
"hole_clearance": "error",
"hole_to_hole": "warning",
"holes_co_located": "warning",
"invalid_outline": "error",
"isolated_copper": "warning",
"item_on_disabled_layer": "error",
"items_not_allowed": "error",
"length_out_of_range": "error",
"lib_footprint_issues": "warning",
"lib_footprint_mismatch": "warning",
"malformed_courtyard": "error",
"microvia_drill_out_of_range": "error",
"mirrored_text_on_front_layer": "warning",
"missing_courtyard": "ignore",
"missing_footprint": "warning",
"net_conflict": "warning",
"nonmirrored_text_on_back_layer": "warning",
"npth_inside_courtyard": "ignore",
"padstack": "warning",
"pth_inside_courtyard": "ignore",
"shorting_items": "error",
"silk_edge_clearance": "warning",
"silk_over_copper": "warning",
"silk_overlap": "warning",
"skew_out_of_range": "error",
"solder_mask_bridge": "error",
"starved_thermal": "error",
"text_height": "warning",
"text_on_edge_cuts": "error",
"text_thickness": "warning",
"through_hole_pad_without_hole": "error",
"too_many_vias": "error",
"track_angle": "error",
"track_dangling": "warning",
"track_segment_length": "error",
"track_width": "error",
"tracks_crossing": "error",
"unconnected_items": "error",
"unresolved_variable": "error",
"via_dangling": "warning",
"zones_intersect": "error"
},
"rules": {
"max_error": 0.005,
"min_clearance": 0.0,
"min_connection": 0.0,
"min_copper_edge_clearance": 0.5,
"min_groove_width": 0.0,
"min_hole_clearance": 0.25,
"min_hole_to_hole": 0.25,
"min_microvia_diameter": 0.2,
"min_microvia_drill": 0.1,
"min_resolved_spokes": 2,
"min_silk_clearance": 0.0,
"min_text_height": 0.8,
"min_text_thickness": 0.08,
"min_through_hole_diameter": 0.3,
"min_track_width": 0.0,
"min_via_annular_width": 0.1,
"min_via_diameter": 0.5,
"solder_mask_to_copper_clearance": 0.005,
"use_height_for_length_calcs": true
},
"teardrop_options": [
{
"td_onpthpad": true,
"td_onroundshapesonly": false,
"td_onsmdpad": true,
"td_ontrackend": false,
"td_onvia": true
}
],
"teardrop_parameters": [
{
"td_allow_use_two_tracks": true,
"td_curve_segcount": 0,
"td_height_ratio": 1.0,
"td_length_ratio": 0.5,
"td_maxheight": 2.0,
"td_maxlen": 1.0,
"td_on_pad_in_zone": false,
"td_target_name": "td_round_shape",
"td_width_to_size_filter_ratio": 0.9
},
{
"td_allow_use_two_tracks": true,
"td_curve_segcount": 0,
"td_height_ratio": 1.0,
"td_length_ratio": 0.5,
"td_maxheight": 2.0,
"td_maxlen": 1.0,
"td_on_pad_in_zone": false,
"td_target_name": "td_rect_shape",
"td_width_to_size_filter_ratio": 0.9
},
{
"td_allow_use_two_tracks": true,
"td_curve_segcount": 0,
"td_height_ratio": 1.0,
"td_length_ratio": 0.5,
"td_maxheight": 2.0,
"td_maxlen": 1.0,
"td_on_pad_in_zone": false,
"td_target_name": "td_track_end",
"td_width_to_size_filter_ratio": 0.9
}
],
"track_widths": [
0.0,
0.4,
0.7
],
"tuning_pattern_settings": {
"diff_pair_defaults": {
"corner_radius_percentage": 80,
"corner_style": 1,
"max_amplitude": 1.0,
"min_amplitude": 0.2,
"single_sided": false,
"spacing": 1.0
},
"diff_pair_skew_defaults": {
"corner_radius_percentage": 80,
"corner_style": 1,
"max_amplitude": 1.0,
"min_amplitude": 0.2,
"single_sided": false,
"spacing": 0.6
},
"single_track_defaults": {
"corner_radius_percentage": 80,
"corner_style": 1,
"max_amplitude": 1.0,
"min_amplitude": 0.2,
"single_sided": false,
"spacing": 0.6
}
},
"via_dimensions": [
{
"diameter": 0.0,
"drill": 0.0
}
],
"zones_allow_external_fillets": false
},
"ipc2581": {
"dist": "",
"distpn": "",
"internal_id": "",
"mfg": "",
"mpn": ""
},
"layer_pairs": [],
"layer_presets": [],
"viewports": []
},
"boards": [],
"cvpcb": {
"equivalence_files": []
},
"erc": {
"erc_exclusions": [],
"meta": {
"version": 0
},
"pin_map": [
[
0,
0,
0,
0,
0,
0,
1,
0,
0,
0,
0,
2
],
[
0,
2,
0,
1,
0,
0,
1,
0,
2,
2,
2,
2
],
[
0,
0,
0,
0,
0,
0,
1,
0,
1,
0,
1,
2
],
[
0,
1,
0,
0,
0,
0,
1,
1,
2,
1,
1,
2
],
[
0,
0,
0,
0,
0,
0,
1,
0,
0,
0,
0,
2
],
[
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
2
],
[
1,
1,
1,
1,
1,
0,
1,
1,
1,
1,
1,
2
],
[
0,
0,
0,
1,
0,
0,
1,
0,
0,
0,
0,
2
],
[
0,
2,
1,
2,
0,
0,
1,
0,
2,
2,
2,
2
],
[
0,
2,
0,
1,
0,
0,
1,
0,
2,
0,
0,
2
],
[
0,
2,
1,
1,
0,
0,
1,
0,
2,
0,
0,
2
],
[
2,
2,
2,
2,
2,
2,
2,
2,
2,
2,
2,
2
]
],
"rule_severities": {
"bus_definition_conflict": "error",
"bus_entry_needed": "error",
"bus_to_bus_conflict": "error",
"bus_to_net_conflict": "error",
"different_unit_footprint": "error",
"different_unit_net": "error",
"duplicate_reference": "error",
"duplicate_sheet_names": "error",
"endpoint_off_grid": "warning",
"extra_units": "error",
"footprint_filter": "ignore",
"footprint_link_issues": "warning",
"four_way_junction": "ignore",
"global_label_dangling": "warning",
"hier_label_mismatch": "error",
"label_dangling": "error",
"label_multiple_wires": "warning",
"lib_symbol_issues": "warning",
"lib_symbol_mismatch": "warning",
"missing_bidi_pin": "warning",
"missing_input_pin": "warning",
"missing_power_pin": "error",
"missing_unit": "warning",
"multiple_net_names": "warning",
"net_not_bus_member": "warning",
"no_connect_connected": "warning",
"no_connect_dangling": "warning",
"pin_not_connected": "error",
"pin_not_driven": "error",
"pin_to_pin": "warning",
"power_pin_not_driven": "error",
"same_local_global_label": "warning",
"similar_label_and_power": "warning",
"similar_labels": "warning",
"similar_power": "warning",
"simulation_model_issue": "ignore",
"single_global_label": "ignore",
"unannotated": "error",
"unconnected_wire_endpoint": "warning",
"undefined_netclass": "error",
"unit_value_mismatch": "error",
"unresolved_variable": "error",
"wire_dangling": "error"
}
},
"libraries": {
"pinned_footprint_libs": [],
"pinned_symbol_libs": []
},
"meta": {
"filename": "FinistRC.kicad_pro",
"version": 3
},
"net_settings": {
"classes": [
{
"bus_width": 12,
"clearance": 0.2,
"diff_pair_gap": 0.25,
"diff_pair_via_gap": 0.25,
"diff_pair_width": 0.2,
"line_style": 0,
"microvia_diameter": 0.3,
"microvia_drill": 0.1,
"name": "Default",
"pcb_color": "rgba(0, 0, 0, 0.000)",
"priority": 2147483647,
"schematic_color": "rgba(0, 0, 0, 0.000)",
"track_width": 0.2,
"via_diameter": 0.6,
"via_drill": 0.3,
"wire_width": 6
}
],
"meta": {
"version": 4
},
"net_colors": null,
"netclass_assignments": null,
"netclass_patterns": []
},
"pcbnew": {
"last_paths": {
"gencad": "",
"idf": "",
"netlist": "",
"plot": "",
"pos_files": "",
"specctra_dsn": "",
"step": "",
"svg": "",
"vrml": ""
},
"page_layout_descr_file": ""
},
"schematic": {
"annotate_start_num": 0,
"bom_export_filename": "${PROJECTNAME}.csv",
"bom_fmt_presets": [],
"bom_fmt_settings": {
"field_delimiter": ",",
"keep_line_breaks": false,
"keep_tabs": false,
"name": "CSV",
"ref_delimiter": ",",
"ref_range_delimiter": "",
"string_delimiter": "\""
},
"bom_presets": [],
"bom_settings": {
"exclude_dnp": false,
"fields_ordered": [
{
"group_by": false,
"label": "Reference",
"name": "Reference",
"show": true
},
{
"group_by": false,
"label": "Qty",
"name": "${QUANTITY}",
"show": true
},
{
"group_by": true,
"label": "Value",
"name": "Value",
"show": true
},
{
"group_by": true,
"label": "DNP",
"name": "${DNP}",
"show": true
},
{
"group_by": true,
"label": "Exclude from BOM",
"name": "${EXCLUDE_FROM_BOM}",
"show": true
},
{
"group_by": true,
"label": "Exclude from Board",
"name": "${EXCLUDE_FROM_BOARD}",
"show": true
},
{
"group_by": true,
"label": "Footprint",
"name": "Footprint",
"show": true
},
{
"group_by": false,
"label": "Datasheet",
"name": "Datasheet",
"show": true
}
],
"filter_string": "",
"group_symbols": true,
"include_excluded_from_bom": true,
"name": "Default Editing",
"sort_asc": true,
"sort_field": "Référence"
},
"connection_grid_size": 50.0,
"drawing": {
"dashed_lines_dash_length_ratio": 12.0,
"dashed_lines_gap_length_ratio": 3.0,
"default_line_thickness": 6.0,
"default_text_size": 50.0,
"field_names": [],
"intersheets_ref_own_page": false,
"intersheets_ref_prefix": "",
"intersheets_ref_short": false,
"intersheets_ref_show": false,
"intersheets_ref_suffix": "",
"junction_size_choice": 3,
"label_size_ratio": 0.375,
"operating_point_overlay_i_precision": 3,
"operating_point_overlay_i_range": "~A",
"operating_point_overlay_v_precision": 3,
"operating_point_overlay_v_range": "~V",
"overbar_offset_ratio": 1.23,
"pin_symbol_size": 25.0,
"text_offset_ratio": 0.15
},
"legacy_lib_dir": "",
"legacy_lib_list": [],
"meta": {
"version": 1
},
"net_format_name": "",
"page_layout_descr_file": "",
"plot_directory": "",
"space_save_all_events": true,
"spice_current_sheet_as_root": false,
"spice_external_command": "spice \"%I\"",
"spice_model_current_sheet_as_root": true,
"spice_save_all_currents": false,
"spice_save_all_dissipations": false,
"spice_save_all_voltages": false,
"subpart_first_id": 65,
"subpart_id_separator": 0
},
"sheets": [
[
"ec234cc5-9cd3-451f-aa8e-cf12edcc7448",
"Root"
]
],
"text_variables": {}
}
File diff suppressed because it is too large. Load diff
@@ -0,0 +1 @@
{"ARCHIVE_NAME": "", "EXTRA_LAYERS": "", "ALL_ACTIVE_LAYERS": false, "EXTEND_EDGE_CUT": false, "ALTERNATIVE_EDGE_CUT": false, "AUTO TRANSLATE": true, "AUTO FILL": true, "EXCLUDE DNP": false, "OPEN BROWSER": true, "BACKUP_OPT": true}
File diff suppressed because it is too large. Load diff
+35 -25
View File
@@ -1,6 +1,6 @@
# Journées maritimes de Brest 2027
Projet de bateaux télécommandés pour le bassin des Journées maritimes. Le matériel repose sur des ESP8266 et deux modes réseau :
Projet de bateaux télécommandés pour le bassin des Journées maritimes. Le matériel repose sur des ESP8266/ESP32 et deux modes réseau :
- **MQTT** : un point d'accès OpenWRT fournit le Wi-Fi et le broker MQTT. Un système de supervision Banana Pi suit les périphériques et les batteries.
- **AP autonome** : le bateau crée son propre réseau Wi-Fi et fonctionne sans broker ni supervision.
@@ -59,18 +59,36 @@ Le firmware initial est volontairement passif : il initialise les entrées/sorti
# Hardware
Le but est de réaliser une platine unique reprenant tous les composants :
## ESP8266
Le but est de réaliser une platine unique reprenant tous les composants, cette platine est destinée aux petits modèles en remplacement des modules MTM (Make Them Move).
Il est alimenté en 2S
| Composant | Fonction |
| --------------- | ------------------------- |
| ESP12F | Micro-Controleur |
| APK2112-3.3 | Régulateur 3.3V |
| MX1508 | Double pont en H |
| ADS115 | Convertisseur ADC |
| WS2812 | Led status |
> **NB** Faut-il prévoir un circuit de charge
## ESP32
Platine unique reprenant tous les composants, platine pour les émetteurs, et aux bateaux FinistRC, alimentation 2S
| Composant | Fonction |
| --------------- | ------------------------- |
| ESP32WROOM | Micro-Controleur |
| APK2112-3.3 | Régulateur 3.3V |
| 1117-5v | Régulateur 5V |
| MX1508 | Double pont en H |
| Hall | Capteurs a Effet Hall (2) |
| WS2812 | Led status |
| TP4056 (1S) | Chargeur Li-ion 1S |
| Chargeur/BMS 2S | Chargeur Li-ion 2S |
> **TODO** :
> - Ajouter Polyswitch sur moteurs
> - Ajouter prises capteurs à effet Hall
### Variantes d'assemblage
@@ -80,29 +98,12 @@ indiquer `DNP` (composant non monté) pour chaque variante :
| Variante | Composants à monter | Composants à laisser DNP |
| ------------ | -------------------------------------------------- | ------------------------ |
| Bateau | ESP12F, MX1508, servo, WS2812 | ADS115 et capteurs Hall |
| Télécommande | ESP12F, ADS115 et capteurs Hall, WS2812 | MX1508 et servo |
| Accu 1S | TP4056, régulateur compatible 4,2 V | Chargeur/BMS 2S |
| Accu 2S | Chargeur/BMS 2S, régulateur 3,3 V compatible 8,4 V | TP4056 |
Les deux circuits de charge ne doivent jamais être montés ni raccordés en
parallèle. Prévoir un connecteur batterie commun, un connecteur de charge
adapté à la variante et des straps ou ponts de soudure clairement repérés si
la sélection ne se fait pas uniquement par la BOM.
| Bateau | ESP12F, MX1508, servo, WS2812 | nc |
| Télécommande | ESP32, capteurs Hall, WS2812 | MX1508 et servo |
### Alimentation
- Ne jamais alimenter les moteurs depuis le régulateur 3,3 V de l'ESP8266.
- Relier toutes les masses : batterie, MX1508, régulateur et ESP8266.
- Ajouter un condensateur de découplage près de l'ESP8266 et du MX1508 ; les moteurs peuvent provoquer des resets Wi-Fi.
- Vérifier au multimètre la tension réellement appliquée à l'ESP8266 avant insertion de la batterie.
- Le TP4056 est réservé à un accu Li-ion 1S (4,2 V maximum). Pour un accu 2S (8,4 V maximum), utiliser un chargeur et un BMS prévus pour 2S ; ne jamais brancher un TP4056 directement sur un pack 2S.
- Pour la version 2S, ne pas appliquer directement les 8,4 V au régulateur 3,3 V : vérifier sa tension d'entrée maximale et prévoir un convertisseur abaisseur si nécessaire.
- Le pont diviseur de mesure batterie doit ramener la tension maximale sous la limite de l'entrée A0 de la carte utilisée. Cette limite varie selon le module ESP8266 : vérifier sa fiche technique.
- Pour une batterie 2S, dimensionner le diviseur sur 8,4 V (batterie pleine), pas sur sa tension nominale.
### Broches ESP8266
## Broches ESP8266
Le choix proposé dans `include/pins.h` est :
@@ -123,6 +124,15 @@ Conseils importants :
- Si les capteurs Hall sont des capteurs numériques à seuil, les raccorder à des GPIO distincts et adapter `pins.h` et le filtrage logiciel.
- Le servo doit avoir une alimentation adaptée et une masse commune ; ne pas supposer que le 3,3 V de l'ESP8266 suffit à fournir son courant de pointe.
## Broches ESP32
**TODO** A mettre à jour
Le choix proposé dans `include/pins.h` est :
| Fonction | Broche NodeMCU | GPIO |
| --------------------------- | -------------- | --------------- |
### Sécurité de fonctionnement
- Prévoir un état d'arrêt au démarrage, à la perte Wi-Fi, à la perte MQTT et après expiration d'un watchdog de commande.
-9
View File
@@ -1,9 +0,0 @@
struct WifiConfig {
long magic;
char mqtt_server[40];
char mqtt_user[32];
char mqtt_passw[32];
char api_token[32];
char ssid[32];
char password[32];
};
+1 -2
View File
@@ -1,2 +1 @@
void setupMQTT(void);
void loopMQTT(void);
void setupMQTT(void);
+10 -4
View File
@@ -1,6 +1,12 @@
#include "main.h"
extern WifiConfig wifiConfig;
void WifiSetup(void);
struct WifiConfig {
long magic;
char mqtt_server[40];
char mqtt_user[32];
char mqtt_passw[32];
char api_token[32];
char ssid[32];
char password[32];
};
+17 -29
View File
@@ -1,7 +1,6 @@
#include <arduino.h>
#include <EEPROM.h>
#include "main.h"
#include "eeprom.h"
#include "wifi.h"
@@ -18,44 +17,33 @@
void ReadConfig() {
// Read configuration from EEPROM
EEPROM.begin(sizeof(WifiConfig));
// WifiConfig config;
EEPROM.get(0, wifiConfig);
WifiConfig config;
EEPROM.get(0, config);
// Check magic number
if (wifiConfig.magic != 0xDEADBEEF) {
if (config.magic != 0xDEADBEEF) {
Serial.println("EEPROM not initialized, initializing with default values...");
// Initialize with default values
wifiConfig.magic = 0xDEADBEEF;
strcpy(wifiConfig.mqtt_server, "undefined");
strcpy(wifiConfig.mqtt_user, "undefined");
strcpy(wifiConfig.mqtt_passw, "undefined");
strcpy(wifiConfig.api_token, "undefined");
strcpy(wifiConfig.ssid, "undefined");
strcpy(wifiConfig.password, "undefined");
EEPROM.put(0, wifiConfig);
config.magic = 0xDEADBEEF;
strcpy(config.mqtt_server, "undefined");
strcpy(config.mqtt_user, "undefined");
strcpy(config.mqtt_passw, "undefined");
strcpy(config.api_token, "undefined");
strcpy(config.ssid, "undefined");
strcpy(config.password, "undefined");
EEPROM.put(0, config);
EEPROM.commit();
}
// Populate global configuration variables
// Assuming you have global variables for these configurations
// e.g., globalMqttServer, globalMqttUser, etc.
// globalMqttServer = String(wifiConfig.mqtt_server);
// globalMqttUser = String(wifiConfig.mqtt_user);
// globalMqttPassw = String(wifiConfig.mqtt_passw);
// globalApiToken = String(wifiConfig.api_token);
// globalSsid = String(wifiConfig.ssid);
// globalPassword = String(wifiConfig.password);
// globalMqttServer = String(config.mqtt_server);
// globalMqttUser = String(config.mqtt_user);
// globalMqttPassw = String(config.mqtt_passw);
// globalApiToken = String(config.api_token);
// globalSsid = String(config.ssid);
// globalPassword = String(config.password);
Serial.println("Configuration loaded from EEPROM.");
}
/**
* saveConfig() - Save configuration to EEPROM
*
* save the current configuration structure to EEPROM.
*/
void SaveConfig() {
EEPROM.put(0, wifiConfig);
EEPROM.commit();
Serial.println("Configuration saved to EEPROM.");
}
+7 -12
View File
@@ -4,7 +4,6 @@
#include <WiFiUdp.h>
#include <ArduinoOTA.h>
#include "main.h"
#include "pins.h"
#include "wifi.h"
#include "mqtt.h"
@@ -32,7 +31,12 @@ void setup() {
Serial.println("Démarrage...");
delay(100);
// Configure hardware pins
// TODO: implement
// Read config from EEPROM
ReadConfig();
//
OtaSetup();
pinMode(Pins::batteryVoltage, INPUT);
#if defined(DEVICE_ROLE_BOAT)
@@ -45,15 +49,8 @@ void setup() {
pinMode(Pins::hallRudderSignal, INPUT);
#endif
// Read config from EEPROM
ReadConfig();
// Connect to Wi-Fi and setup MQTT
WifiSetup();
setupMQTT();
// Setup OTA
OtaSetup();
Serial.printf("Stid maritime: role=%s, mode=%s, chip=%06X\n",
deviceRole, networkMode, ESP.getChipId());
Serial.println("Firmware skeleton ready; motors remain stopped.");
@@ -64,8 +61,6 @@ void setup() {
}
void loop() {
OtaLoop();
loopMQTT();
// Keep the initial firmware passive until the command and failsafe layers exist.
delay(100);
delay(1000);
}
-8
View File
@@ -7,12 +7,4 @@ void setupMQTT(void) {
// Initialisation du client MQTT
mqttClient.setServer(mqtt_server, 1883);
mqttClient.setCallback(mqttCallback);
}
void loopMQTT(void) {
// Vérifier la connexion MQTT
if (!mqttClient.connected()) {
reconnectMQTT();
}
mqttClient.loop();
}
+4 -20
View File
@@ -10,27 +10,10 @@
* @date 2024-06-15
* @version 1.0
*/
#include <arduino.h>
#include <ESP8266WiFi.h>
#include <WiFiManager.h>
#include "main.h"
WifiConfig wifiConfig;
void WifiSetup()
{
WiFiManager wifiManager;
// Lire 2 derniers digits de la MAC pour créer un nom unique
uint8_t mac[6];
char ssid[32];
WiFi.macAddress(mac);
// Nom du module sur le réseau (Optionnel)
strcpy(ssid, "Finist-RC-");
sprintf(ssid + strlen(ssid), "%02X%02X", mac[4], mac[5]);
static WifiConfig wifiConfig;
// Définition du code HTML personnalisé pour la liste déroulante (<select>)
const char* custom_dropdown_html =
@@ -42,7 +25,6 @@ void WifiSetup()
"<option value='tmqtt'>Télécommande MQTT</option>"
"</select>";
wifiManager.setPageTitle("Bateau FinistRC - Configuration Wi-Fi et MQTT");
// Création du paramètre personnalisé
// Syntaxe : WiFiManagerParameter(id, placeholder/label, default_value, length, custom_html)
WiFiManagerParameter custom_device_mode("device_mode", "Mode", "bauto", 40, custom_dropdown_html);
@@ -53,6 +35,8 @@ void WifiSetup()
WiFiManagerParameter custom_mqtt_passw("mqtt", "Mot de passe MQTT", wifiConfig.mqtt_passw, 32);
WiFiManagerParameter custom_api_token("api", "Clé API", wifiConfig.api_token, 32);
WiFiManager wifiManager;
// Associer la fonction de rappel
wifiManager.setSaveConfigCallback(saveConfigCallback);
@@ -64,7 +48,7 @@ void WifiSetup()
wifiManager.addParameter(&custom_api_token);
// Lance le portail
if (!wifiManager.autoConnect(ssid,"FinistRC_2026")) {
if (!wifiManager.autoConnect("FinistRC_Config","Finist29PWD")) {
Serial.println("Échec de connexion ou timeout...");
delay(3000);
ESP.restart();