Merge pull request #55 from eamars/add_display_rotation

Add display rotation feature

src/access_point_mode.c

@@ -9,7 +9,7 @@
 #include "lwip/apps/httpd.h"
 
 #include "app.h"
-#include "rotary_button.h"
+#include "mini_12864_module.h"
 #include "u8g2.h"
 #include "pico/unique_id.h"
 #include "display.h"

src/and_scale_calibrate.c

@@ -6,7 +6,7 @@
 #include "scale.h"
 #include "app.h"
 #include "display.h"
-#include "rotary_button.h"
+#include "mini_12864_module.h"
 #include "common.h"
 
 

src/app.cpp

@@ -23,7 +23,7 @@
 #include "rest_endpoints.h"
 #include "wireless.h"
 #include "neopixel_led.h"
-#include "rotary_button.h"
+#include "mini_12864_module.h"
 #include "menu.h"
 #include "profile.h"
 #include "servo_gate.h"
@@ -38,11 +38,8 @@ int main()
     // Initialize Neopixel RGB on the mini 12864 board
     neopixel_led_init();
 
-    // Configure others
-    display_init();
-
-    // Initialise rotary button
-    button_init();
+    // Configure other functions from mini 12864 display
+    mini_12864_module_init();
 
     // Load config for motors
     motors_init();

src/button.c

@@ -2,7 +2,7 @@
 #include <FreeRTOS.h>
 #include <queue.h>
 
-#include "rotary_button.h"
+#include "mini_12864_module.h"
 
 
 extern QueueHandle_t encoder_event_queue;

src/charge_mode.cpp

@@ -11,7 +11,7 @@
 
 #include "app.h"
 #include "FloatRingBuffer.h"
-#include "rotary_button.h"
+#include "mini_12864_module.h"
 #include "display.h"
 #include "scale.h"
 #include "motors.h"

src/cleanup_mode.cpp

@@ -6,7 +6,7 @@
 #include <math.h>
 #include "app.h"
 #include "u8g2.h"
-#include "rotary_button.h"
+#include "mini_12864_module.h"
 #include "motors.h"
 #include "scale.h"
 #include "display.h"

src/display.h

@@ -10,8 +10,6 @@ extern "C" {
 
 u8g2_t *get_display_handler(void);
 
-void display_init(void);
-
 // REST
 bool http_get_display_buffer(struct fs_file *file, int num_params, char *params[], char *values[]);
 

src/eeprom.c

@@ -17,7 +17,7 @@
 #include "wireless.h"
 #include "app.h"
 #include "neopixel_led.h"
-#include "rotary_button.h"
+#include "mini_12864_module.h"
 #include "profile.h"
 #include "system_control.h"
 

src/eeprom.h

@@ -13,7 +13,7 @@
 #define EEPROM_CHARGE_MODE_BASE_ADDR            5 * 1024       // 5K
 #define EEPROM_APP_CONFIG_BASE_ADDR             6 * 1024       // 6k
 #define EEPROM_NEOPIXEL_LED_CONFIG_BASE_ADDR    7 * 1024       // 7k
-#define EEPROM_ROTARY_BUTTON_CONFIG_BASE_ADDR   8 * 1024       // 8k 
+#define EEPROM_MINI_12864_CONFIG_BASE_ADDR      8 * 1024       // 8k 
 #define EEPROM_PROFILE_DATA_BASE_ADDR           9 * 1024       // 9k
 #define EEPROM_SERVO_GATE_CONFIG_BASE_ADDR     10 * 1024       // 10k
 

src/html/web_portal.html

@@ -514,9 +514,9 @@
                         </form>
                     </section>
 
-                    <!-- Rotary Button Settings -->
-                    <section class="settings-page" id="settings-button" name="Button" style="display: none;">
-                        <form id="buttonConfigForm" action="/rest/button_config" class="grid grid-cols-1 gap-3">
+                    <!-- Mini 12864 Module Settings -->
+                    <section class="settings-page" id="settings-mini-12864-module" name="Mini 12864 Module" style="display: none;">
+                        <form id="mini12864ModuleConfigForm" action="/rest/mini_12864_config" class="grid grid-cols-1 gap-3">
                             <div class="grid grid-cols-1 gap-1">
                                 <span class="label-text">Inverted Rotary Button Direction</span>
                                 <select class="select select-bordered" name="b0">
@@ -525,6 +525,14 @@
                                 </select>
                             </div>
 
+                            <div class="grid grid-cols-1 gap-1">
+                                <span class="label-text">Display Rotation (deg)</span>
+                                <select class="select select-bordered" name="b1">
+                                    <option value="0">0</option>
+                                    <option value="2">180</option>
+                                </select>
+                            </div>
+
                             <button class="btn btn-neutral settings-apply-btn">Apply</button>
                         </form>
                     </section>
@@ -652,7 +660,7 @@
                     <li><a class="text-lg" onclick="onSettingsLinkClicked('settings-coarse-motor')">Coarse Motor</a></li>
                     <li><a class="text-lg" onclick="onSettingsLinkClicked('settings-fine-motor')">Fine Motor</a></li>
                     <li><a class="text-lg" onclick="onSettingsLinkClicked('settings-neopixel-led')">Neopixel LED</a></li>
-                    <li><a class="text-lg" onclick="onSettingsLinkClicked('settings-button')">Buttons</a></li>
+                    <li><a class="text-lg" onclick="onSettingsLinkClicked('settings-mini-12864-module')">Mini 12864 Module</a></li>
                     <li><a class="text-lg" onclick="onSettingsLinkClicked('settings-servo-gate')">Servo Gate</a></li>
                     <li><a class="text-lg" onclick="onSettingsLinkClicked('settings-system-control')">System Control</a></li>
                 </ul>

src/menu.cpp

@@ -8,10 +8,9 @@
 
 #include "app.h"
 #include "configuration.h"
-#include "rotary_button.h"
 #include "scale.h"
 #include "display.h"
-#include "rotary_button.h"
+#include "mini_12864_module.h"
 #include "eeprom.h"
 #include "charge_mode.h"
 #include "cleanup_mode.h"