diff --git a/README.md b/README.md index de1c533..0f63819 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# SekiPOS v1.6 🍫🥤 +# SekiPOS v2.0 🍫🥤 A reactive POS inventory system for software engineers with a snack addiction. Features real-time UI updates, automatic product discovery via Open Food Facts, and local image caching. diff --git a/SekiScaleESP/.gitignore b/ScaleHardware/IOT_Scale/.gitignore similarity index 100% rename from SekiScaleESP/.gitignore rename to ScaleHardware/IOT_Scale/.gitignore diff --git a/SekiScaleESP/.vscode/extensions.json b/ScaleHardware/IOT_Scale/.vscode/extensions.json similarity index 100% rename from SekiScaleESP/.vscode/extensions.json rename to ScaleHardware/IOT_Scale/.vscode/extensions.json diff --git a/SekiScaleESP/include/README b/ScaleHardware/IOT_Scale/include/README similarity index 100% rename from SekiScaleESP/include/README rename to ScaleHardware/IOT_Scale/include/README diff --git a/SekiScaleESP/lib/README b/ScaleHardware/IOT_Scale/lib/README similarity index 100% rename from SekiScaleESP/lib/README rename to ScaleHardware/IOT_Scale/lib/README diff --git a/ScaleHardware/IOT_Scale/platformio.ini b/ScaleHardware/IOT_Scale/platformio.ini new file mode 100644 index 0000000..2bc502e --- /dev/null +++ b/ScaleHardware/IOT_Scale/platformio.ini @@ -0,0 +1,16 @@ +; PlatformIO Project Configuration File +; +; Build options: build flags, source filter +; Upload options: custom upload port, speed and extra flags +; Library options: dependencies, extra library storages +; Advanced options: extra scripting +; +; Please visit documentation for the other options and examples +; https://docs.platformio.org/page/projectconf.html + +[env:waveshare_rp2040_zero] +platform = https://github.com/maxgerhardt/platform-raspberrypi.git +board = waveshare_rp2040_zero +framework = arduino +monitor_speed = 115200 +lib_archive = no \ No newline at end of file diff --git a/ScaleHardware/IOT_Scale/src/main.cpp b/ScaleHardware/IOT_Scale/src/main.cpp new file mode 100644 index 0000000..0a31654 --- /dev/null +++ b/ScaleHardware/IOT_Scale/src/main.cpp @@ -0,0 +1,89 @@ +#include + +const int SCLK_PIN = 18; +const int DOUT_PIN = 19; +const int TARE_BUTTON_PIN = 4; + +long offset = 0; +float scaleFactor = 1.0; // Update this after your calibration test + +void setup() { + Serial.begin(115200); + + pinMode(SCLK_PIN, OUTPUT); + pinMode(DOUT_PIN, INPUT); + pinMode(TARE_BUTTON_PIN, INPUT_PULLUP); + + digitalWrite(SCLK_PIN, LOW); + + Serial.println("Initializing SD10819 ADC..."); + delay(500); // Wait for chip stabilization + calibrateZero(); +} + +long readADC() { + // 1. Wait for DRDY to go LOW + // Timeout added to prevent infinite loop if ADC is disconnected + unsigned long startWait = millis(); + while (digitalRead(DOUT_PIN) == HIGH) { + if (millis() - startWait > 500) return 0; + } + + long value = 0; + + // 2. Read 24 bits of data + for (int i = 0; i < 24; i++) { + digitalWrite(SCLK_PIN, HIGH); + delayMicroseconds(1); // pulse width t3 > 100ns + value = (value << 1) | digitalRead(DOUT_PIN); + digitalWrite(SCLK_PIN, LOW); + delayMicroseconds(1); + } + + // 3. Configuration Pulses: 27 pulses = Channel A, 128x Gain + for (int i = 0; i < 3; i++) { + digitalWrite(SCLK_PIN, HIGH); + delayMicroseconds(1); + digitalWrite(SCLK_PIN, LOW); + delayMicroseconds(1); + } + + // Handle 24-bit two's complement + if (value & 0x800000) { + value |= 0xFF000000; + } + return value; +} + +void calibrateZero() { + Serial.println("Taring... stay still."); + long sum = 0; + for(int i = 0; i < 20; i++) { + sum += readADC(); + delay(10); + } + offset = sum / 20; + Serial.print("New Offset: "); + Serial.println(offset); +} + +void loop() { + // Check Tare Button + if (digitalRead(TARE_BUTTON_PIN) == LOW) { + calibrateZero(); + while(digitalRead(TARE_BUTTON_PIN) == LOW); // Wait for release + } + + // Read and Filter + long raw = readADC(); + float weight = (float)(raw - offset) * scaleFactor; + + // Serial Output for Debugging / Plotting + Serial.print("Raw:"); + Serial.print(raw); + Serial.print("\tWeight:"); + Serial.print(weight, 2); + Serial.println("g"); + + delay(100); // 10Hz sampling rate +} \ No newline at end of file diff --git a/SekiScaleESP/test/README b/ScaleHardware/IOT_Scale/test/README similarity index 100% rename from SekiScaleESP/test/README rename to ScaleHardware/IOT_Scale/test/README diff --git a/ScaleHardware/display_driver/.gitignore b/ScaleHardware/display_driver/.gitignore new file mode 100644 index 0000000..89cc49c --- /dev/null +++ b/ScaleHardware/display_driver/.gitignore @@ -0,0 +1,5 @@ +.pio +.vscode/.browse.c_cpp.db* +.vscode/c_cpp_properties.json +.vscode/launch.json +.vscode/ipch diff --git a/ScaleHardware/display_driver/.vscode/extensions.json b/ScaleHardware/display_driver/.vscode/extensions.json new file mode 100644 index 0000000..080e70d --- /dev/null +++ b/ScaleHardware/display_driver/.vscode/extensions.json @@ -0,0 +1,10 @@ +{ + // See http://go.microsoft.com/fwlink/?LinkId=827846 + // for the documentation about the extensions.json format + "recommendations": [ + "platformio.platformio-ide" + ], + "unwantedRecommendations": [ + "ms-vscode.cpptools-extension-pack" + ] +} diff --git a/ScaleHardware/display_driver/include/README b/ScaleHardware/display_driver/include/README new file mode 100644 index 0000000..49819c0 --- /dev/null +++ b/ScaleHardware/display_driver/include/README @@ -0,0 +1,37 @@ + +This directory is intended for project header files. + +A header file is a file containing C declarations and macro definitions +to be shared between several project source files. You request the use of a +header file in your project source file (C, C++, etc) located in `src` folder +by including it, with the C preprocessing directive `#include'. + +```src/main.c + +#include "header.h" + +int main (void) +{ + ... +} +``` + +Including a header file produces the same results as copying the header file +into each source file that needs it. Such copying would be time-consuming +and error-prone. With a header file, the related declarations appear +in only one place. If they need to be changed, they can be changed in one +place, and programs that include the header file will automatically use the +new version when next recompiled. The header file eliminates the labor of +finding and changing all the copies as well as the risk that a failure to +find one copy will result in inconsistencies within a program. + +In C, the convention is to give header files names that end with `.h'. + +Read more about using header files in official GCC documentation: + +* Include Syntax +* Include Operation +* Once-Only Headers +* Computed Includes + +https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html diff --git a/ScaleHardware/display_driver/lib/README b/ScaleHardware/display_driver/lib/README new file mode 100644 index 0000000..9379397 --- /dev/null +++ b/ScaleHardware/display_driver/lib/README @@ -0,0 +1,46 @@ + +This directory is intended for project specific (private) libraries. +PlatformIO will compile them to static libraries and link into the executable file. + +The source code of each library should be placed in a separate directory +("lib/your_library_name/[Code]"). + +For example, see the structure of the following example libraries `Foo` and `Bar`: + +|--lib +| | +| |--Bar +| | |--docs +| | |--examples +| | |--src +| | |- Bar.c +| | |- Bar.h +| | |- library.json (optional. for custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html +| | +| |--Foo +| | |- Foo.c +| | |- Foo.h +| | +| |- README --> THIS FILE +| +|- platformio.ini +|--src + |- main.c + +Example contents of `src/main.c` using Foo and Bar: +``` +#include +#include + +int main (void) +{ + ... +} + +``` + +The PlatformIO Library Dependency Finder will find automatically dependent +libraries by scanning project source files. + +More information about PlatformIO Library Dependency Finder +- https://docs.platformio.org/page/librarymanager/ldf.html diff --git a/SekiScaleESP/platformio.ini b/ScaleHardware/display_driver/platformio.ini similarity index 100% rename from SekiScaleESP/platformio.ini rename to ScaleHardware/display_driver/platformio.ini diff --git a/SekiScaleESP/src/TM1621_Config.h b/ScaleHardware/display_driver/src/TM1621_Config.h similarity index 100% rename from SekiScaleESP/src/TM1621_Config.h rename to ScaleHardware/display_driver/src/TM1621_Config.h diff --git a/SekiScaleESP/src/main.cpp b/ScaleHardware/display_driver/src/main.cpp similarity index 100% rename from SekiScaleESP/src/main.cpp rename to ScaleHardware/display_driver/src/main.cpp diff --git a/ScaleHardware/display_driver/test/README b/ScaleHardware/display_driver/test/README new file mode 100644 index 0000000..9b1e87b --- /dev/null +++ b/ScaleHardware/display_driver/test/README @@ -0,0 +1,11 @@ + +This directory is intended for PlatformIO Test Runner and project tests. + +Unit Testing is a software testing method by which individual units of +source code, sets of one or more MCU program modules together with associated +control data, usage procedures, and operating procedures, are tested to +determine whether they are fit for use. Unit testing finds problems early +in the development cycle. + +More information about PlatformIO Unit Testing: +- https://docs.platformio.org/en/latest/advanced/unit-testing/index.html diff --git a/templates/checkout.html b/templates/checkout.html index 2c5d804..f09af38 100644 --- a/templates/checkout.html +++ b/templates/checkout.html @@ -397,6 +397,15 @@ handleProductScan(product); }); + socket.on('scale_update', function (data) { + const weightInput = document.getElementById('weight-input'); + const weightModal = document.getElementById('weightModal'); + + if (weightModal.classList.contains('show')) { + weightInput.value = data.grams; + } + }); + function goToInventory() { if (missingProductData) { window.location.href = `/?barcode=${missingProductData.barcode}`; diff --git a/templates/inventory.html b/templates/inventory.html index 0a0f708..fd7f8f2 100644 --- a/templates/inventory.html +++ b/templates/inventory.html @@ -287,6 +287,13 @@ permanentemente', 'executeBulkDelete()') %} } }); + socket.on('scale_update', function (data) { + const unitType = document.getElementById('form-unit-type').value; + if (unitType === 'kg') { + document.getElementById('form-stock').value = data.kilograms; + } + }); + // Replace your existing updateForm function with this one function updateForm(b, n, p, i, t, stock, unit) { dismissPrompt();