Merge branch 'master' of https://github.com/eez-open/modular-psu-firm…

…ware

CMakeLists.txt

@@ -20,13 +20,13 @@ else()
     set(SDL2_BUILDING_LIBRARY 1)
     find_package(SDL2 REQUIRED)
     find_package(SDL2_image REQUIRED)
-    include_directories(${SDL2_INCLUDE_DIRS})
-    include_directories(${SDL2IMAGE_INCLUDE_DIR})
+    include_directories(SYSTEM ${SDL2_INCLUDE_DIRS})
+    include_directories(SYSTEM ${SDL2IMAGE_INCLUDE_DIR})
     add_definitions(-DOPTION_ETHERNET=1)
 endif()
 
 if (UNIX)
-    set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -fpermissive")
+    set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -fpermissive -pedantic -Wall")
 endif (UNIX)
 
 add_definitions(-DDEBUG)
@@ -74,12 +74,13 @@ include_directories(
     src/eez/libs/mqtt
     src/eez/platform/simulator
     src/eez/scpi
+)
 
+include_directories(SYSTEM
     src/third_party/libscpi/inc
     src/third_party/micropython
     src/third_party/micropython/ports/bb3
 )
-
 if(WIN32)
     include_directories(src/third_party/micropython/ports/bb3/win32)
 endif()
@@ -834,7 +835,7 @@ endif()
 if (UNIX)
     set(THREADS_PREFER_PTHREAD_FLAG ON)
     find_package(Threads REQUIRED)
-    target_link_libraries(modular-psu-firmware Threads::Threads)    
+    target_link_libraries(modular-psu-firmware Threads::Threads bsd)
 endif (UNIX)
 
 target_link_libraries(modular-psu-firmware ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES})

src/eez/gui/assets.cpp

@@ -45,13 +45,13 @@ static Assets g_externalAssets;
 static Assets *g_fixPointersAssets;
 
 void StyleList_fixPointers() {
-    g_fixPointersAssets->styles->first = (Style *)((uint8_t *)g_fixPointersAssets->styles + (uint32_t)g_fixPointersAssets->styles->first);
+    g_fixPointersAssets->styles->first = (const Style *)((uint8_t *)g_fixPointersAssets->styles + (uint32_t)g_fixPointersAssets->styles->first);
 }
 
 void WidgetList_fixPointers(WidgetList &widgetList) {
     widgetList.first = (Widget *)((uint8_t *)g_fixPointersAssets->document + (uint32_t)widgetList.first);
     for (uint32_t i = 0; i < widgetList.count; ++i) {
-        Widget_fixPointers((Widget *)widgetList.first + i);
+        Widget_fixPointers((Widget *)&widgetList.first[i]);
     }
 }
 
@@ -67,7 +67,7 @@ void Theme_fixPointers(Theme *theme) {
 void ThemeList_fixPointers(ThemeList &themeList) {
     themeList.first = (Theme *)((uint8_t *)g_fixPointersAssets->colorsData + (uint32_t)themeList.first);
     for (uint32_t i = 0; i < themeList.count; ++i) {
-        Theme_fixPointers((Theme *)themeList.first + i);
+        Theme_fixPointers(const_cast<Theme*>(&themeList.first[i]));
     }
 }
 

src/eez/gui/assets.h

@@ -43,7 +43,7 @@ int16_t getDataIdFromName(const char *name);
 int getExternalAssetsFirstPageId();
 
 #define GET_WIDGET_PROPERTY(widget, propertyName, type) ((type)widget->propertyName)
-#define GET_WIDGET_LIST_ELEMENT(list, index) ((list).first + (index))
+#define GET_WIDGET_LIST_ELEMENT(list, index) &((list).first[index])
 
 bool loadExternalAssets(const char *filePath, int *err);
 

src/eez/gui/data.h

@@ -80,7 +80,7 @@ struct Value {
     Value() 
         : type_(VALUE_TYPE_NONE), options_(0), unit_(UNIT_UNKNOWN) 
     {
-        uint32_ = 0;
+        pVoid_ = 0;
     }
 
     Value(int value) 

src/eez/gui/gui.cpp

@@ -72,7 +72,7 @@ void startThread() {
     mcu::display::onThemeChanged();
     touch::init();
     mouse::init();
-    g_guiMessageQueueId = osMessageCreate(osMessageQ(g_guiMessageQueue), NULL);
+    g_guiMessageQueueId = osMessageCreate(osMessageQ(g_guiMessageQueue), 0);
     g_guiTaskHandle = osThreadCreate(osThread(g_guiTask), nullptr);
 }
 

src/eez/gui/overlay.cpp

@@ -42,6 +42,9 @@ Overlay *getOverlay(const WidgetCursor &widgetCursor) {
     }
     Value overlayValue;
     DATA_OPERATION_FUNCTION(containerWidget->overlay, DATA_OPERATION_GET_OVERLAY_DATA, (Cursor )widgetCursor.cursor, overlayValue);
+    if (overlayValue.getType() != VALUE_TYPE_POINTER) {
+        return nullptr;
+    }
     return (Overlay *)overlayValue.getVoidPointer();
 }
 
@@ -115,4 +118,4 @@ void overlayEnumWidgetHook(WidgetCursor &widgetCursor, EnumWidgetsCallback callb
 } // namespace gui
 } // namespace eez
 
-#endif
+#endif

src/eez/gui/widget.h

@@ -18,7 +18,9 @@
 
 #pragma once
 
+#include <type_traits>
 #include <eez/gui/geometry.h>
+#include <eez/memory.h>
 
 namespace eez {
 namespace gui {
@@ -56,6 +58,101 @@ enum ValueTypes {
 
 typedef void (*EnumWidgetsCallback)(const WidgetCursor &widgetCursor);
 
+template<typename T, bool is_void>
+struct AssetsPtrImpl;
+
+/* This template is used (on 64-bit systems) to pack asset pointers into 32-bit values.
+ * All pointers are relative to MEMORY_BEGIN.
+ * This way, the assets created by Studio can be used without having to fix all
+ * the sizes - Studio creates 32-bit pointers that are relative to the
+ * beginning of the assets, which the firmware rewrites to global pointers
+ * during initialization. On a 32-bit system this works just fine, but for a
+ * 64-bit system the pointers have different sizes and this breaks. By
+ * inserting a 'middleman' structure that stores the pointers as a 32-bit
+ * offset to MEMORY_BEGIN, we can keep the pointer sizes and initialization
+ * code the same.
+ */
+template<typename T>
+struct AssetsPtrImpl<T, false>
+{
+    /* Default constructors initialize to an invalid pointer */
+    AssetsPtrImpl() = default;
+    AssetsPtrImpl(std::nullptr_t v) {};
+    /* Can accept void or T pointers. Store the offset to MEMORY_BEGIN. */
+    AssetsPtrImpl(T * p) : val(reinterpret_cast<const uint8_t*>(p) - MEMORY_BEGIN) {}
+    AssetsPtrImpl(void * p) : val(reinterpret_cast<const uint8_t*>(p) - MEMORY_BEGIN) {}
+
+    /* Conversion to an int return the raw value */
+    operator uint32_t() const { return val; }
+
+    /* Implicit conversion to a T pointer */
+    operator T*() const { return ptr(); }
+
+    /* Implicit conversions to void pointers */
+    operator       void*() const { return ptr(); }
+    operator const void*() const { return ptr(); }
+
+    /* Special cases for converting to (unsigned) char for pointer arithmetic */
+    template<typename U, typename = typename std::enable_if<!std::is_same<typename std::remove_pointer<U>::type, T>::value>>
+    operator U() const { return (U)ptr(); }
+
+    /* Dereferencing operators */
+          T* operator->()       { return ptr(); }
+    const T* operator->() const { return ptr(); }
+
+    /* Array access */
+    T&       operator[](uint32_t i)       { return ptr()[i]; }
+    const T& operator[](uint32_t i) const { return ptr()[i]; }
+
+    /* Implement addition of ints just like 'normal' pointers */
+    T* operator+(int i)      { return &ptr()[i]; }
+    T* operator+(unsigned i) { return &ptr()[i]; }
+
+    /* Calculate the pointer, return a null pointer if the value is invalid */
+    T* ptr() const {
+        if (val == 0xFFFFFFFF) {
+            return 0;
+        } else {
+            return (T*)(MEMORY_BEGIN + val);
+        }
+    }
+
+    uint32_t val{0xFFFFFFFF};
+};
+
+/* Template specialization for void pointers that does not allow dereferencing */
+template<typename T>
+struct AssetsPtrImpl<T, true>
+{
+    AssetsPtrImpl() = default;
+    AssetsPtrImpl(std::nullptr_t) {};
+    AssetsPtrImpl(T* p) : val(reinterpret_cast<const uint8_t*>(p) - MEMORY_BEGIN) {}
+    operator uint32_t() const { return val; }
+    operator T*() const { return reinterpret_cast<T*>(MEMORY_BEGIN + val); }
+
+    /* Implicit conversions to convert to any pointer type */
+    template<typename U> operator U() const { return (U)(T*)(*this); }
+    uint32_t val{0xFFFFFFFF};
+};
+
+/* This struct chooses the type used for AssetsPtr<T> - by default it uses an AssetsPtrImpl<> */
+template<typename T, uint32_t ptrSize>
+struct AssetsPtrChooser
+{
+    using type = AssetsPtrImpl<T, std::is_void<T>::value>;
+};
+
+/* On 32-bit systems, we can just use raw pointers */
+template<typename T>
+struct AssetsPtrChooser<T, 4>
+{
+    using type = T*;
+};
+
+/* Utility typedef that delegates to AssetsPtrChooser */
+template<typename T>
+using AssetsPtr = typename AssetsPtrChooser<T, sizeof(void*)>::type;
+
 struct Widget;
 struct Assets;
 
@@ -109,15 +206,15 @@ struct Style {
     uint8_t padding_right;
     uint8_t padding_bottom;
     uint8_t padding_left;
-	uint8_t margin_top;
-	uint8_t margin_right;
-	uint8_t margin_bottom;
-	uint8_t margin_left;
+    uint8_t margin_top;
+    uint8_t margin_right;
+    uint8_t margin_bottom;
+    uint8_t margin_left;
 };
 
 struct StyleList {
     uint32_t count;
-    const Style *first;
+    AssetsPtr<const Style> first;
 };
 
 void StyleList_fixPointers(StyleList &styleList);
@@ -133,14 +230,14 @@ struct Widget {
     int16_t w;
     int16_t h;
     uint16_t style;
-    const void *specific;
+    AssetsPtr<const void> specific;
 };
 
-void Widget_fixPointers(Widget *widget);
+void Widget_fixPointers(Widget* widget);
 
 struct WidgetList {
     uint32_t count;
-    const Widget *first;
+    AssetsPtr<const Widget> first;
 };
 
 void WidgetList_fixPointers(WidgetList &widgetList);
@@ -164,21 +261,21 @@ struct Document {
 
 struct ColorList {
     uint32_t count;
-    const uint16_t *first;
+    AssetsPtr<const uint16_t> first;
 };
 
 void ColorList_fixPointers(ColorList &colorList);
 
 struct Theme {
-    const char *name;
+    AssetsPtr<const char> name;
     ColorList colors;
 };
 
 void Theme_fixPointers(Theme *theme);
 
 struct ThemeList {
     uint32_t count;
-    const Theme *first;
+    AssetsPtr<const Theme> first;
 };
 
 void ThemeList_fixPointers(ThemeList &themeList);
@@ -192,17 +289,17 @@ struct Colors {
 
 struct NameList {
     uint32_t count;
-    const char **first;
+    AssetsPtr<AssetsPtr<const char>> first;
 };
 
 struct Assets {
-    Document *document;
-    StyleList *styles;
-    uint8_t *fontsData;
-    uint8_t *bitmapsData;
-    Colors *colorsData;
-    NameList *actionNames;
-    NameList *dataItemNames;
+    AssetsPtr<Document> document;
+    AssetsPtr<StyleList> styles;
+    AssetsPtr<uint8_t> fontsData;
+    AssetsPtr<uint8_t> bitmapsData;
+    AssetsPtr<Colors> colorsData;
+    AssetsPtr<NameList> actionNames;
+    AssetsPtr<NameList> dataItemNames;
 };
 
 ////////////////////////////////////////////////////////////////////////////////

src/eez/gui/widgets/button.cpp

@@ -28,7 +28,7 @@ namespace gui {
 
 FixPointersFunctionType BUTTON_fixPointers = [](Widget *widget, Assets *assets) {
     ButtonWidget *buttonWidget = (ButtonWidget *)widget->specific;
-    buttonWidget->text = (const char *)((uint8_t *)assets->document + (uint32_t)buttonWidget->text);
+    buttonWidget->text = (const char *)((uint8_t *)(void *)assets->document + (uint32_t)buttonWidget->text);
 };
 
 EnumFunctionType BUTTON_enum = nullptr;
@@ -79,4 +79,4 @@ OnKeyboardFunctionType BUTTON_onKeyboard = nullptr;
 } // namespace gui
 } // namespace eez
 
-#endif
+#endif

src/eez/gui/widgets/button.h

@@ -22,10 +22,10 @@ namespace eez {
 namespace gui {
 
 struct ButtonWidget {
-    const char *text;
+    AssetsPtr<const char> text;
     int16_t enabled;
     uint16_t disabledStyle;
 };
 
 } // namespace gui
-} // namespace eez
+} // namespace eez

src/eez/gui/widgets/grid.cpp

@@ -28,13 +28,13 @@ namespace gui {
 
 struct GridWidget {
     uint8_t gridFlow; // GRID_FLOW_ROW or GRID_FLOW_COLUMN
-    const Widget *itemWidget;
+    AssetsPtr<const Widget> itemWidget;
 };
 
 FixPointersFunctionType GRID_fixPointers = [](Widget *widget, Assets *assets) {
     GridWidget *gridWidget = (GridWidget *)widget->specific;
-	gridWidget->itemWidget = (Widget *)((uint8_t *)assets->document + (uint32_t)gridWidget->itemWidget);
-    Widget_fixPointers((Widget *)gridWidget->itemWidget);
+    gridWidget->itemWidget = (Widget *)((uint8_t *)(void *)assets->document + (uint32_t)gridWidget->itemWidget);
+    Widget_fixPointers((Widget *)&*gridWidget->itemWidget);
 };
 
 EnumFunctionType GRID_enum = [](WidgetCursor &widgetCursor, EnumWidgetsCallback callback) {
@@ -148,4 +148,4 @@ OnKeyboardFunctionType GRID_onKeyboard = nullptr;
 } // namespace gui
 } // namespace eez
 
-#endif
+#endif

src/eez/gui/widgets/list.cpp

@@ -28,14 +28,14 @@ namespace gui {
 
 struct ListWidget {
     uint8_t listType; // LIST_TYPE_VERTICAL or LIST_TYPE_HORIZONTAL
-    const Widget *itemWidget;
+    AssetsPtr<const Widget> itemWidget;
     uint8_t gap;
 };
 
 FixPointersFunctionType LIST_fixPointers = [](Widget *widget, Assets *assets) {
     ListWidget *listWidget = (ListWidget *)widget->specific;
-    listWidget->itemWidget = (Widget *)((uint8_t *)assets->document + (uint32_t)listWidget->itemWidget);
-    Widget_fixPointers((Widget *)listWidget->itemWidget);
+    listWidget->itemWidget = (Widget *)((uint8_t *)(void *)assets->document + (uint32_t)listWidget->itemWidget);
+    Widget_fixPointers((Widget *)&*listWidget->itemWidget);
 };
 
 EnumFunctionType LIST_enum = [](WidgetCursor &widgetCursor, EnumWidgetsCallback callback) {
@@ -137,4 +137,4 @@ OnKeyboardFunctionType LIST_onKeyboard = nullptr;
 } // namespace gui
 } // namespace eez
 
-#endif
+#endif