1.3.2.8

Firmware/etc/init.d/S01hostname

@@ -0,0 +1,51 @@
+#!/bin/sh
+#
+# Starts hostname service.
+#
+
+set_hostname_with_model_mac()
+{
+    local mac=$(/usr/bin/get_sn_mac.sh mac 2>&1)
+    local id=${mac:0-4}
+    local model=$(/usr/bin/get_sn_mac.sh model 2>&1)
+
+    if [ "x$id" != "x" -a "x$model" != "x" ]; then
+        case $model in
+            "CR-K1")
+                model="K1"
+                ;;
+            "CR-K1 Max")
+                model="K1Max"
+                ;;
+            "K1 Max SE")
+                model="K1MaxSE"
+                ;;
+            *)
+                ;;
+        esac
+
+        echo "$model-$id" > /etc/hostname
+    fi
+}
+
+set_hostname()
+{
+    /usr/bin/cmp -s /rom/etc/hostname /etc/hostname
+    if [ $? -eq 0 ]; then
+        set_hostname_with_model_mac
+    fi
+
+    # set host name after overlayfs mounted
+    /bin/hostname -F /etc/hostname
+}
+
+case "$1" in
+    start)
+        set_hostname
+        ;;
+    *)
+        echo "Usage: $0 {start}"
+        exit 1
+esac
+
+exit $?

Firmware/etc/init.d/S13mcu_update

@@ -175,7 +175,8 @@ auto_update()
 
             if [ -e $mcu0_serial -a -e $bed0_serial -a -e $noz0_serial ]; then
 
-                if [ "$model" = "CR-K1" -o "$model" = "CR-K1 Max" ]; then
+                if [ "$model" = "CR-K1" -o "$model" = "K1C" \
+                    -o "$model" = "CR-K1 Max" -o "$model" = "K1 Max SE" ]; then
                     fw_dir=K1
                 else
                     fw_dir=

Firmware/etc/init.d/S55klipper_service

@@ -83,6 +83,7 @@ copy_config()
 {
     local model=$(get_sn_mac.sh model)
     local board=$(get_sn_mac.sh board)
+    local pcba_test=$(get_sn_mac.sh pcba_test)
 
     case $model in
         "CR-K1")
@@ -109,7 +110,7 @@ copy_config()
             gcode_dir=K1
             ;;
 
-        "CR-K1 Max" | "K1 Max SE")
+        "CR-K1 Max")
             if [ "$board" = "CR4CU220812S11" ]; then
                 config_dir=K1_MAX_CR4CU220812S11
             elif [ "$board" = "CR4CU220812S12" ]; then
@@ -121,6 +122,16 @@ copy_config()
             gcode_dir=K1_Max
             ;;
 
+        "K1 Max SE")
+            if [ "$board" = "CR4CU220812S12" ]; then
+                config_dir=K1_MAX_SE_CR4CU220812S12
+            else
+                config_dir=
+            fi
+
+            gcode_dir=K1_Max
+            ;;
+
         *)
             config_dir=
             gcode_dir=
@@ -135,7 +146,6 @@ copy_config()
             [ "x${config_dir}" != "x" -a -d "/usr/share/klipper/config/${config_dir}" ] && {
                 # keep printer.cfg
                 CONFIG_PATH=/usr/share/klipper/config/${config_dir}
-                # cp -af `ls /usr/share/klipper/config/${config_dir}/*.cfg | grep -v printer.cfg | xargs` $PRINTER_CONFIG_DIR/
                 ls "${CONFIG_PATH}"/*.cfg | grep -v printer.cfg | xargs -I {} cp -af {} $PRINTER_CONFIG_DIR/
                 sync
             }
@@ -149,11 +159,17 @@ copy_config()
             cp -af "${CONFIG_PATH}"/*.cfg $PRINTER_CONFIG_DIR/
             sync
         }
+    fi
 
-        [ "x${gcode_dir}" != "x" -a -d /usr/share/klipper/gcodes/${gcode_dir} ] && {
-            find /usr/share/klipper/gcodes/${gcode_dir} -iname "*.gcode" -exec cp {} ${GCODE_FILES_DIR}/ \;
-            sync
-        }
+    [ "x${gcode_dir}" != "x" -a -d /usr/share/klipper/gcodes/${gcode_dir} ] && {
+        rsync -a /usr/share/klipper/gcodes/${gcode_dir}/* ${GCODE_FILES_DIR}/
+        sync
+    }
+
+    # overlay printer.cfg for pcba test
+    if [ "x$pcba_test" = "x1" ]; then
+        cp -af $PRINTER_CONFIG_DIR/factory_printer.cfg $PRINTER_CONFIG_DIR/printer.cfg && sync
+        mkdir -p /tmp/creality && touch /tmp/creality/factory_test
     fi
 }
 

Firmware/etc/ota_info

@@ -1,4 +1,4 @@
-ota_version=1.3.2.1
+ota_version=1.3.2.8
 ota_board_name=CR4CU220812S11
-ota_compile_time=2023 09.07 18:18:53
+ota_compile_time=2023 10.12 17:45:35
 ota_site=http://192.168.43.52/ota/board_test

Firmware/etc/sysConfig/defData/error_code_map.json

@@ -37,23 +37,7 @@
         { "fault_code":2313, "error":9 },
         { "fault_code":2314, "error":9 },
         { "fault_code":109,  "error":10 },
-
-        { "fault_code":2520, "error":11 },
-        { "fault_code":2521, "error":11 },
-        { "fault_code":2522, "error":11 },
-        { "fault_code":2523, "error":11 },
-        { "fault_code":2524, "error":11 },
-        { "fault_code":2525, "error":11 },
-        { "fault_code":2526, "error":11 },
-        { "fault_code":2527, "error":11 },
-        { "fault_code":2528, "error":11 },
-        { "fault_code":2529, "error":11 },
-        { "fault_code":2530, "error":11 },
-        { "fault_code":2531, "error":11 },
-        { "fault_code":2532, "error":11 },
-        { "fault_code":2533, "error":11 },
-        { "fault_code":2534, "error":11 },
-        { "fault_code":2535, "error":11 },
+        { "fault_code":113,  "error":11 },
 
         { "fault_code":2000, "error":100 },
         { "fault_code":2001, "error":100 },
@@ -82,6 +66,25 @@
         { "fault_code":506,  "error":210 },
         { "fault_code":507,  "error":210 },
 
+        { "fault_code":2520, "error":211 },
+        { "fault_code":2521, "error":211 },
+        { "fault_code":2522, "error":211 },
+        { "fault_code":2523, "error":211 },
+        { "fault_code":2524, "error":211 },
+        { "fault_code":2525, "error":211 },
+        { "fault_code":2526, "error":211 },
+        { "fault_code":2527, "error":211 },
+        { "fault_code":2528, "error":211 },
+        { "fault_code":2529, "error":211 },
+        { "fault_code":2530, "error":211 },
+        { "fault_code":2531, "error":211 },
+        { "fault_code":2532, "error":211 },
+        { "fault_code":2533, "error":211 },
+        { "fault_code":2534, "error":211 },
+        { "fault_code":2535, "error":211 },
+
+        { "fault_code":508, "error":212 },
+
         { "note":"Light prompt class conversion" },
         { "fault_code":2095, "error":800 },
         { "fault_code":2211, "error":800 },

Firmware/module_driver/driver_default_init_script.sh

@@ -18,8 +18,10 @@ sh soc_dtrng.sh
 sh cywdhd.sh
 sh gt9xx_touch.sh
 sh hci_uart_h5_kernel_4_4_94.sh
-sh lcd_gc9503cv.sh
-sh lcd_st7701_9bit_spi.sh
+sh lcd_gc9503cv_ue_480_800.sh
+sh lcd_st7701_9bit_spi_dc_480_800.sh
+sh lcd_st7701_9bit_spi_pj_480_800.sh
+sh lcd_st7701_9bit_spi_tjc_480_800.sh
 sh soc_efuse.sh
 sh soc_mac_driver.sh
 sh soc_watchdog.sh

Firmware/module_driver/lcd_gc9503cv_ue_480_800.sh

@@ -0,0 +1 @@
+insmod lcd_gc9503cv_ue_480_800.ko lcm_id=`get_lcm_id.sh` lcd_is_inited=1 gpio_lcd_power_en=PC21 gpio_lcd_rst=PB29 gpio_lcd_scl=PC27 gpio_lcd_sda=PC28 gpio_lcd_cs=PA02

Firmware/module_driver/lcd_st7701_9bit_spi_dc_480_800.sh

@@ -0,0 +1 @@
+insmod lcd_st7701_9bit_spi_dc_480_800.ko lcm_id=`get_lcm_id.sh` lcd_is_inited=1 gpio_lcd_power_en=PC21 gpio_lcd_rst=PB29 gpio_lcd_scl=PC27 gpio_lcd_sda=PC28 gpio_lcd_cs=PA02 gpio_lcd_sdo=PB16

Firmware/module_driver/lcd_st7701_9bit_spi_pj_480_800.sh

@@ -0,0 +1 @@
+insmod lcd_st7701_9bit_spi_pj_480_800.ko lcm_id=`get_lcm_id.sh` lcd_is_inited=1 gpio_lcd_power_en=PC21 gpio_lcd_rst=PB29 gpio_lcd_scl=PC27 gpio_lcd_sda=PC28 gpio_lcd_cs=PA02 gpio_lcd_sdo=PB16

Firmware/module_driver/lcd_st7701_9bit_spi_tjc_480_800.sh

@@ -0,0 +1 @@
+insmod lcd_st7701_9bit_spi_tjc_480_800.ko lcm_id=`get_lcm_id.sh` lcd_is_inited=1 gpio_lcd_power_en=PC21 gpio_lcd_rst=PB29 gpio_lcd_scl=PC27 gpio_lcd_sda=PC28 gpio_lcd_cs=PA02 gpio_lcd_sdo=PB16

Firmware/usr/bin/clear_sn_mac.sh

@@ -0,0 +1,33 @@
+#!/bin/sh
+
+if [ $# -ne 1 ]; then
+    exit 1
+fi
+
+PARAM=$(echo $1 | tr 'A-Z' 'a-z')
+
+BLK_NUM=$(fdisk -l | grep 'sn_mac' | awk '{print $1}')
+BLK=/dev/mmcblk0p${BLK_NUM}
+
+tmp=$(dd if=${BLK} bs=512 count=1 2>/dev/null)
+
+count=$(echo $tmp | awk -F ';' '{print NF-1}')
+if [ $count -ne 8 ]; then
+    exit 1
+fi
+
+SN=$(echo $tmp | awk -F ';' '{print $1}')
+MAC=$(echo $tmp | awk -F ';' '{print $2}')
+MODEL=$(echo $tmp | awk -F ';' '{print $3}')
+BOARD=$(echo $tmp | awk -F ';' '{print $4}')
+PCBA_TEST=$(echo $tmp | awk -F ';' '{print $5}')
+
+if [ "$PARAM" = "pcba_test" -a "x$PCBA_TEST" = "x1" ]; then
+    output="$SN;$MAC;$MODEL;$BOARD;0;;;;"
+    echo -n $output | dd of=$BLK bs=512 count=1 2>/dev/null
+    sync
+else
+    # Caution:
+    # We should only support to clear pcba_test flag!
+    exit 1
+fi

Firmware/usr/bin/get_sn_mac.sh

@@ -12,7 +12,8 @@ PARAM=$(echo $1 | tr 'A-Z' 'a-z')
 BLK_NUM=$(fdisk -l | grep 'sn_mac' | awk '{print $1}')
 BLK=/dev/mmcblk0p${BLK_NUM}
 
-# 读取SN_MAC分区号的内容(格式:"sn"14 + ';' + "mac"12 + ';' + 上位机 + ';' + 5个下位机)
+# 读取SN_MAC分区号的内容(格式:"sn"14 + ';' + "mac"12 + ';' + 上位机 + ';' + 主板型号 + ';' +
+# PCBA厂测标志 + ';' + 3个预留)
 tmp=$(dd if=${BLK} count=1 2>/dev/null)
 
 # sn
@@ -29,6 +30,10 @@ MODEL=${tmp%%;*}
 tmp=${tmp#*;}
 # board
 BOARD=${tmp%%;*}
+# 去掉board
+tmp=${tmp#*;}
+# pcba_test
+PCBA_TEST=${tmp%%;*}
 
 # sn校验 -- 长度14，由0-9a-fA-F组成
 check_sn()
@@ -95,6 +100,12 @@ elif [ $PARAM = "model" ]; then
 	echo ${MODEL}
 elif [ $PARAM = "board" ]; then
 	echo ${BOARD}
+elif [ $PARAM = "pcba_test" ]; then
+    if [ "x$PCBA_TEST" = "x1" ]; then
+       echo "1"
+    else
+       echo "0"
+    fi
 else
 #	echo "parameter only \"sn\", \"mac\", \"model\", \"board\""
 #	echo "Case-insensitive"

Firmware/usr/bin/wifi_up.sh

@@ -19,12 +19,8 @@ fi
 rfkill unblock wifi
 ifconfig wlan0 up
 
-SN_NUM=
 if [ "$wpa_conf" != "" ]; then
     wpa_supplicant -B -i wlan0 -c $wpa_conf &
-    # 获取sn号
-    SN_NUM=$(sh /usr/bin/get_sn_mac.sh sn 2>&1)
-    SN_NUM=${SN_NUM:0-4}
     #udhcpc -i wlan0 &
-    udhcpc -i wlan0 -x hostname:$(hostname)-${SN_NUM} &
+    udhcpc -i wlan0 -x hostname:$(hostname) &
 fi

Firmware/usr/lib/libpopt.so

@@ -0,0 +1 @@
+libpopt.so.0.0.0

Firmware/usr/lib/libpopt.so.0

@@ -0,0 +1 @@
+libpopt.so.0.0.0

Firmware/usr/lib/os-release

@@ -1,5 +1,5 @@
 NAME=Buildroot
-VERSION=2020.02.1-g781548bd25
+VERSION=2020.02.1-g9f8259fde1-dirty
 ID=buildroot
 VERSION_ID=2020.02.1
 PRETTY_NAME="Buildroot 2020.02.1"