This repository has been archived by the owner on Sep 27, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 8
added IP address retrieval #205
Open
sherrychen127
wants to merge
1
commit into
master
Choose a base branch
from
sherry_i2c_glcd
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
import socket | ||
import os | ||
f = os.popen('ifconfig eth0 | grep "inet\ addr" | cut -d: -f2 | cut -d" " -f1') | ||
IPAddr=f.read() | ||
|
||
|
||
#hostname = socket.gethostname() | ||
#IPAddr = socket.gethostbyname(hostname) | ||
|
||
#print("Your Computer Name is:" + hostname) | ||
#print("Your Computer IP Address is:" + IPAddr) | ||
def main(): | ||
file = open(r"ip.txt", "w+") | ||
file.write(IPAddr) | ||
file.close() | ||
|
||
if __name__ == '__main__': | ||
main() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,6 +17,10 @@ | |
#include <iostream> | ||
#include <fstream> | ||
|
||
//#include <cstdlib> | ||
#include <string> | ||
using namespace std; | ||
|
||
#include <math.h> | ||
|
||
#define BLACK 0 | ||
|
@@ -431,7 +435,7 @@ int cursor_x = 0; | |
int textsize = 0; | ||
uint16_t textcolor = 0xFFFF; | ||
uint16_t textbgcolor = 0xFFFF; | ||
char ip[14] = "138.51.120.89"; | ||
//char ip[14] = "138.51.120.89"; | ||
|
||
|
||
void drawChar(int16_t x, int16_t y, unsigned char c, uint16_t color, uint16_t bg, uint8_t size); | ||
|
@@ -763,6 +767,25 @@ void print_ip_address(char ip_address[]){ | |
|
||
|
||
int main(){ | ||
int result = system("python ip_address.py 1"); | ||
int arraysize=14; | ||
char ip[arraysize]; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is 14 always going to be large enough for the IP address? Maybe std::string could work better here |
||
char current_char; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Are you using all these local variables? If not, you can remove them |
||
|
||
int num_characters = 0; | ||
int i = 0; | ||
|
||
ifstream myfile; | ||
myfile.open("ip.txt"); | ||
if (myfile.is_open()){ | ||
while(!myfile.eof()){ | ||
myfile >> ip; | ||
|
||
} | ||
} | ||
printf("%s",ip); | ||
myfile.close(); | ||
|
||
int FileDescriptor = open(); | ||
begin(FileDescriptor); | ||
|
||
|
@@ -776,4 +799,4 @@ int main(){ | |
close(FileDescriptor); | ||
|
||
return 0; | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does the
1
need to be passed in here?