Skip to content

Commit

Permalink
Some fixes
Browse files Browse the repository at this point in the history
Try to repair bug segmentation fault in thermal_zone.module
  • Loading branch information
eloaders committed Dec 28, 2012
1 parent f86d1cd commit 2003a32
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 31 deletions.
51 changes: 26 additions & 25 deletions src/i-nex/.settings
Original file line number Diff line number Diff line change
Expand Up @@ -22,34 +22,35 @@ SearchString=True

[OpenFile]
File[1]=".src/Finfosys.form"
File[2]=".src/Finfosys.class:523.1"
Active=2
File[2]=".src/Finfosys.class:526.34"
File[3]=".src/Global.class:12.7"
File[4]=".src/About.form"
File[5]=".src/About.class:83.22"
Active=6
File[6]=".src/distrodetect.class:11.37"
File[7]=".src/battery.module:70.77"
File[8]=".src/Disk_Drives.module:89.85"
File[9]=".src/ScreenShot.form"
File[10]=".src/ScreenShot.class:12.63"
File[11]=".src/ScreenShotM.module:7.0"
File[12]=".src/USB_Drives.module:65.33"
File[13]=".src/Asound_Drives.module:33.27"
File[14]=".src/Reportm.module:38.10"
File[15]=".src/FReport_Gen.form"
File[16]=".src/FReport_Gen.class:28.0"
File[17]=".src/Start_App_Args.form"
File[18]=".src/Start_App_Args.class:38.13"
File[19]=".src/ChkPrm.module:6.21"
File[20]=".src/BIOS_microcode_update_recommended.module:2.19"
File[21]=".src/thermal_zone.module:6.17"
File[22]=".src/FModules.form"
File[23]=".src/FModules.class:4.30"
File[24]=".src/Input_Devices.module:8.1"
File[25]=".src/FinfosysNew.form"
File[26]=".src/FinfosysNew.class:37.30"
File[27]=".src/net.module:49.66"
Count=27
File[6]=".src/battery.module:70.77"
File[7]=".src/Disk_Drives.module:89.85"
File[8]=".src/ScreenShot.form"
File[9]=".src/ScreenShot.class:12.65"
File[10]=".src/ScreenShotM.module:7.0"
File[11]=".src/USB_Drives.module:13.0"
File[12]=".src/Asound_Drives.module:33.27"
File[13]=".src/Reportm.module:38.10"
File[14]=".src/FReport_Gen.form"
File[15]=".src/FReport_Gen.class:28.0"
File[16]=".src/Start_App_Args.form"
File[17]=".src/Start_App_Args.class:38.13"
File[18]=".src/ChkPrm.module:6.21"
File[19]=".src/BIOS_microcode_update_recommended.module:2.19"
File[20]=".src/thermal_zone.module:20.54"
File[21]=".src/FModules.form"
File[22]=".src/FModules.class:4.30"
File[23]=".src/Input_Devices.module:8.1"
File[24]=".src/FinfosysNew.form"
File[25]=".src/FinfosysNew.class:37.30"
File[26]=".src/net.module:49.66"
File[27]="Data/report-ng.sh:27.44"
File[28]=".src/Distribution_Detect.module:20.0"
Count=28

[Watches]
Count=0
Expand Down
8 changes: 5 additions & 3 deletions src/i-nex/.src/Distribution_Detect.module
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
' Gambas module file

Public distven As String
Public distrel As String

Public Sub _init()

If Exist("~/.i-nex/report-ng.sh") Then
Shell "rm ~/.i-nex/report-ng.sh" Wait
Endif
If Exist("~/.i-nex") Then
Print "i-nex in home folder is exist"
Else
Shell "mkdir -p ~/.i-nex/" Wait
Endif
Copy "Data/report-ng.sh" To User.Home &/ ".i-nex/report-ng.sh"
Shell "/bin/bash " & User.Home &/ ".i-nex/report-ng.sh" Wait

Expand Down
8 changes: 7 additions & 1 deletion src/i-nex/.src/Finfosys.class
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ Public Sub System()
TextBox62.Text = Replace(timezone, "\n", "")
TextBox64.Text = Replace(xorg_version, "\n", "")
TextBox65.Text = Replace(glx_version, "\n", "")
Distribution_Detect._init
TextBox60.Text = File.Load("" & User.Home & "/.i-nex/DistributionVendor.conf")
TextBox61.Text = File.Load("" & User.Home & "/.i-nex/DistributionRelease.conf")
End
Expand Down Expand Up @@ -537,7 +538,12 @@ Public Sub Timer1_Timer()
''Refresh temp 1500/ms
dospam_uptime()
thermal_zone._inits
Label93.Text = "Temp: " & (thermal_zone.calculate / 1000) & " C"
If thermal_zone.notsupporttemp = 0 Then
Label93.Text = "Temp: " & (thermal_zone.calculate / 1000) & " C"
Else
Label93.Visible = False
Endif

End

Public Sub Button6_Click()
Expand Down
19 changes: 17 additions & 2 deletions src/i-nex/.src/thermal_zone.module
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,30 @@
Public Temperature As String
Public calculate As Float
Public OK As Boolean
Public notsupporttemp As Float

Public Sub _inits()

If Exist("/sys/bus/acpi/devices/LNXTHERM:00/thermal_zone/") Then
Shell "cat /sys/bus/acpi/devices/LNXTHERM:00/thermal_zone/temp" Wait To Temperature
If Temperature = Null Then
notsupporttemp = 1
Else
notsupporttemp = 0
calculate = CFloat(Val(Temperature))
Endif
Endif

If Exist("/sys/class/hwmon/hwmon0/device/temp2_input") Then
Shell "cat /sys/class/hwmon/hwmon0/device/temp2_input" Wait To Temperature
If Temperature = Null Then
notsupporttemp = 1
Else
notsupporttemp = 0
calculate = CFloat(Val(Temperature))
Endif
calculate = Replace(Replace(Temperature, " ", ""), "\n", "")
Endif
'calculate = Replace(Replace(Temperature, " ", ""), "\n", "")


End
End

0 comments on commit 2003a32

Please sign in to comment.