Compare commits
8 Commits
Author | SHA1 | Date | |
---|---|---|---|
5c5846c52c | |||
517fa37a3d | |||
aaa7a6ee9c | |||
a0b8639488 | |||
a16c05287e | |||
ecb35a97bd | |||
ba968611ec | |||
6bd11ddce3 |
13
CHANGELOG.md
13
CHANGELOG.md
@ -1,5 +1,18 @@
|
||||
# Changelog
|
||||
|
||||
## [1.3.92] - 2025-02-24
|
||||
### Changed
|
||||
- update webpages for version v1.3.92
|
||||
- remove commented-out code in setBambuSpool function
|
||||
- update installation instructions and formatting in README files
|
||||
|
||||
### Fixed
|
||||
- configure CPU frequency settings in setup function only for testing
|
||||
- update comment to clarify NVS reading process
|
||||
- adjust weight display logic to handle cases for weight less than 2
|
||||
- update weight display logic to handle negative and specific weight cases
|
||||
|
||||
|
||||
## [1.3.91] - 2025-02-23
|
||||
### Added
|
||||
- update GitHub Actions workflow for FTP firmware upload with improved credential checks
|
||||
|
13
README.de.md
13
README.de.md
@ -105,21 +105,20 @@ Ich nutze die HSPI default PINs + IRQ und RESET am PN532
|
||||
- PN532 NFC Modul
|
||||
- Verbindungskabel
|
||||
|
||||
### Schritt-für-Schritt Installation
|
||||
## Einfache Installation
|
||||
1. **Gehe auf https://www.filaman.app/installer.html
|
||||
## Schritt-für-Schritt Installation
|
||||
### Einfache Installation
|
||||
1. **Gehe auf [FilaMan Installer](https://www.filaman.app/installer.html)**
|
||||
|
||||
2. **Stecke dein ESP an den Rechner und klicke Connect
|
||||
2. **Stecke dein ESP an den Rechner und klicke Connect**
|
||||
|
||||
3. **Wähle dein Device Port und klicke Intall
|
||||
3. **Wähle dein Device Port und klicke Intall**
|
||||
|
||||
4. **Ersteinrichtung:**
|
||||
- Mit dem "FilaMan" WLAN-Zugangspunkt verbinden.
|
||||
- WLAN-Einstellungen über das Konfigurationsportal vornehmen.
|
||||
- Weboberfläche unter `http://filaman.local` oder der IP-Adresse aufrufen.
|
||||
|
||||
## Compile by yourself
|
||||
|
||||
### Compile by yourself
|
||||
1. **Repository klonen:**
|
||||
```bash
|
||||
git clone https://github.com/ManuelW77/Filaman.git
|
||||
|
16
README.md
16
README.md
@ -95,9 +95,9 @@ I use the HSPI default PINs + IRQ and RESET at the PN532
|
||||
- `Adafruit_SSD1306`: OLED display control
|
||||
- `HX711`: Load cell communication
|
||||
|
||||
## Installation
|
||||
### Installation
|
||||
|
||||
### Prerequisites
|
||||
## Prerequisites
|
||||
- **Software:**
|
||||
- [PlatformIO](https://platformio.org/) in VS Code
|
||||
- [Spoolman](https://github.com/Donkie/Spoolman) instance
|
||||
@ -109,20 +109,20 @@ I use the HSPI default PINs + IRQ and RESET at the PN532
|
||||
- PN532 NFC Module
|
||||
- Connecting wires
|
||||
|
||||
### Step-by-Step Installation
|
||||
## Easy Installation
|
||||
1. **Go to https://www.filaman.app/installer.html
|
||||
## Step-by-Step Installation
|
||||
### Easy Installation
|
||||
1. **Go to [FilaMan Installer](https://www.filaman.app/installer.html)**
|
||||
|
||||
2. **Plug you device in and push Connect button
|
||||
2. **Plug you device in and push Connect button**
|
||||
|
||||
3. **Select your Device Port and push Intall
|
||||
3. **Select your Device Port and push Intall**
|
||||
|
||||
4. **Initial Setup:**
|
||||
- Connect to the "FilaMan" WiFi access point.
|
||||
- Configure WiFi settings through the captive portal.
|
||||
- Access the web interface at `http://filaman.local` or the IP address.
|
||||
|
||||
## Compile by yourself
|
||||
### Compile by yourself
|
||||
1. **Clone the Repository:**
|
||||
```bash
|
||||
git clone https://github.com/ManuelW77/Filaman.git
|
||||
|
@ -9,7 +9,7 @@
|
||||
; https://docs.platformio.org/page/projectconf.html
|
||||
|
||||
[common]
|
||||
version = "1.3.91"
|
||||
version = "1.3.92"
|
||||
##
|
||||
[env:esp32dev]
|
||||
platform = espressif32
|
||||
|
@ -218,37 +218,6 @@ bool setBambuSpool(String payload) {
|
||||
doc.clear();
|
||||
yield();
|
||||
}
|
||||
/*
|
||||
if (setting_id != "") {
|
||||
yield();
|
||||
doc["print"]["sequence_id"] = 0;
|
||||
doc["print"]["command"] = "ams_filament_setting";
|
||||
doc["print"]["nozzle_temp_min"] = minTemp;
|
||||
doc["print"]["nozzle_temp_max"] = maxTemp;
|
||||
doc["print"]["setting_id"] = setting_id;
|
||||
doc["print"]["tray_color"] = color.length() == 8 ? color : color+"FF";
|
||||
doc["print"]["ams_id"] = amsId < 200 ? amsId : 255;
|
||||
doc["print"]["tray_id"] = trayId < 200 ? trayId : 254;
|
||||
doc["print"]["tray_info_idx"] = tray_info_idx;
|
||||
doc["print"]["tray_type"] = type;
|
||||
|
||||
// Serialize the JSON
|
||||
String output;
|
||||
serializeJson(doc, output);
|
||||
|
||||
if (sendMqttMessage(output)) {
|
||||
Serial.println("Filament Setting successfully set");
|
||||
}
|
||||
else
|
||||
{
|
||||
Serial.println("Failed to set Filament setting");
|
||||
return false;
|
||||
}
|
||||
|
||||
doc.clear();
|
||||
yield();
|
||||
}
|
||||
*/
|
||||
|
||||
return true;
|
||||
}
|
||||
|
@ -15,10 +15,17 @@
|
||||
#include "esp_task_wdt.h"
|
||||
#include "commonFS.h"
|
||||
|
||||
#include "soc/rtc.h"
|
||||
|
||||
// ##### SETUP #####
|
||||
void setup() {
|
||||
Serial.begin(115200);
|
||||
|
||||
rtc_cpu_freq_config_t config;
|
||||
rtc_clk_cpu_freq_get_config(&config);
|
||||
rtc_clk_cpu_freq_to_config(RTC_CPU_FREQ_80M, &config);
|
||||
rtc_clk_cpu_freq_set_config_fast(&config);
|
||||
|
||||
uint64_t chipid;
|
||||
|
||||
chipid = ESP.getEfuseMac(); //The chip ID is essentially its MAC address(length: 6 bytes).
|
||||
@ -122,7 +129,7 @@ void loop() {
|
||||
// Ausgabe der Waage auf Display
|
||||
if (pauseMainTask == 0 && weight != lastWeight && hasReadRfidTag == 0)
|
||||
{
|
||||
(weight < 0) ? oledShowMessage("!! -1") : oledShowWeight(weight);
|
||||
(weight < 2) ? oledShowMessage("0") : oledShowWeight(weight);
|
||||
}
|
||||
|
||||
|
||||
|
@ -55,7 +55,7 @@ uint8_t start_scale() {
|
||||
Serial.println("Prüfe Calibration Value");
|
||||
long calibrationValue;
|
||||
|
||||
// NVS
|
||||
// NVS lesen
|
||||
preferences.begin(NVS_NAMESPACE, true); // true = readonly
|
||||
calibrationValue = preferences.getLong(NVS_KEY_CALIBRATION, defaultScaleCalibrationValue);
|
||||
preferences.end();
|
||||
|
Reference in New Issue
Block a user