Repair bitmap skewing for 1 to 4 bit BMPs

Author: masonova1

build_and_upload.py

@@ -39,24 +39,15 @@ def get_drives():
 
 def directory_hash(dir, extra = []):
     sha = hashlib.sha256()
-    dirtree = sorted(os.walk(dir))
 
     for file in sorted(extra):
         print("Hashing "+file)
         file = open(file, 'rb')
         while chunk := file.read(8192):
             sha.update(chunk)
-    '''
-    for root, dir, manifest in dirtree:
-        for file in sorted(manifest):
-            if(file.endswith('.py')):
-                print("Hashing "+file+" in "+str(dir))
-                file = open(os.path.join(root, file), 'rb')
-                while chunk := file.read(8192):
-                    sha.update(chunk)
-    '''
+
+    # uPy doesn't have os.walk(), and the firmware hash has to match, so this is custom
     def _traverse(path):
-        # listdir returns names; we sort them for consistency with the build script
         items = sorted(os.listdir(path))
 
         for item in items:

filesystem/system/util.py

@@ -14,15 +14,6 @@ def directory_hash(dir, extra = []):
             sha.update(chunk)
 
     #print(str(dirtree))
-    '''
-    for root, dir, manifest in dirtree:
-        for file in sorted(manifest):
-            if(file.endswith('.py')):
-                print("Hashing "+file+" in "+str(dir))
-                file = open(os.path.join(root, file), 'rb')
-                while chunk := file.read(8192):
-                    sha.update(chunk)
-    '''
     def _traverse(path):
         # listdir returns names; we sort them for consistency with the build script
         items = sorted(os.listdir(path))

src/engine.c

@@ -42,8 +42,10 @@
     });
 
     const char *firmware_date = "0000-00-00_00:00:00";
+    const unsigned long long int system_files_digest = 0;
 #elif defined(__unix__)
     const char *firmware_date = "0000-00-00_00:00:00";
+    const unsigned long long int system_files_digest = 0;
 #elif defined(__arm__)
     #include "hardware/clocks.h"
     #include "hardware/pll.h"
@@ -58,6 +60,7 @@
     // // Set firmware date from generated header file if using Python build script
     const char *firmware_date = FIRMWARE_DATE;
     // const char *firmware_date = "0000-00-00_00:00:00";
+    const unsigned long long int system_files_digest = SYSTEM_FILES_DIGEST;
 #endif
 
 
@@ -484,7 +487,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(engine_firmware_date_obj, engine_firmware_date);
    RETURN: int
 */
 static mp_obj_t engine_system_files_digest(){
-    return mp_obj_new_int_from_ull(SYSTEM_FILES_DIGEST);
+    return mp_obj_new_int_from_ull(system_files_digest);
 }
 MP_DEFINE_CONST_FUN_OBJ_0(engine_system_files_digest_obj, engine_system_files_digest);
 

src/nodes/2D/sprite_2d_node.c

@@ -120,7 +120,7 @@ void sprite_2d_node_class_draw(mp_obj_t sprite_node_base_obj, mp_obj_t camera_no
     engine_draw_blit(sprite_texture, sprite_frame_fb_start_index,
                      floorf(sprite_rotated_x), floorf(sprite_rotated_y),
                      sprite_frame_width, sprite_frame_height,
-                     spritesheet_width,
+                     sprite_texture->pixel_stride,
                      sprite_scale->x.value*camera_zoom,
                      sprite_scale->y.value*camera_zoom,
                     -sprite_rotation,
@@ -481,4 +481,4 @@ MP_DEFINE_CONST_OBJ_TYPE(
     make_new, sprite_2d_node_class_new,
     attr, sprite_2d_node_class_attr,
     locals_dict, &sprite_2d_node_class_locals_dict
-);
+);

src/nodes/empty_node.c

@@ -79,7 +79,7 @@ static mp_attr_fun_t empty_node_class_attr(mp_obj_t self_in, qstr attribute, mp_
     PARAM: [type={ref_link:Vector3}]     [name=position]                                    [value={ref_link:Vector3}]
     PARAM: [type={ref_link:Vector3}]     [name=rotation]                                    [value={ref_link:Vector3}]
     PARAM: [type=int]                    [name=layer]                                       [value=0 ~ 127]
-    ATTR:  [type=function]               [name={ref_link:add_child}]                        [value=function] 
+    ATTR:  [type=function]               [name={ref_link:add_child}]                        [value=function]
     ATTR:  [type=function]               [name={ref_link:get_child}]                        [value=function]
     ATTR:  [type=function]               [name={ref_link:get_child_count}]                  [value=function]
     ATTR:  [type=function]               [name={ref_link:node_base_mark_destroy}]           [value=function]
@@ -105,7 +105,7 @@ static mp_obj_t empty_node_class_new(const mp_obj_type_t *type, size_t n_args, s
     enum arg_ids {child_class, position, rotation, layer};
     bool inherited = false;
 
-    // If there is one positional argument and it isn't the first 
+    // If there is one positional argument and it isn't the first
     // expected argument (as is expected when using positional
     // arguments) then define which way to parse the arguments
     if(n_args >= 1 && mp_obj_get_type(args[0]) != &vector3_class_type){
@@ -176,7 +176,6 @@ static const mp_rom_map_elem_t empty_node_class_locals_dict_table[] = {
 };
 static MP_DEFINE_CONST_DICT(empty_node_class_locals_dict, empty_node_class_locals_dict_table);
 
-
 MP_DEFINE_CONST_OBJ_TYPE(
     engine_empty_node_class_type,
     MP_QSTR_EmptyNode,
@@ -185,4 +184,4 @@ MP_DEFINE_CONST_OBJ_TYPE(
     make_new, empty_node_class_new,
     attr, empty_node_class_attr,
     locals_dict, &empty_node_class_locals_dict
-);
+);