Merge branch 'OpenIPC:master' into master

pull/416/head
Igor Zalatov 2022-08-27 15:14:46 +03:00 committed by GitHub
commit 0a666dd073
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 122 additions and 14 deletions

View File

@ -468,3 +468,17 @@ jobs:
TG_HEADER=$(echo -e "\r\nCommit: $GIT_HASH \r\nBranch: $BRANCH \r\nTag: $TAG_NAME \r\n\r\n\xE2\x9C\x85 GitHub Actions")
curl $TG_OPTIONS -H "Content-Type: multipart/form-data" -X POST https://api.telegram.org/bot$TG_TOKEN/sendDocument \
-F chat_id=$TG_CHANNEL -F document="@$NORFW_PATH" -F caption="$TG_HEADER"
ci-build-check:
if: always() && github.event.pull_request
runs-on: ubuntu-latest
name: CI Build Check
needs: [buildroot]
steps:
- run: |
result="${{ needs.buildroot.result }}"
if [[ $result == "success" || $result == "skipped" ]]; then
exit 0
else
exit 1
fi

View File

@ -48,7 +48,9 @@ clean:
prepare: $(BR_DIR)
$(ROOT_DIR)/buildroot-$(BR_VER).tar.gz:
wget -O $@ --header="Host: buildroot.org" --no-check-certificate https://buildroot.org/downloads/buildroot-$(BR_VER).tar.gz
wget -O $@ -nv \
--retry-connrefused --continue --timeout=15 \
http://buildroot.org/downloads/buildroot-$(BR_VER).tar.gz
$(BR_DIR): $(ROOT_DIR)/buildroot-$(BR_VER).tar.gz
tar -C $(ROOT_DIR) -xf buildroot-$(BR_VER).tar.gz

View File

@ -0,0 +1 @@
../../../../../patches/linux/3.10.x/gcc8_err_encountered.patch

View File

@ -3,7 +3,7 @@
# OpenIPC.org | v.20220824
#
scr_version=1.0.4
scr_version=1.0.5
args=" $@"
@ -130,11 +130,21 @@ self_update() {
}
check_sdcard() {
if mount | grep /mnt/mmc >/dev/null; then
echo_c 31 "\nCannot upgrade! There is a mounted SD card in the slot!"
echo_c 33 "\nUnmounting SD card"
stoplist="autoupdate-kernel.img autoupdate-rootfs.img autoupdate-uboot.img"
while [ -n "$(mount | grep /mnt/mmc)" ]; do
_d=$(mount | grep /mnt/mmc | tail -1 | awk '{print $3}')
echo_c 34 "$_d"
for _f in $stoplist; do
echo "- checking for ${_d}/${_f}"
if [ -f "${_d}/${_f}" ]; then
echo_c 31 "\nCannot upgrade! Recovery file ${_d}/${_f} found on the mounted SD card!"
echo_c 37 "Please remove the card from the slot and restart sysupgrade."
exit 1
fi
done; unset _f
umount $_d
done; unset _d
}
create_lock() {
@ -190,6 +200,7 @@ Where:
--force_all do not validate anything
-n, --wipe_overlay wipe overlay partition
-x, --no_reboot do not reboot after updating
-z, --no_update do not update self
-h, --help display this help and exit
"
}
@ -266,6 +277,10 @@ for i in "$@"; do
skip_reboot=1
shift
;;
-z | --no_update)
skip_selfupdate=1
shift
;;
*)
print_sysinfo
echo_c 37 "\nUnknown option: $1"
@ -283,7 +298,7 @@ print_sysinfo
echo_c 37 "\nTry '$(basename "$0") --help' for options." &&
exit 0
self_update
[ "1" != "$skip_selfupdate" ] && self_update
check_sdcard

View File

@ -216,12 +216,6 @@ insert_sns() {
devmem 0x2003002c 32 0x90007 # sensor unreset, clk 37.125MHz, VI 250MHz
;;
ar0330)
devmem 0x200f0050 32 0x2 # i2c0_scl
devmem 0x200f0054 32 0x2 # i2c0_sda
devmem 0x2003002c 32 0xB0007 # sensor unreset, clk 27MHz, VI 250MHz
;;
ov5658)
devmem 0x200f0050 32 0x2 # i2c0_scl
devmem 0x200f0054 32 0x2 # i2c0_sda
@ -240,6 +234,12 @@ insert_sns() {
devmem 0x2003002c 32 0xB0007 # sensor unreset, clk 27MHz, VI 250MHz
;;
ar0330 | ar0330_i2c_dc)
devmem 0x200f0050 32 0x2 # i2c0_scl
devmem 0x200f0054 32 0x2 # i2c0_sda
devmem 0x2003002c 32 0xE0007 # sensor unreset, clk 24MHz, VI 250MHz
;;
os05a)
devmem 0x200f0050 32 0x2 # i2c0_scl
devmem 0x200f0054 32 0x2 # i2c0_sda

View File

@ -0,0 +1,76 @@
[sensor]
Sensor_type=ar0330
Mode=WDR_MODE_NONE
DllFile=libsns_ar0330_dc.so
[mode]
input_mode=INPUT_MODE_CMOS_33V
dev_attr=0
[isp_image]
Isp_FrameRate=25
Isp_Bayer=BAYER_GRBG
[vi_dev]
Input_mod=VI_MODE_DIGITAL_CAMERA
Work_mod =0 ;VI_WORK_MODE_1Multiplex = 0
;VI_WORK_MODE_2Multiplex,
;VI_WORK_MODE_4Multiplex
Combine_mode =0 ;Y/C composite or separation mode
;VI_COMBINE_COMPOSITE = 0 /*Composite mode */
;VI_COMBINE_SEPARATE, /*Separate mode */
Comp_mode =0 ;Component mode (single-component or dual-component)
;VI_COMP_MODE_SINGLE = 0, /*single component mode */
;VI_COMP_MODE_DOUBLE = 1, /*double component mode */
Clock_edge =1 ;Clock edge mode (sampling on the rising or falling edge)
;VI_CLK_EDGE_SINGLE_UP=0, /*rising edge */
;VI_CLK_EDGE_SINGLE_DOWN, /*falling edge */
Mask_num =2 ;Component mask
Mask_0 =0xFFC0000
Mask_1 =0x0
Scan_mode = 1;VI_SCAN_INTERLACED = 0
;VI_SCAN_PROGRESSIVE,
Data_seq =2 ;data sequence (ONLY for YUV format)
;----2th component U/V sequence in bt1120
; VI_INPUT_DATA_VUVU = 0,
; VI_INPUT_DATA_UVUV,
;----input sequence for yuv
; VI_INPUT_DATA_UYVY = 0,
; VI_INPUT_DATA_VYUY,
; VI_INPUT_DATA_YUYV,
; VI_INPUT_DATA_YVYU
Vsync =1 ; vertical synchronization signal
;VI_VSYNC_FIELD = 0,
;VI_VSYNC_PULSE,
VsyncNeg=0 ;Polarity of the vertical synchronization signal
;VI_VSYNC_NEG_HIGH = 0,
;VI_VSYNC_NEG_LOW /*if VIU_VSYNC_E
Hsync =0 ;Attribute of the horizontal synchronization signal
;VI_HSYNC_VALID_SINGNAL = 0,
;VI_HSYNC_PULSE,
HsyncNeg =0 ;Polarity of the horizontal synchronization signal
;VI_HSYNC_NEG_HIGH = 0,
;VI_HSYNC_NEG_LOW
VsyncValid =1 ;Attribute of the valid vertical synchronization signal
;VI_VSYNC_NORM_PULSE = 0,
;VI_VSYNC_VALID_SINGAL,
VsyncValidNeg =0;Polarity of the valid vertical synchronization signal
;VI_VSYNC_VALID_NEG_HIGH = 0,
;VI_VSYNC_VALID_NEG_LOW
Timingblank_HsyncHfb =0 ;Horizontal front blanking width
Timingblank_HsyncAct =2048 ;Horizontal effetive width
Timingblank_HsyncHbb =0 ;Horizontal back blanking width
Timingblank_VsyncVfb =0 ;Vertical front blanking height
Timingblank_VsyncVact =1536 ;Vertical effetive width
Timingblank_VsyncVbb=0 ;Vertical back blanking height
Timingblank_VsyncVbfb =0 ;Even-field vertical front blanking height(interlace, invalid progressive)
Timingblank_VsyncVbact=0 ;Even-field vertical effetive width(interlace, invalid progressive)
Timingblank_VsyncVbbb =0 ;Even-field vertical back blanking height(interlace, invalid progressive)
DataPath=1
InputDataType=1 ;VI_DATA_TYPE_YUV = 0,VI_DATA_TYPE_RGB = 1,
DataRev =FALSE ;Data reverse. FALSE = 0; TRUE = 1
DevRect_x=0
DevRect_y=0
DevRect_w=2048
DevRect_h=1536